Fix compiling errors

3 files changed, 28 insertions, 32 deletions

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index baefd6b9f..d6a0b8aff 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -434,20 +434,18 @@ Application::add_gtk_css()
         g_object_get(settings, "gtk-theme-name", &gtkThemeName, NULL);
         g_object_get(settings, "gtk-application-prefer-dark-theme", &gtkApplicationPreferDarkTheme, NULL);
         g_object_set(settings, "gtk-application-prefer-dark-theme",
-                        prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL);
+                     prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL);
         prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName));
         if (prefs->getString("/theme/gtkTheme") != "") {
             g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL);
-        }
-        else {
+        } else {
             prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName));
         }
 
         Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
         if (themeiconname != "") {
             g_object_set(settings, "gtk-icon-theme-name", themeiconname.c_str(), NULL);
-        } 
-        else {
+        } else {
             prefs->setString("/theme/iconTheme", Glib::ustring(gtkIconThemeName));
         }
         g_object_get(settings, "gtk-font-name", &gtk_font_name, NULL);
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 158aeb617..d10a2ac4a 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -34,6 +34,7 @@
 #include "cms-system.h"
 #include "document.h"
 #include "enums.h"
+#include "inkscape-window.h"
 #include "inkscape.h"
 #include "message-stack.h"
 #include "path-prefix.h"
@@ -43,7 +44,6 @@
 #include "selection.h"
 #include "shortcuts.h"
 #include "verbs.h"
-#include "inkscape-window.h"
 
 #include "display/canvas-grid.h"
 #include "display/nr-filter-gaussian.h"
@@ -687,7 +687,7 @@ void InkscapePreferences::symbolicAddClass()
     auto const screen = Gdk::Screen::get_default();
     auto provider = Gtk::CssProvider::create();
     Glib::ustring css_str = "";
-    
+
     gchar colornamed[64];
     gchar colornamed_inverse[64];
     int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff);
@@ -727,24 +727,23 @@ void InkscapePreferences::symbolicAddClass()
     // is more understandable than record previously applied
     Glib::ustring style = get_filename(UIS, "style.css");
     if (!style.empty()) {
-      auto provider = Gtk::CssProvider::create();
-
-      // From 3.16, throws an error which we must catch.
-      try {
-          provider->load_from_path (style);
-      }
-#if GTK_CHECK_VERSION(3,16,0)
-      // Gtk::CssProviderError not defined until 3.16.
-      catch (const Gtk::CssProviderError& ex)
-      {
-          g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)",
-                 style.c_str(), ex.what().c_str());
-      }
+        auto provider = Gtk::CssProvider::create();
+
+        // From 3.16, throws an error which we must catch.
+        try {
+            provider->load_from_path(style);
+        }
+#if GTK_CHECK_VERSION(3, 16, 0)
+        // Gtk::CssProviderError not defined until 3.16.
+        catch (const Gtk::CssProviderError &ex) {
+            g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
+                       ex.what().c_str());
+        }
 #else
-      catch (...)
-      {}
+        catch (...) {
+        }
 #endif
-      Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 }
 void InkscapePreferences::themeChange()
@@ -756,21 +755,20 @@ void InkscapePreferences::themeChange()
     gchar *gtkThemeName;
     gboolean gtkApplicationPreferDarkTheme;
     Gtk::Window *window = SP_ACTIVE_DESKTOP->getToplevel();
-    GtkSettings *settings = gtk_settings_get_default(); 
+    GtkSettings *settings = gtk_settings_get_default();
     if (window && settings) {
         g_object_get(settings, "gtk-theme-name", &gtkThemeName, NULL);
         g_object_get(settings, "gtk-application-prefer-dark-theme", &gtkApplicationPreferDarkTheme, NULL);
         bool dark = gtkApplicationPreferDarkTheme || Glib::ustring(gtkThemeName).find(":dark") != -1;
         if (!dark) {
-			Glib::RefPtr<Gtk::StyleContext> stylecontext = window->get_style_context();
-			Gdk::RGBA rgba;
-			bool background_set = stylecontext->lookup_color("theme_bg_color", rgba);
+            Glib::RefPtr<Gtk::StyleContext> stylecontext = window->get_style_context();
+            Gdk::RGBA rgba;
+            bool background_set = stylecontext->lookup_color("theme_bg_color", rgba);
             if (background_set && rgba.get_red() + rgba.get_green() + rgba.get_blue() < 1.0) {
                 dark = true;
             }
         }
-        if (dark)
-        {
+        if (dark) {
             window->get_style_context()->add_class("dark");
         } else {
             window->get_style_context()->remove_class("dark");
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 801e6bc41..88c70c75a 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -898,9 +898,9 @@ sp_desktop_widget_realize (GtkWidget *widget)
         g_object_get(settings, "gtk-application-prefer-dark-theme", &gtkApplicationPreferDarkTheme, NULL);
         bool dark = gtkApplicationPreferDarkTheme || Glib::ustring(gtkThemeName).find(":dark") != -1;
         if (!dark) {
-			Glib::RefPtr<Gtk::StyleContext> stylecontext = window->get_style_context();
-			Gdk::RGBA rgba;
-			bool background_set = stylecontext->lookup_color("theme_bg_color", rgba);
+            Glib::RefPtr<Gtk::StyleContext> stylecontext = window->get_style_context();
+            Gdk::RGBA rgba;
+            bool background_set = stylecontext->lookup_color("theme_bg_color", rgba);
             if (background_set && rgba.get_red() + rgba.get_green() + rgba.get_blue() < 1.0) {
                 dark = true;
             }