Fix a win compiling bug and coding style

2 files changed, 24 insertions, 29 deletions

diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp
index ededc84e3..a92dbd68e 100644
--- a/src/ui/widget/anchor-selector.cpp
+++ b/src/ui/widget/anchor-selector.cpp
@@ -30,22 +30,21 @@ AnchorSelector::AnchorSelector()
 	: _container()
 {
     set_halign(Gtk::ALIGN_CENTER);
-    setupButton(INKSCAPE_ICON("boundingbox_top_left"),     _buttons[0]);
-    setupButton(INKSCAPE_ICON("boundingbox_top"),          _buttons[1]);
-    setupButton(INKSCAPE_ICON("boundingbox_top_right"),    _buttons[2]);
-    setupButton(INKSCAPE_ICON("boundingbox_left"),         _buttons[3]);
-    setupButton(INKSCAPE_ICON("boundingbox_center"),       _buttons[4]);
-    setupButton(INKSCAPE_ICON("boundingbox_right"),        _buttons[5]);
-    setupButton(INKSCAPE_ICON("boundingbox_bottom_left"),  _buttons[6]);
-    setupButton(INKSCAPE_ICON("boundingbox_bottom"),       _buttons[7]);
+    setupButton(INKSCAPE_ICON("boundingbox_top_left"), _buttons[0]);
+    setupButton(INKSCAPE_ICON("boundingbox_top"), _buttons[1]);
+    setupButton(INKSCAPE_ICON("boundingbox_top_right"), _buttons[2]);
+    setupButton(INKSCAPE_ICON("boundingbox_left"), _buttons[3]);
+    setupButton(INKSCAPE_ICON("boundingbox_center"), _buttons[4]);
+    setupButton(INKSCAPE_ICON("boundingbox_right"), _buttons[5]);
+    setupButton(INKSCAPE_ICON("boundingbox_bottom_left"), _buttons[6]);
+    setupButton(INKSCAPE_ICON("boundingbox_bottom"), _buttons[7]);
     setupButton(INKSCAPE_ICON("boundingbox_bottom_right"), _buttons[8]);
 
     _container.set_row_homogeneous();
     _container.set_column_homogeneous(true);
 
-    for(int i = 0; i < 9; ++i) {
-        _buttons[i].signal_clicked().connect(
-	            sigc::bind(sigc::mem_fun(*this, &AnchorSelector::btn_activated), i));
+    for (int i = 0; i < 9; ++i) {
+        _buttons[i].signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &AnchorSelector::btn_activated), i));
 
         _container.attach(_buttons[i], i % 3, i / 3, 1, 1);
     }
@@ -62,12 +61,10 @@ AnchorSelector::~AnchorSelector()
 
 void AnchorSelector::btn_activated(int index)
 {
-    if(_selection == index && _buttons[index].get_active() == false)
-    {
+    if (_selection == index && _buttons[index].get_active() == false) {
         _buttons[index].set_active(true);
     }
-    else if(_selection != index && _buttons[index].get_active())
-    {
+    else if (_selection != index && _buttons[index].get_active()) {
         int old_selection = _selection;
         _selection = index;
         _buttons[old_selection].set_active(false);
@@ -78,9 +75,8 @@ void AnchorSelector::btn_activated(int index)
 void AnchorSelector::setAlignment(int horizontal, int vertical)
 {
     int index = 3 * vertical + horizontal;
-    if(index >= 0 && index < 9)
-    {
-	    _buttons[index].set_active(!_buttons[index].get_active());
+    if (index >= 0 && index < 9) {
+        _buttons[index].set_active(!_buttons[index].get_active());
     }
 }
 
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 431b0d0ea..5a48a2b0d 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -884,35 +884,34 @@ void PrefOpenFolder::init(Glib::ustring const &entry_string, Glib::ustring const
 {
     relatedEntry = new Gtk::Entry();
     relatedButton = new Gtk::Button();
-    Gtk::HBox* pixlabel = new Gtk::HBox(false, 3);
+    Gtk::HBox *pixlabel = new Gtk::HBox(false, 3);
     Gtk::Image *im = sp_get_icon_image("document-open", Gtk::ICON_SIZE_BUTTON);
     pixlabel->pack_start(*im);
     Gtk::Label *l = new Gtk::Label();
     l->set_markup_with_mnemonic(_("Open"));
     pixlabel->pack_start(*l);
-    relatedButton->add(*pixlabel); 
+    relatedButton->add(*pixlabel);
     relatedButton->set_tooltip_text(tooltip);
     relatedEntry->set_text(entry_string);
     relatedEntry->set_sensitive(false);
     this->pack_end(*relatedButton, false, false, 4);
     this->pack_start(*relatedEntry, true, true, 0);
-    relatedButton->signal_clicked().connect(
-            sigc::mem_fun(*this, &PrefOpenFolder::onRelatedButtonClickedCallback));
-    
+    relatedButton->signal_clicked().connect(sigc::mem_fun(*this, &PrefOpenFolder::onRelatedButtonClickedCallback));
 }
 
 void PrefOpenFolder::onRelatedButtonClickedCallback()
 {
-    g_mkdir_with_parents (relatedEntry->get_text().c_str(), 0700);
+    g_mkdir_with_parents(relatedEntry->get_text().c_str(), 0700);
 #ifdef WIN32
-    Uri uri = new System::Uri(relatedEntry->get_text());
-    Glib::ustring uri_open = (uri.AbsoluteUri).c_str()
+    System::Uri uri = new System::Uri(relatedEntry->get_text());
+    Glib::ustring uri_open = (uri.AbsoluteUri)
+                                 .c_str()
 #else
     Glib::ustring uri_open = ("file://" + relatedEntry->get_text()).c_str();
 #endif
-    GError *error = NULL;
-    if (!g_app_info_launch_default_for_uri (uri_open.c_str(), NULL, &error)) {
-        g_warning ("Failed to open uri: %s", error->message);
+                                     GError *error = NULL;
+    if (!g_app_info_launch_default_for_uri(uri_open.c_str(), NULL, &error)) {
+        g_warning("Failed to open uri: %s", error->message);
     }
 }