summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-09-30 23:49:49 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-10-01 22:50:12 +0000
commit71f15d1e96dab3a48fd8e544561f1830795b56ed (patch)
tree43579c16ebba5afc977b059b9ddc057e40fb4dae /src/libnrtype
parentUse _WIN32 instead of WIN32 (diff)
downloadinkscape-71f15d1e96dab3a48fd8e544561f1830795b56ed.tar.gz
inkscape-71f15d1e96dab3a48fd8e544561f1830795b56ed.zip
Remove #include "config.h" wherever possible
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontFactory.cpp2
-rw-r--r--src/libnrtype/FontInstance.cpp2
-rw-r--r--src/libnrtype/Layout-TNG-Input.cpp2
-rw-r--r--src/libnrtype/Layout-TNG-Output.cpp5
-rw-r--r--src/libnrtype/Layout-TNG.h4
-rw-r--r--src/libnrtype/font-lister.cpp4
6 files changed, 12 insertions, 7 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index 964544077..cfa37bb97 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -9,7 +9,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h" // only include where actually required!
#endif
#ifndef PANGO_ENABLE_ENGINE
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index d7a90bcd4..235840bb0 100644
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -9,7 +9,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h" // only include where actually required!
#endif
#ifndef PANGO_ENABLE_ENGINE
diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index 7101ee063..cdaee3ad8 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -10,7 +10,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h" // only include where actually required!
#endif
#ifndef PANGO_ENABLE_ENGINE
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 7f9ee69a9..c9f140872 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -8,6 +8,11 @@
*
* Released under GNU GPL, 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 f9917bb85..879bef24b 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -11,6 +11,10 @@
#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/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index efbb9e3a9..3cd97fa8e 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glibmm/markup.h>
#include <glibmm/regex.h>