summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2018-11-09 12:01:12 +0000
committerJabiertxof <jabier.arraiza@marker.es>2018-11-09 12:01:12 +0000
commit2a57459e1a0d01debbafe0884eae15fb15ea3745 (patch)
tree0d8101590e06bb6d09d58e71d8cfa7da20021cb9 /src/ui/dialog
parentMove icon-loader and provide a temporary fallback to render pixbuf (diff)
downloadinkscape-2a57459e1a0d01debbafe0884eae15fb15ea3745.tar.gz
inkscape-2a57459e1a0d01debbafe0884eae15fb15ea3745.zip
Fix codding style
Diffstat (limited to 'src/ui/dialog')
-rw-r--r--src/ui/dialog/clonetiler.cpp2
-rw-r--r--src/ui/dialog/document-properties.cpp2
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp6
-rw-r--r--src/ui/dialog/ocaldialogs.cpp2
-rw-r--r--src/ui/dialog/symbols.cpp2
-rw-r--r--src/ui/dialog/tags.cpp3
-rw-r--r--src/ui/dialog/transformation.cpp2
-rw-r--r--src/ui/dialog/undo-history.cpp2
-rw-r--r--src/ui/dialog/xml-tree.cpp2
9 files changed, 11 insertions, 12 deletions
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index c55220973..e179d3692 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -40,8 +40,8 @@
#include "display/drawing-context.h"
#include "display/drawing.h"
-#include "ui/icon-loader.h"
#include "helper/window.h"
+#include "ui/icon-loader.h"
#include "object/sp-item.h"
#include "object/sp-namedview.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index f61b52968..3153e2ac5 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -30,12 +30,12 @@
#include "display/canvas-grid.h"
#include "document-properties.h"
#include "helper/action.h"
-#include "ui/icon-loader.h"
#include "include/gtkmm_version.h"
#include "io/sys.h"
#include "object/sp-root.h"
#include "object/sp-script.h"
#include "ui/dialog/filedialog.h"
+#include "ui/icon-loader.h"
#include "ui/icon-names.h"
#include "ui/shape-editor.h"
#include "ui/tools-switch.h"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 19048bc23..552877a52 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -26,10 +26,10 @@
#include <glibmm/markup.h>
#include <glibmm/miscutils.h>
#include <gtk/gtksettings.h>
+#include <gtkmm/cssprovider.h>
#include <gtkmm/main.h>
#include <gtkmm/recentinfo.h>
#include <gtkmm/recentmanager.h>
-#include <gtkmm/cssprovider.h>
#include "cms-system.h"
#include "document.h"
@@ -919,7 +919,7 @@ void InkscapePreferences::initPageUI()
_symbolic_icons.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::symbolicAddClass));
_page_theme.add_line(true, "", _symbolic_icons, "", "", true),
_symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff);
- Gtk::Button * _apply_color = new Gtk::Button(_("Apply color"));
+ Gtk::Button *_apply_color = new Gtk::Button(_("Apply color"));
_apply_color->set_tooltip_text(_("Apply color to symbolic icons)"));
_apply_color->signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::symbolicAddClass));
_page_theme.add_line(false, "", _symbolic_color, _("Color for symbolic icons"), "", false, _apply_color);
@@ -2434,7 +2434,7 @@ void InkscapePreferences::on_pagelist_selection_changed()
Gtk::Main::iteration();
}
this->show_all_children();
- if (prefs->getInt("/dialogs/preferences/page",0) == PREFS_PAGE_UI_THEME) {
+ if (prefs->getInt("/dialogs/preferences/page", 0) == PREFS_PAGE_UI_THEME) {
symbolicThemeCheck();
}
}
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 5bdda62c5..52692999a 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -16,10 +16,10 @@
#include "ocaldialogs.h"
#include "filedialogimpl-gtkmm.h"
-#include "ui/icon-loader.h"
#include "io/sys.h"
#include "path-prefix.h"
#include "preferences.h"
+#include "ui/icon-loader.h"
#include "ui/interface.h"
#include <gtkmm/notebook.h>
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 85f395f26..ec49a2317 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -35,7 +35,6 @@
#include "display/cairo-utils.h"
#include "helper/action.h"
-#include "ui/icon-loader.h"
#include "include/gtkmm_version.h"
#include "io/resource.h"
#include "io/sys.h"
@@ -45,6 +44,7 @@
#include "object/sp-use.h"
#include "ui/cache/svg_preview_cache.h"
#include "ui/clipboard.h"
+#include "ui/icon-loader.h"
#include "ui/icon-names.h"
#ifdef WITH_LIBVISIO
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index f0678c2b2..4ed279444 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -26,13 +26,12 @@
#include "verbs.h"
#include "helper/action.h"
-#include "ui/icon-loader.h"
-#include "ui/icon-loader.h"
#include "include/gtkmm_version.h"
#include "object/sp-defs.h"
#include "object/sp-item.h"
#include "object/sp-object-group.h"
#include "svg/css-ostringstream.h"
+#include "ui/icon-loader.h"
#include "ui/tools/tool-base.h"
#include "ui/widget/color-notebook.h"
#include "ui/widget/iconrenderer.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index ed06f849a..a074f081b 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -26,9 +26,9 @@
#include "transformation.h"
#include "verbs.h"
-#include "ui/icon-loader.h"
#include "object/sp-item-transform.h"
#include "object/sp-namedview.h"
+#include "ui/icon-loader.h"
#include "ui/icon-names.h"
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 1306eefd9..eae9ea6c8 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -16,8 +16,8 @@
#include "document-undo.h"
#include "document.h"
-#include "ui/icon-loader.h"
#include "inkscape.h"
+#include "ui/icon-loader.h"
#include "util/signal-blocker.h"
#include "desktop.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index f0c04828e..d0cbf99cb 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -36,8 +36,8 @@
#include "object/sp-root.h"
#include "object/sp-string.h"
-#include "ui/icon-loader.h"
#include "ui/dialog-events.h"
+#include "ui/icon-loader.h"
#include "ui/icon-names.h"
#include "ui/interface.h"
#include "ui/tools/tool-base.h"