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

13 files changed, 13 insertions, 13 deletions

diff --git a/src/ui/widget/alignment-selector.cpp b/src/ui/widget/alignment-selector.cpp
index 25b1b7ec6..e5ac17abe 100644
--- a/src/ui/widget/alignment-selector.cpp
+++ b/src/ui/widget/alignment-selector.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ui/widget/alignment-selector.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 
 #include <gtkmm/image.h>
diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp
index f57f419e0..b151a81ea 100644
--- a/src/ui/widget/anchor-selector.cpp
+++ b/src/ui/widget/anchor-selector.cpp
@@ -8,7 +8,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 #include "ui/widget/anchor-selector.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 
 #include <gtkmm/image.h>
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index 3caff3fb5..f8c8a9994 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -10,7 +10,7 @@
 
 #include "ui/widget/clipmaskicon.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "layertypeicon.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index cc6832815..395aa7b9e 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -29,7 +29,7 @@
 #include "preferences.h"
 #include "profile-manager.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "object/color-profile.h"
 
 #include "svg/svg-icc-color.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index e438521c0..ae5efb73d 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -11,7 +11,7 @@
 #include "ui/widget/dock.h"
 
 #include "desktop.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "ui/icon-names.h"
 #include <glibmm/exceptionhandler.h>
diff --git a/src/ui/widget/iconrenderer.cpp b/src/ui/widget/iconrenderer.cpp
index 447c1821d..c6cc1ddcc 100644
--- a/src/ui/widget/iconrenderer.cpp
+++ b/src/ui/widget/iconrenderer.cpp
@@ -11,7 +11,7 @@
 
 #include "ui/widget/iconrenderer.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "layertypeicon.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index e50e3815e..a1d258eb2 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -12,7 +12,7 @@
 
 #include "ui/widget/imagetoggler.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 3abb82586..aa433947a 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -10,7 +10,7 @@
 
 #include "ui/widget/insertordericon.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "layertypeicon.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index 39d1456dd..1e679a01b 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -9,7 +9,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "labelled.h"
 #include <gtkmm/image.h>
 #include <gtkmm/label.h>
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 59b26c2ad..0be876e02 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -14,7 +14,7 @@
 #include <cstring>
 #include <string>
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/dialog/layer-properties.h"
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 33e668702..d8b13788e 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -10,7 +10,7 @@
 
 #include "ui/widget/layertypeicon.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index a44199b10..acdf4f01d 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -33,7 +33,7 @@
 
 #include "io/sys.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/dialog/filedialog.h"
 #include "ui/widget/preferences-widget.h"
 
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index 81d9f1ace..32124bfd2 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "random.h"
 #include <glibmm/i18n.h>