summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-03-28 21:23:01 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-03-28 21:23:01 +0000
commit5606bdeb7c7006347224bdce324d4b8cc048ce8b (patch)
tree6a599dbcc101bc4357298d28c44a8727a0da26e5
parentdito (diff)
downloadinkscape-5606bdeb7c7006347224bdce324d4b8cc048ce8b.tar.gz
inkscape-5606bdeb7c7006347224bdce324d4b8cc048ce8b.zip
An a few more config.h fixes
-rw-r--r--src/extension/internal/cairo-ps-out.cpp4
-rw-r--r--src/extension/internal/cairo-ps-out.h4
-rw-r--r--src/extension/internal/cairo-renderer-pdf-out.cpp4
-rw-r--r--src/extension/internal/cairo-renderer-pdf-out.h4
-rw-r--r--src/inkscape-main.cpp4
-rw-r--r--src/libnrtype/Layout-TNG-Output.cpp4
-rw-r--r--src/libnrtype/Layout-TNG.h4
-rw-r--r--src/ui/dialog/livepatheffect-add.cpp4
-rw-r--r--src/ui/widget/ink-flow-box.cpp4
-rw-r--r--src/ui/widget/spin-button-tool-item.h4
-rw-r--r--src/widgets/desktop-widget.h4
11 files changed, 4 insertions, 40 deletions
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index baa1cf1b0..5dfbe051e 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -15,10 +15,6 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
#include <cairo.h>
#ifdef CAIRO_HAS_PS_SURFACE
diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h
index 974f9668a..ee58179c4 100644
--- a/src/extension/internal/cairo-ps-out.h
+++ b/src/extension/internal/cairo-ps-out.h
@@ -17,10 +17,6 @@
#ifndef EXTENSION_INTERNAL_CAIRO_PS_OUT_H
#define EXTENSION_INTERNAL_CAIRO_PS_OUT_H
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
#include "extension/implementation/implementation.h"
namespace Inkscape {
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 9ff3579ed..a48025c1a 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -15,10 +15,6 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
#include <cairo.h>
#ifdef CAIRO_HAS_PDF_SURFACE
diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h
index dfb2ad3a9..9f9901250 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.h
+++ b/src/extension/internal/cairo-renderer-pdf-out.h
@@ -15,10 +15,6 @@
#ifndef EXTENSION_INTERNAL_CAIRO_RENDERER_PDF_OUT_H
#define EXTENSION_INTERNAL_CAIRO_RENDERER_PDF_OUT_H
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
#include "extension/implementation/implementation.h"
namespace Inkscape {
diff --git a/src/inkscape-main.cpp b/src/inkscape-main.cpp
index bfbefdc18..998935a4b 100644
--- a/src/inkscape-main.cpp
+++ b/src/inkscape-main.cpp
@@ -10,10 +10,6 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "inkscape-application.h"
#include "path-prefix.h"
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 2a7c835f3..a3c11133b 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -10,10 +10,6 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
#include <glib.h>
#include "Layout-TNG.h"
#include "display/drawing-text.h"
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index c09fc27ca..8a0d74f69 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -12,10 +12,6 @@
#ifndef __LAYOUT_TNG_H__
#define __LAYOUT_TNG_H__
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
//#define DEBUG_TEXTLAYOUT_DUMPASTEXT
#include <2geom/d2.h>
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index 02578efab..8e4d7db15 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -9,10 +9,6 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h" // only include where actually required!
-#endif
-
#include "desktop.h"
#include "io/resource.h"
#include "live_effects/effect.h"
diff --git a/src/ui/widget/ink-flow-box.cpp b/src/ui/widget/ink-flow-box.cpp
index 215e9d954..d102ceb6c 100644
--- a/src/ui/widget/ink-flow-box.cpp
+++ b/src/ui/widget/ink-flow-box.cpp
@@ -11,10 +11,6 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h" // only include where actually required!
-#endif
-
#include "preferences.h"
#include "ui/icon-loader.h"
#include "ui/widget/ink-flow-box.h"
diff --git a/src/ui/widget/spin-button-tool-item.h b/src/ui/widget/spin-button-tool-item.h
index 4d3b75250..1b33e8580 100644
--- a/src/ui/widget/spin-button-tool-item.h
+++ b/src/ui/widget/spin-button-tool-item.h
@@ -2,10 +2,6 @@
#ifndef SEEN_SPIN_BUTTON_TOOL_ITEM_H
#define SEEN_SPIN_BUTTON_TOOL_ITEM_H
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <gtkmm/toolitem.h>
namespace Gtk {
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 8c3ce12fe..141d6b057 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -15,6 +15,10 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h" // only include where actually required!
+#endif
+
#include <gtkmm.h>
#include "message.h"