From 7cbfe202efaa0d3a36cfbb99abdd09d8cc25efc4 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sun, 23 Sep 2018 17:14:48 +0200
Subject: Remove #include "config.h" from header files where possible

---
 src/display/cairo-templates.h                | 4 ----
 src/display/nr-filter-colormatrix.cpp        | 4 ++++
 src/display/nr-filter-component-transfer.cpp | 4 ++++
 src/display/nr-filter-composite.cpp          | 4 ++++
 src/display/nr-filter-convolve-matrix.cpp    | 4 ++++
 src/display/nr-filter-diffuselighting.cpp    | 4 ++++
 src/display/nr-filter-displacement-map.cpp   | 4 ++++
 src/display/nr-filter-morphology.cpp         | 4 ++++
 src/display/nr-filter-specularlighting.cpp   | 4 ++++
 src/display/nr-filter-turbulence.cpp         | 4 ++++
 src/display/sp-canvas-group.h                | 4 ----
 src/display/sp-canvas-item.h                 | 4 ----
 src/display/sp-canvas.h                      | 4 ----
 13 files changed, 36 insertions(+), 16 deletions(-)

(limited to 'src/display')

diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index ba2213e0b..8241f7cb0 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -12,10 +12,6 @@
 #ifndef SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H
 #define SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <glib.h>
 
 #ifdef HAVE_OPENMP
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index d27e6104a..6f9c6c2b0 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -10,6 +10,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <cmath>
 #include <algorithm>
 #include "display/cairo-templates.h"
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index 38b66e230..9e9c753fa 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -10,6 +10,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <cmath>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp
index 0eabde3ae..22a888c6d 100644
--- a/src/display/nr-filter-composite.cpp
+++ b/src/display/nr-filter-composite.cpp
@@ -9,6 +9,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <cmath>
 
 #include "display/cairo-templates.h"
diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index 3ab5f74f7..2b6413c19 100644
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -10,6 +10,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vector>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 183f76676..657f04304 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -11,6 +11,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <glib.h>
 
 #include "display/cairo-templates.h"
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index 18b6c2810..e6f0cdee4 100644
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -9,6 +9,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-displacement-map.h"
diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index 22b73228e..f97ab1bd6 100644
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -9,6 +9,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <cmath>
 #include <algorithm>
 #include <deque>
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index f989119b7..0cdd441e9 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -10,6 +10,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <glib.h>
 #include <cmath>
 
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index 2c7668631..db0abbb54 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -17,6 +17,10 @@
  * Released under GNU GPL version 2 (or later), read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter.h"
diff --git a/src/display/sp-canvas-group.h b/src/display/sp-canvas-group.h
index 9aa99d563..a6a2c99c1 100644
--- a/src/display/sp-canvas-group.h
+++ b/src/display/sp-canvas-group.h
@@ -19,10 +19,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <glib-object.h>
 
 #define SP_TYPE_CANVAS_GROUP (sp_canvas_group_get_type())
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h
index 00edb4dee..5591291cf 100644
--- a/src/display/sp-canvas-item.h
+++ b/src/display/sp-canvas-item.h
@@ -19,10 +19,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <2geom/rect.h>
 #include <glib-object.h>
 
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 4e9a81d83..cf29acce8 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -20,10 +20,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <gtk/gtk.h>
 #include <cstdint>
 #include <glibmm/ustring.h>
-- 
cgit v1.2.3