Move icon-loader and provide a temporary fallback to render pixbuf

16 files changed, 18 insertions, 18 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 495d2e857..0bae88103 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -41,7 +41,7 @@
 #include "object/sp-root.h"
 #include "object/sp-text.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/multi-path-manipulator.h"
diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp
index 6d40750ed..374020a89 100644
--- a/src/ui/dialog/attrdialog.cpp
+++ b/src/ui/dialog/attrdialog.cpp
@@ -16,7 +16,7 @@
 #include "selection.h"
 #include "document-undo.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/iconrenderer.h"
 
 #include "xml/node-event-vector.h"
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 3dc88edb0..c55220973 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -40,7 +40,7 @@
 #include "display/drawing-context.h"
 #include "display/drawing.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "helper/window.h"
 
 #include "object/sp-item.h"
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index 95f433a30..5b3fe7660 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -17,7 +17,7 @@
 #include "verbs.h"
 #include "selection.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/iconrenderer.h"
 
 #include "xml/attribute-record.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index f81fe79be..f61b52968 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -30,7 +30,7 @@
 #include "display/canvas-grid.h"
 #include "document-properties.h"
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "io/sys.h"
 #include "object/sp-root.h"
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index eea45cc5b..67de34731 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -27,7 +27,7 @@
 
 #include "svg/css-ostringstream.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/widget/notebook-page.h"
 
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 6b7402e47..46c733bf5 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -28,7 +28,7 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "include/gtkmm_version.h"
 
@@ -36,7 +36,7 @@
 
 #include "svg/css-ostringstream.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/tools/tool-base.h"
 #include "ui/widget/imagetoggler.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 200ab86b7..60542a9d8 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -27,7 +27,7 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject-reference.h"
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index d6189fcb2..2954ea418 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -31,7 +31,7 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "include/gtkmm_version.h"
 
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 279773def..5bdda62c5 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -16,7 +16,7 @@
 #include "ocaldialogs.h"
 
 #include "filedialogimpl-gtkmm.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "io/sys.h"
 #include "path-prefix.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index c20a458b9..f3a44f690 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -19,7 +19,7 @@
 #include "inkscape.h"
 #include "document-undo.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/iconrenderer.h"
 
 #include "xml/attribute-record.h"
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 0141529a7..85f395f26 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -35,7 +35,7 @@
 
 #include "display/cairo-utils.h"
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "io/resource.h"
 #include "io/sys.h"
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 9ee6f4851..f0678c2b2 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -26,8 +26,8 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
-#include "helper/icon-loader.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"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 9edac0688..ed06f849a 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -26,7 +26,7 @@
 #include "transformation.h"
 #include "verbs.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "object/sp-item-transform.h"
 #include "object/sp-namedview.h"
 
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 7ecb982f3..1306eefd9 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -16,7 +16,7 @@
 
 #include "document-undo.h"
 #include "document.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "util/signal-blocker.h"
 
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 7baccba6f..f0c04828e 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -36,7 +36,7 @@
 #include "object/sp-root.h"
 #include "object/sp-string.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/dialog-events.h"
 #include "ui/icon-names.h"
 #include "ui/interface.h"