summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter
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/live_effects/parameter
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/live_effects/parameter')
-rw-r--r--src/live_effects/parameter/item.cpp2
-rw-r--r--src/live_effects/parameter/originalitemarray.cpp2
-rw-r--r--src/live_effects/parameter/path.cpp2
-rw-r--r--src/live_effects/parameter/togglebutton.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index bb8f0be69..6683fa861 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -20,10 +20,10 @@
#include "svg/svg.h"
#include "desktop.h"
-#include "ui/icon-loader.h"
#include "inkscape.h"
#include "message-stack.h"
#include "selection-chemistry.h"
+#include "ui/icon-loader.h"
#include "xml/repr.h"
// clipboard support
#include "ui/clipboard.h"
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index eaa22a217..8182b0d9c 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -15,12 +15,12 @@
#include <glibmm/i18n.h>
-#include "ui/icon-loader.h"
#include "inkscape.h"
#include "originalitem.h"
#include "svg/stringstream.h"
#include "svg/svg.h"
#include "ui/clipboard.h"
+#include "ui/icon-loader.h"
#include "object/uri.h"
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 7443acafb..788c8b288 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -26,10 +26,10 @@
#include "desktop.h"
#include "document-undo.h"
#include "document.h"
-#include "ui/icon-loader.h"
#include "inkscape.h"
#include "message-stack.h"
#include "selection-chemistry.h"
+#include "ui/icon-loader.h"
#include "verbs.h"
#include "xml/repr.h"
// needed for on-canvas editing:
diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp
index ff1066eac..bc275e876 100644
--- a/src/live_effects/parameter/togglebutton.cpp
+++ b/src/live_effects/parameter/togglebutton.cpp
@@ -12,13 +12,13 @@
#include <utility>
#include "helper-fns.h"
-#include "ui/icon-loader.h"
#include "inkscape.h"
#include "live_effects/effect.h"
#include "live_effects/parameter/togglebutton.h"
#include "selection.h"
#include "svg/stringstream.h"
#include "svg/svg.h"
+#include "ui/icon-loader.h"
#include "verbs.h"
namespace Inkscape {
@@ -161,7 +161,7 @@ ToggleButtonParam::refresh_button()
}
if ( _icon_active ) {
GdkPixbuf * icon_pixbuf = nullptr;
- Gtk::Widget *im = dynamic_cast<Gtk::Image*>(children[0]);
+ Gtk::Widget *im = dynamic_cast<Gtk::Image *>(children[0]);
if (!im) return;
if (!value) {
im = Glib::wrap(sp_get_icon_image(_icon_inactive, _icon_size));