diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-30 23:49:49 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-01 22:50:12 +0000 |
| commit | 71f15d1e96dab3a48fd8e544561f1830795b56ed (patch) | |
| tree | 43579c16ebba5afc977b059b9ddc057e40fb4dae /src | |
| parent | Use _WIN32 instead of WIN32 (diff) | |
| download | inkscape-71f15d1e96dab3a48fd8e544561f1830795b56ed.tar.gz inkscape-71f15d1e96dab3a48fd8e544561f1830795b56ed.zip | |
Remove #include "config.h" wherever possible
Diffstat (limited to 'src')
311 files changed, 144 insertions, 1029 deletions
diff --git a/src/attribute-rel-css.cpp b/src/attribute-rel-css.cpp index d8c90b573..430324f4a 100644 --- a/src/attribute-rel-css.cpp +++ b/src/attribute-rel-css.cpp @@ -12,10 +12,6 @@ * mapping indirectly(only reading). */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <fstream> #include <sstream> #include <iostream> diff --git a/src/attribute-rel-svg.cpp b/src/attribute-rel-svg.cpp index e0aaa9f15..f4270ccc4 100644 --- a/src/attribute-rel-svg.cpp +++ b/src/attribute-rel-svg.cpp @@ -12,10 +12,6 @@ * mapping indirectly(only reading). */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <fstream> #include <sstream> diff --git a/src/attributes.cpp b/src/attributes.cpp index e98f84700..ccaeb4f8f 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glib.h> // g_assert() #include "attributes.h" diff --git a/src/cms-color-types.h b/src/cms-color-types.h index 380448795..9d9ff73a2 100644 --- a/src/cms-color-types.h +++ b/src/cms-color-types.h @@ -6,6 +6,10 @@ * A simple abstraction to provide opaque compatibility with either lcms or lcms2. */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #if HAVE_LIBLCMS1 # include <icc34.h> #endif diff --git a/src/color-profile-cms-fns.h b/src/color-profile-cms-fns.h index 9e5f64a9c..09a8f274f 100644 --- a/src/color-profile-cms-fns.h +++ b/src/color-profile-cms-fns.h @@ -1,6 +1,10 @@ #ifndef SEEN_COLOR_PROFILE_CMS_FNS_H #define SEEN_COLOR_PROFILE_CMS_FNS_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #if HAVE_LIBLCMS2 # include <lcms2.h> #elif HAVE_LIBLCMS1 diff --git a/src/colorspace.h b/src/colorspace.h index 8819757de..5b47f7737 100644 --- a/src/colorspace.h +++ b/src/colorspace.h @@ -10,6 +10,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #if HAVE_STDINT_H # include <cstdint> #endif diff --git a/src/conditions.cpp b/src/conditions.cpp index 25084a9ac..9109cd1fb 100644 --- a/src/conditions.cpp +++ b/src/conditions.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <set> #include <glibmm/ustring.h> diff --git a/src/debug/heap.cpp b/src/debug/heap.cpp index 0135a9ceb..d543a18f6 100644 --- a/src/debug/heap.cpp +++ b/src/debug/heap.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "inkgc/gc-alloc.h" #include "debug/gc-heap.h" #include "debug/sysv-heap.h" diff --git a/src/debug/sysv-heap.cpp b/src/debug/sysv-heap.cpp index 5cc06d619..2731a931e 100644 --- a/src/debug/sysv-heap.cpp +++ b/src/debug/sysv-heap.cpp @@ -10,7 +10,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #ifdef HAVE_MALLOC_H diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 5256d5abb..ca9190b5c 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <map> #include <string> diff --git a/src/desktop.cpp b/src/desktop.cpp index b4051f66d..79fec2927 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -21,11 +21,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <2geom/transforms.h> diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h index 8241f7cb0..1d3277113 100644 --- a/src/display/cairo-templates.h +++ b/src/display/cairo-templates.h @@ -12,6 +12,10 @@ #ifndef SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H #define SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <glib.h> #ifdef HAVE_OPENMP diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp index 965645b15..e4cef786d 100644 --- a/src/display/cairo-utils.cpp +++ b/src/display/cairo-utils.cpp @@ -8,10 +8,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "display/cairo-utils.h" #include <stdexcept> diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 8d9cb7d0a..2bbc8bc37 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -13,10 +13,6 @@ * to the right). The x-axis will always have an angle between 0 and 90 degrees. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/grid.h> diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index db765820f..c474bea50 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -14,10 +14,6 @@ * Don't be shy to correct things. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/grid.h> diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp index 8ee05dda4..fb9d2471a 100644 --- a/src/display/nr-filter-blend.cpp +++ b/src/display/nr-filter-blend.cpp @@ -16,10 +16,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glibmm.h> #include "display/cairo-templates.h" #include "display/cairo-utils.h" diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp index 6f9c6c2b0..d27e6104a 100644 --- a/src/display/nr-filter-colormatrix.cpp +++ b/src/display/nr-filter-colormatrix.cpp @@ -10,10 +10,6 @@ * 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 9e9c753fa..38b66e230 100644 --- a/src/display/nr-filter-component-transfer.cpp +++ b/src/display/nr-filter-component-transfer.cpp @@ -10,10 +10,6 @@ * 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 22a888c6d..0eabde3ae 100644 --- a/src/display/nr-filter-composite.cpp +++ b/src/display/nr-filter-composite.cpp @@ -9,10 +9,6 @@ * 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 2b6413c19..3ab5f74f7 100644 --- a/src/display/nr-filter-convolve-matrix.cpp +++ b/src/display/nr-filter-convolve-matrix.cpp @@ -10,10 +10,6 @@ * 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 657f04304..95e83a5c2 100644 --- a/src/display/nr-filter-diffuselighting.cpp +++ b/src/display/nr-filter-diffuselighting.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <glib.h> diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp index e6f0cdee4..18b6c2810 100644 --- a/src/display/nr-filter-displacement-map.cpp +++ b/src/display/nr-filter-displacement-map.cpp @@ -9,10 +9,6 @@ * 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-flood.cpp b/src/display/nr-filter-flood.cpp index 463b7e0c3..861772352 100644 --- a/src/display/nr-filter-flood.cpp +++ b/src/display/nr-filter-flood.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include "display/cairo-utils.h" diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index 5cc8f74fd..0bebd6da8 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -11,7 +11,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "config.h" // Needed for HAVE_OPENMP +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif #include <algorithm> #include <cmath> diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp index f97ab1bd6..260479699 100644 --- a/src/display/nr-filter-morphology.cpp +++ b/src/display/nr-filter-morphology.cpp @@ -10,7 +10,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <cmath> diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp index 0cdd441e9..55076c745 100644 --- a/src/display/nr-filter-specularlighting.cpp +++ b/src/display/nr-filter-specularlighting.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <glib.h> diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp index db0abbb54..2c7668631 100644 --- a/src/display/nr-filter-turbulence.cpp +++ b/src/display/nr-filter-turbulence.cpp @@ -17,10 +17,6 @@ * 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/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp index e2b112c1b..2c17a7ada 100644 --- a/src/display/nr-svgfonts.cpp +++ b/src/display/nr-svgfonts.cpp @@ -1,4 +1,3 @@ -#include "config.h" /* * SVGFonts rendering implementation * diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index e0da6f7a0..bc22f1a5a 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include <gdkmm/devicemanager.h> diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index cf29acce8..ef2df2292 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -20,6 +20,10 @@ * 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 <gtk/gtk.h> #include <cstdint> #include <glibmm/ustring.h> diff --git a/src/display/sp-ctrlcurve.cpp b/src/display/sp-ctrlcurve.cpp index 26a3c2055..961ccec0b 100644 --- a/src/display/sp-ctrlcurve.cpp +++ b/src/display/sp-ctrlcurve.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "display/sp-ctrlcurve.h" #include "display/sp-canvas-util.h" #include "display/cairo-utils.h" diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp index 709f85e54..0f0868f10 100644 --- a/src/display/sp-ctrlline.cpp +++ b/src/display/sp-ctrlline.cpp @@ -18,10 +18,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "display/sp-ctrlline.h" #include "display/sp-canvas-util.h" #include "display/cairo-utils.h" diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp index 40c011e26..a7ac72087 100644 --- a/src/display/sp-ctrlquadr.cpp +++ b/src/display/sp-ctrlquadr.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "sp-canvas-item.h" #include "sp-canvas.h" #include "sp-canvas-util.h" diff --git a/src/document.cpp b/src/document.cpp index af5c2f2a3..6f4706ebc 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -36,10 +36,6 @@ #define noSP_DOCUMENT_DEBUG_IDLE #define noSP_DOCUMENT_DEBUG_UNDO -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <string> #include <cstring> diff --git a/src/extension/db.cpp b/src/extension/db.cpp index caa23775d..de9e248df 100644 --- a/src/extension/db.cpp +++ b/src/extension/db.cpp @@ -12,9 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include "db.h" #include "input.h" #include "output.h" diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index 054fc9b2a..845ed8202 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index fdfe87db8..0611ad62f 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -7,11 +7,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "ui/dialog/extensions.h" #include <glibmm/i18n.h> diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index e71e177a5..622dd340a 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/dialog.h> #include <gtkmm/messagedialog.h> diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index c6fcd0e7a..2e8df0791 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -15,10 +15,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/frame.h> diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp index 2a6a76ff4..79b2bb84c 100644 --- a/src/extension/implementation/implementation.cpp +++ b/src/extension/implementation/implementation.cpp @@ -10,9 +10,6 @@ contains the base class for all of that. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include "implementation.h" #include <extension/output.h> diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp index e3b63d0a3..f50124e09 100644 --- a/src/extension/implementation/xslt.cpp +++ b/src/extension/implementation/xslt.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/fileutils.h> #include "file.h" #include "xslt.h" diff --git a/src/extension/init.cpp b/src/extension/init.cpp index d0487d473..7524ba106 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #ifdef HAVE_POPPLER diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp index 636b9d6a4..270fb2f35 100644 --- a/src/extension/internal/bitmap/imagemagick.cpp +++ b/src/extension/internal/bitmap/imagemagick.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <libintl.h> #include <gtkmm/box.h> diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp index 6ff8943e8..c7cb9aff5 100644 --- a/src/extension/internal/cairo-png-out.cpp +++ b/src/extension/internal/cairo-png-out.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-png-out.h b/src/extension/internal/cairo-png-out.h index 6a66d7f3e..d59bf5407 100644 --- a/src/extension/internal/cairo-png-out.h +++ b/src/extension/internal/cairo-png-out.h @@ -14,6 +14,10 @@ #ifndef EXTENSION_INTERNAL_CAIRO_PNG_OUT_H #define EXTENSION_INTERNAL_CAIRO_PNG_OUT_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include "extension/implementation/implementation.h" #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 16340fe2e..8604c2ca7 100644 --- a/src/extension/internal/cairo-ps-out.cpp +++ b/src/extension/internal/cairo-ps-out.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h index e15931de4..3b8df6334 100644 --- a/src/extension/internal/cairo-ps-out.h +++ b/src/extension/internal/cairo-ps-out.h @@ -16,6 +16,10 @@ #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" #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index f7de8d85f..5e4a64e7d 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #ifndef PANGO_ENABLE_BACKEND diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index 3ad891ed1..ab5aaa7e5 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.cpp +++ b/src/extension/internal/cairo-renderer-pdf-out.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h index 7910266e7..7fb93f9d1 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.h +++ b/src/extension/internal/cairo-renderer-pdf-out.h @@ -14,6 +14,10 @@ #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" #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index c521d2791..9d8e96987 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #ifndef PANGO_ENABLE_BACKEND diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index b86fb5049..095208a3d 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -13,8 +13,11 @@ * */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <cstdio> -#include "config.h" #include "cdr-input.h" diff --git a/src/extension/internal/cdr-input.h b/src/extension/internal/cdr-input.h index a0fc69cd6..fbc27c1a4 100644 --- a/src/extension/internal/cdr-input.h +++ b/src/extension/internal/cdr-input.h @@ -14,7 +14,7 @@ #define __EXTENSION_INTERNAL_CDROUTPUT_H__ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef WITH_LIBCDR diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index a0803aafc..7baf84306 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -22,11 +22,6 @@ * http://msdn.microsoft.com/library/en-us/gdi/metafile_5hkj.asp */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstdio> #include <cstdlib> #include <cstdint> diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index a4c351d82..ded78cb60 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -22,10 +22,6 @@ * http://msdn.microsoft.com/library/en-us/gdi/metafile_5hkj.asp */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstring> #include <glibmm/miscutils.h> #include <3rdparty/libuemf/symbol_convert.h> diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp index bb6748c9c..4110fc8ad 100644 --- a/src/extension/internal/gimpgrad.cpp +++ b/src/extension/internal/gimpgrad.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <color-rgba.h> #include "io/sys.h" #include "extension/system.h" diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index 82531e009..03bc8eb06 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/adjustment.h> #include <gtkmm/spinbutton.h> diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index e16487f8e..befb48222 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include "util/units.h" diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index 29cfb4795..6c6ebaa84 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -16,11 +16,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <glibmm/miscutils.h> #include "javafx-out.h" #include <inkscape.h> diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp index 9c509f7d0..ef11f3b1a 100644 --- a/src/extension/internal/latex-pstricks-out.cpp +++ b/src/extension/internal/latex-pstricks-out.cpp @@ -9,9 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif #include "latex-pstricks-out.h" #include <print.h> #include "extension/system.h" diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp index 4f0eb7709..46bae094b 100644 --- a/src/extension/internal/latex-pstricks.cpp +++ b/src/extension/internal/latex-pstricks.cpp @@ -10,11 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - - #include <2geom/pathvector.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/curves.h> diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp index c78471080..665e402d0 100644 --- a/src/extension/internal/latex-text-renderer.cpp +++ b/src/extension/internal/latex-text-renderer.cpp @@ -15,10 +15,6 @@ * Licensed under GNU GPL */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "latex-text-renderer.h" #include <csignal> diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp index 42c17bbdc..a9f738f1f 100644 --- a/src/extension/internal/metafile-inout.cpp +++ b/src/extension/internal/metafile-inout.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstring> #include <fstream> #include <glib.h> diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp index 26aade753..823060f1a 100644 --- a/src/extension/internal/metafile-print.cpp +++ b/src/extension/internal/metafile-print.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstring> #include <fstream> #include <glib.h> diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 7d18196c9..e1ef985bc 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -35,12 +35,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "odf.h" //# System includes diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index df04b2322..9e5217dd3 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include "pdf-input.h" diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h index 88a894f1c..ecd996632 100644 --- a/src/extension/internal/pdfinput/pdf-input.h +++ b/src/extension/internal/pdfinput/pdf-input.h @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef HAVE_POPPLER diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index 9e4cd583f..bc7ad8a6e 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef HAVE_POPPLER diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h index 17eb02546..2414bd376 100644 --- a/src/extension/internal/pdfinput/pdf-parser.h +++ b/src/extension/internal/pdfinput/pdf-parser.h @@ -8,6 +8,10 @@ #ifndef PDF_PARSER_H #define PDF_PARSER_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #ifdef HAVE_POPPLER #include "poppler-transition-api.h" diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index a59397a10..3d8d9b9b1 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include <string> diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h index 7fdb0b5fc..c61f2cc40 100644 --- a/src/extension/internal/pdfinput/svg-builder.h +++ b/src/extension/internal/pdfinput/svg-builder.h @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef HAVE_POPPLER diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp index 05e906f9d..458e68f1d 100644 --- a/src/extension/internal/pov-out.cpp +++ b/src/extension/internal/pov-out.cpp @@ -17,10 +17,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif #include "pov-out.h" #include <inkscape.h> #include <inkscape-version.h> diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index 8a5db2005..746089893 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm.h> #include <giomm/file.h> diff --git a/src/extension/internal/svgz.cpp b/src/extension/internal/svgz.cpp index 27992ba58..9b5a7ff08 100644 --- a/src/extension/internal/svgz.cpp +++ b/src/extension/internal/svgz.cpp @@ -12,9 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif #include "svgz.h" #include "extension/extension.h" #include "extension/system.h" diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 783fcfc8b..019e1852d 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -13,8 +13,11 @@ * */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <cstdio> -#include "config.h" #include "vsd-input.h" diff --git a/src/extension/internal/vsd-input.h b/src/extension/internal/vsd-input.h index 6a5c28e65..972c2d489 100644 --- a/src/extension/internal/vsd-input.h +++ b/src/extension/internal/vsd-input.h @@ -14,7 +14,7 @@ #define __EXTENSION_INTERNAL_VSDOUTPUT_H__ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef WITH_LIBVISIO diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index 3bc6b1b3d..3783eaa1a 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -22,11 +22,6 @@ * http://msdn.microsoft.com/library/en-us/gdi/metafile_5hkj.asp */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - //#include <png.h> //This must precede text_reassemble.h or it blows up in pngconf.h when compiling #include <cstdio> #include <cstdlib> diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 223c7c4d2..2c84fd9c8 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -23,12 +23,6 @@ * http://msdn.microsoft.com/library/en-us/gdi/metafile_5hkj.asp */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - - #include <2geom/sbasis-to-bezier.h> #include <2geom/elliptical-arc.h> diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index 32e3a91f2..2f25481a0 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -39,8 +39,11 @@ * Corel Corporation or Corel Corporation Limited." */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <cstdio> -#include "config.h" #ifdef WITH_LIBWPG diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h index f938a8d17..c81396ffc 100644 --- a/src/extension/internal/wpg-input.h +++ b/src/extension/internal/wpg-input.h @@ -13,6 +13,10 @@ #ifndef __EXTENSION_INTERNAL_WPGOUTPUT_H__ #define __EXTENSION_INTERNAL_WPGOUTPUT_H__ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #ifdef WITH_LIBWPG #include "../implementation/implementation.h" diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp index ac86e77b1..1ba9f6633 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/bool.cpp @@ -6,10 +6,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp index 886f6ab49..6ce5d78b1 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/color.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <iostream> #include <sstream> diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp index d795514c3..5726962c7 100644 --- a/src/extension/param/description.cpp +++ b/src/extension/param/description.cpp @@ -9,10 +9,6 @@ # define ESCAPE_DOLLAR_COMMANDLINE #endif -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/label.h> #include <glibmm/i18n.h> diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index df4b22d0c..0de20a382 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/comboboxtext.h> #include <glibmm/i18n.h> diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index bde96339a..f71e716a0 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -6,10 +6,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/scale.h> diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp index 2e0792081..d79b2916c 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/int.cpp @@ -6,10 +6,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/scale.h> diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp index f948cc937..de8508e5a 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/notebook.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp index 36c6838cd..31b40d2cd 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/param/parameter.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #ifdef linux // does the dollar sign need escaping when passed as string parameter? # define ESCAPE_DOLLAR_COMMANDLINE #endif diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 428767cb0..8044e899e 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/comboboxtext.h> #include <gtkmm/radiobutton.h> diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index 59e21d77d..5699a2fdb 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -6,10 +6,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> diff --git a/src/extension/plugins/grid2/grid.cpp b/src/extension/plugins/grid2/grid.cpp index 91d9e3b2b..0b43e3ef1 100644 --- a/src/extension/plugins/grid2/grid.cpp +++ b/src/extension/plugins/grid2/grid.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/adjustment.h> #include <gtkmm/spinbutton.h> diff --git a/src/extension/system.cpp b/src/extension/system.cpp index f000e88f0..6c39dda6c 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -16,10 +16,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "ui/interface.h" #include "system.h" diff --git a/src/file.cpp b/src/file.cpp index 97c61298b..ac4d0ab62 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <gtkmm.h> diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index 7551e11c4..b0d330431 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> diff --git a/src/help.cpp b/src/help.cpp index 93bf715c9..d118796e4 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glibmm.h> #include "file.h" diff --git a/src/helper/gettext.cpp b/src/helper/gettext.cpp index e985267b7..0bd3da06a 100644 --- a/src/helper/gettext.cpp +++ b/src/helper/gettext.cpp @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #ifdef _WIN32 diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index 2e65ae019..5e33cd920 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "icon-loader.h" #include "inkscape.h" #include "io/resource.h" diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index daada34c3..3a853ed23 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <2geom/transforms.h> #include "ui/interface.h" diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 6f5d6002e..8f6b3aeb6 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <png.h> #include "ui/interface.h" #include <2geom/rect.h> diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index 23259ec64..f80b3dd75 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -16,10 +16,6 @@ #define noSP_SS_VERBOSE -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstring> #include "path-prefix.h" diff --git a/src/inkscape.cpp b/src/inkscape.cpp index ca145202c..59e7959f7 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cerrno> #include <unistd.h> diff --git a/src/inkview.cpp b/src/inkview.cpp index eb2355437..f33962704 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <gtkmm/main.h> diff --git a/src/io/http.cpp b/src/io/http.cpp index c12cf079a..164c96783 100644 --- a/src/io/http.cpp +++ b/src/io/http.cpp @@ -27,11 +27,6 @@ * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glib/gstdio.h> #include <libsoup/soup.h> #include <string> diff --git a/src/io/resource.cpp b/src/io/resource.cpp index fd110492e..a373a658f 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" // only include where actually required! #endif #ifdef _WIN32 diff --git a/src/io/sys.cpp b/src/io/sys.cpp index af6e964b7..47b6d4e78 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -11,10 +11,6 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <fstream> #ifdef _WIN32 #include <fcntl.h> diff --git a/src/layer-fns.cpp b/src/layer-fns.cpp index f7a5fb146..3b9428779 100644 --- a/src/layer-fns.cpp +++ b/src/layer-fns.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "document.h" #include "layer-fns.h" diff --git a/src/layer-model.cpp b/src/layer-model.cpp index c86f57483..d6f57a6b4 100644 --- a/src/layer-model.cpp +++ b/src/layer-model.cpp @@ -21,10 +21,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "layer-model.h" #include "document.h" 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> diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 396f03e92..d1dd8d963 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -5,12 +5,12 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -//#define LPE_ENABLE_TEST_EFFECTS //uncomment for toy effects - #ifdef HAVE_CONFIG_H -#include <config.h> +# include "config.h" // only include where actually required! #endif +//#define LPE_ENABLE_TEST_EFFECTS //uncomment for toy effects + // include effects: #include "live_effects/lpe-patternalongpath.h" #include "live_effects/lpe-angle_bisector.h" diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp index c42db4ce9..35a504dfc 100644 --- a/src/live_effects/parameter/originalitem.cpp +++ b/src/live_effects/parameter/originalitem.cpp @@ -4,10 +4,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include "live_effects/parameter/originalitem.h" diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp index d1596cee3..0138f1558 100644 --- a/src/live_effects/parameter/originalitemarray.cpp +++ b/src/live_effects/parameter/originalitemarray.cpp @@ -4,10 +4,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "live_effects/parameter/originalitemarray.h" #include <gtkmm/widget.h> diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp index e17ef74e4..61ca1e1ff 100644 --- a/src/live_effects/parameter/originalpath.cpp +++ b/src/live_effects/parameter/originalpath.cpp @@ -4,10 +4,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include "live_effects/parameter/originalpath.h" diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index 0efb16acb..8716c4228 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -4,10 +4,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "live_effects/parameter/originalpatharray.h" #include "live_effects/lpe-spiro.h" #include "live_effects/lpe-bspline.h" diff --git a/src/main.cpp b/src/main.cpp index bb9010bfa..5af472ff7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,11 +23,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - // This has to be included prior to anything that includes setjmp.h, it croaks otherwise #include <png.h> diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp index f010efe33..1540b7fa6 100644 --- a/src/object/color-profile.cpp +++ b/src/object/color-profile.cpp @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #define noDEBUG_LCMS diff --git a/src/object/color-profile.h b/src/object/color-profile.h index e8cc859d2..4e687b9b6 100644 --- a/src/object/color-profile.h +++ b/src/object/color-profile.h @@ -1,6 +1,10 @@ #ifndef SEEN_COLOR_PROFILE_H #define SEEN_COLOR_PROFILE_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <set> #include <vector> diff --git a/src/object/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp index 19eb532b4..d5a49e7ca 100644 --- a/src/object/filters/gaussian-blur.cpp +++ b/src/object/filters/gaussian-blur.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "gaussian-blur.h" #include "attributes.h" diff --git a/src/object/filters/sp-filter-primitive.cpp b/src/object/filters/sp-filter-primitive.cpp index 1f314c827..e71b8929c 100644 --- a/src/object/filters/sp-filter-primitive.cpp +++ b/src/object/filters/sp-filter-primitive.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include "sp-filter-primitive.h" diff --git a/src/object/sp-dimensions.cpp b/src/object/sp-dimensions.cpp index f39b98945..60e6b6dfd 100644 --- a/src/object/sp-dimensions.cpp +++ b/src/object/sp-dimensions.cpp @@ -13,9 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include "sp-dimensions.h" #include "sp-item.h" diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp index eaddfdcbf..3c6533892 100644 --- a/src/object/sp-filter.cpp +++ b/src/object/sp-filter.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "sp-filter.h" #include <map> diff --git a/src/object/sp-flowregion.cpp b/src/object/sp-flowregion.cpp index 9829cf828..621eb541e 100644 --- a/src/object/sp-flowregion.cpp +++ b/src/object/sp-flowregion.cpp @@ -1,9 +1,6 @@ /* */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <glibmm/i18n.h> #include <xml/repr.h> diff --git a/src/object/sp-flowtext.cpp b/src/object/sp-flowtext.cpp index c0e23ee97..c24b7689b 100644 --- a/src/object/sp-flowtext.cpp +++ b/src/object/sp-flowtext.cpp @@ -1,9 +1,6 @@ /* */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <glibmm/i18n.h> #include <cstring> #include <string> diff --git a/src/object/sp-font-face.cpp b/src/object/sp-font-face.cpp index a60dd6110..5fd7fd99d 100644 --- a/src/object/sp-font-face.cpp +++ b/src/object/sp-font-face.cpp @@ -1,7 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* * SVG <font-face> element implementation * diff --git a/src/object/sp-font.cpp b/src/object/sp-font.cpp index 6736da200..8caac2612 100644 --- a/src/object/sp-font.cpp +++ b/src/object/sp-font.cpp @@ -1,7 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* * SVG <font> element implementation * diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp index a89af4533..a9367192c 100644 --- a/src/object/sp-guide.cpp +++ b/src/object/sp-guide.cpp @@ -15,10 +15,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <algorithm> #include <cstring> #include <string> diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp index 65643c701..95b6ace11 100644 --- a/src/object/sp-image.cpp +++ b/src/object/sp-image.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <cstring> diff --git a/src/object/sp-image.h b/src/object/sp-image.h index 7d62e756a..cb61622ce 100644 --- a/src/object/sp-image.h +++ b/src/object/sp-image.h @@ -14,6 +14,10 @@ #ifndef SEEN_INKSCAPE_SP_IMAGE_H #define SEEN_INKSCAPE_SP_IMAGE_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <glibmm/ustring.h> #include "svg/svg-length.h" #include "display/curve.h" diff --git a/src/object/sp-item-group.cpp b/src/object/sp-item-group.cpp index f0ff9e4fc..8e78da04d 100644 --- a/src/object/sp-item-group.cpp +++ b/src/object/sp-item-group.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <cstring> #include <string> diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp index b7cd69c7f..c09116e97 100644 --- a/src/object/sp-item.cpp +++ b/src/object/sp-item.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "sp-item.h" #include <glibmm/i18n.h> diff --git a/src/object/sp-metadata.cpp b/src/object/sp-metadata.cpp index 39f42d3ff..ad50295d0 100644 --- a/src/object/sp-metadata.cpp +++ b/src/object/sp-metadata.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "sp-metadata.h" #include "xml/node-iterators.h" #include "document.h" diff --git a/src/object/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp index d3da6ccff..62102e292 100644 --- a/src/object/sp-missing-glyph.cpp +++ b/src/object/sp-missing-glyph.cpp @@ -1,7 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* * SVG <missing-glyph> element implementation * diff --git a/src/object/sp-offset.cpp b/src/object/sp-offset.cpp index 7d2997185..1657c9edc 100644 --- a/src/object/sp-offset.cpp +++ b/src/object/sp-offset.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "sp-offset.h" #include <cstring> diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp index 558b3b72e..189f8c2c6 100644 --- a/src/object/sp-path.cpp +++ b/src/object/sp-path.cpp @@ -15,10 +15,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "live_effects/effect.h" diff --git a/src/object/sp-pattern.cpp b/src/object/sp-pattern.cpp index d2167c297..6b1ffeb44 100644 --- a/src/object/sp-pattern.cpp +++ b/src/object/sp-pattern.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "sp-pattern.h" #include <cstring> diff --git a/src/object/sp-rect.cpp b/src/object/sp-rect.cpp index 0a3447f81..ac56577d7 100644 --- a/src/object/sp-rect.cpp +++ b/src/object/sp-rect.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "display/curve.h" #include "inkscape.h" diff --git a/src/object/sp-shape.cpp b/src/object/sp-shape.cpp index dd9c7e488..c5ecd5294 100644 --- a/src/object/sp-shape.cpp +++ b/src/object/sp-shape.cpp @@ -14,10 +14,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 <2geom/transforms.h> #include <2geom/pathvector.h> diff --git a/src/object/sp-star.cpp b/src/object/sp-star.cpp index b0c9a8197..26a1b69bc 100644 --- a/src/object/sp-star.cpp +++ b/src/object/sp-star.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> #include <glib.h> diff --git a/src/object/sp-symbol.cpp b/src/object/sp-symbol.cpp index feb3ed097..db18b5a70 100644 --- a/src/object/sp-symbol.cpp +++ b/src/object/sp-symbol.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <string> #include <2geom/transforms.h> diff --git a/src/object/sp-tspan.cpp b/src/object/sp-tspan.cpp index 25f9e6764..860c30c84 100644 --- a/src/object/sp-tspan.cpp +++ b/src/object/sp-tspan.cpp @@ -23,10 +23,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> #include <glibmm/i18n.h> diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index a785bf949..228906a2e 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> diff --git a/src/path-prefix.cpp b/src/path-prefix.cpp index b79f2b48f..cfd03d445 100644 --- a/src/path-prefix.cpp +++ b/src/path-prefix.cpp @@ -17,17 +17,14 @@ * */ - #ifdef HAVE_CONFIG_H -#include <config.h> +# include "config.h" // only include where actually required! #endif - #include "io/resource.h" #include "path-prefix.h" #include <glib.h> - /** * Determine the location of the Inkscape data directory (typically the share/ folder * from where Inkscape should be loading resources) and append a relative path diff --git a/src/path-prefix.h b/src/path-prefix.h index f875a6c69..929419c1d 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -12,10 +12,6 @@ */ #ifndef SEEN_PATH_PREFIX_H #define SEEN_PATH_PREFIX_H - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include "prefix.h" diff --git a/src/prefix.cpp b/src/prefix.cpp index 7ba6d16f4..107badd90 100644 --- a/src/prefix.cpp +++ b/src/prefix.cpp @@ -23,13 +23,12 @@ * --> expands br_locate to foobar_br_locate */ -#ifndef _PREFIX_C_ -#define _PREFIX_C_ - #ifdef HAVE_CONFIG_H -#include <config.h> +# include "config.h" // only include where actually required! #endif +#ifndef _PREFIX_C_ +#define _PREFIX_C_ #include <glib.h> #include <cstdlib> diff --git a/src/prefix.h b/src/prefix.h index ac3138ae6..405a6b8e2 100644 --- a/src/prefix.h +++ b/src/prefix.h @@ -17,6 +17,10 @@ #ifndef _PREFIX_H_ #define _PREFIX_H_ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/src/print.cpp b/src/print.cpp index f455623ae..e6863c14b 100644 --- a/src/print.cpp +++ b/src/print.cpp @@ -11,10 +11,6 @@ * This code is in public domain */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "print.h" #include "desktop.h" diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 11dc735e9..ebb577529 100755 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -21,10 +21,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <boost/range/adaptor/reversed.hpp> #include <cstring> #include <glibmm/i18n.h> diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp index 9cc7c0928..1ec2e3d3c 100644 --- a/src/selection-describer.cpp +++ b/src/selection-describer.cpp @@ -12,9 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <set> #include <glibmm/i18n.h> diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 8b33a9ee2..84fdbe85c 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -14,9 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <cstring> #include <string> diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 2f83133dc..afc534329 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -16,10 +16,6 @@ * option) any later version. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <vector> #include <cstring> #include <string> diff --git a/src/snapped-line.cpp b/src/snapped-line.cpp index 149ceb16d..bbf132b39 100644 --- a/src/snapped-line.cpp +++ b/src/snapped-line.cpp @@ -1,4 +1,4 @@ -/**#include <config.h> +/** * \file src/snapped-line.cpp * SnappedLine class. * diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 0c2ff0fa0..4d1f6e379 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -22,10 +22,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/regex.h> #include "style-internal.h" diff --git a/src/style.cpp b/src/style.cpp index aba98a498..4c588bbb1 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -19,10 +19,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "style.h" #include <cstring> diff --git a/src/svg-view-slideshow.cpp b/src/svg-view-slideshow.cpp index f5f8c41ca..f405f58c7 100644 --- a/src/svg-view-slideshow.cpp +++ b/src/svg-view-slideshow.cpp @@ -25,10 +25,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glibmm/main.h> #include <gtkmm/button.h> #include <gtkmm/buttonbox.h> diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index e357a2471..43d3a5b62 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <cstring> #include <string> #include <cstdlib> diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp index 9d4435a18..a991a4145 100644 --- a/src/svg/svg-angle.cpp +++ b/src/svg/svg-angle.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <cstring> #include <string> #include <glib.h> diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index bd742cba0..b66ca7118 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <cstdlib> diff --git a/src/svg/test-stubs.cpp b/src/svg/test-stubs.cpp index dea249aa9..9c287cfda 100644 --- a/src/svg/test-stubs.cpp +++ b/src/svg/test-stubs.cpp @@ -10,10 +10,6 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "svg/test-stubs.h" #include <map> #include <string> diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp index 4d8a250e9..1f2c31dae 100644 --- a/src/text-chemistry.cpp +++ b/src/text-chemistry.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> #include <glibmm/i18n.h> diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp index 5d369c9fa..d83f3dd61 100644 --- a/src/ui/cache/svg_preview_cache.cpp +++ b/src/ui/cache/svg_preview_cache.cpp @@ -15,10 +15,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtk/gtk.h> #include <2geom/transforms.h> diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp index cc9c8f0bd..99e58a7c6 100644 --- a/src/ui/dialog-events.cpp +++ b/src/ui/dialog-events.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/entry.h> #include <gtkmm/window.h> #include "macros.h" diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 6cee2e10e..fd78540d5 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -17,10 +17,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "aboutbox.h" #include <fstream> diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 5bf437ca1..a11584584 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -16,11 +16,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glibmm/i18n.h> #include <2geom/transforms.h> diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 3cec38022..3b1d8af0b 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "clonetiler.h" #include <glibmm/i18n.h> diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index 6569bc992..5875a7720 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <cerrno> #include <gtkmm/label.h> diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index 36f4607fb..c449816e7 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -9,9 +9,6 @@ * Copyright (C) 2004 The Inkscape Organization * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include <gtkmm/box.h> #include <gtkmm/dialog.h> diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 5a10cf890..28e45d50a 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "ui/dialog/dialog-manager.h" #include "ui/dialog/prototype.h" diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index a5037bbbf..49268dcb8 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "dialog-manager.h" #include <gtkmm/dialog.h> diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp index 1f679d5d2..5b3d2854c 100644 --- a/src/ui/dialog/dock-behavior.cpp +++ b/src/ui/dialog/dock-behavior.cpp @@ -10,11 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "dock-behavior.h" #include "inkscape.h" #include "desktop.h" diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp index 21ffef04a..6eeafbc39 100644 --- a/src/ui/dialog/document-metadata.cpp +++ b/src/ui/dialog/document-metadata.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "document-metadata.h" #include "desktop.h" #include "rdf.h" diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 342fdbfa6..6a1797310 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include "style.h" diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h index 3607af441..8c96d7517 100644 --- a/src/ui/dialog/document-properties.h +++ b/src/ui/dialog/document-properties.h @@ -14,6 +14,10 @@ #ifndef INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include <cstddef> #include <sigc++/sigc++.h> #include <gtkmm/comboboxtext.h> diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index e153ed8f0..3176323ba 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - // This has to be included prior to anything that includes setjmp.h, it croaks otherwise #include <png.h> diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index 5e1a0cda5..33ca5f5d9 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "extension-editor.h" #include <glibmm/i18n.h> diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index e7b7be9b9..3454f99ea 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -17,10 +17,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <iostream> #include "filedialogimpl-gtkmm.h" diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 8f4ff0feb..4cccffccb 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -13,9 +13,6 @@ */ #ifdef _WIN32 -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif #include "filedialogimpl-win32.h" //General includes #include <cairomm/win32_surface.h> diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp index de1d8f6ae..533402cd7 100644 --- a/src/ui/dialog/filter-editor.cpp +++ b/src/ui/dialog/filter-editor.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <string> #include <gtkmm.h> diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 28325ab9e..c239711ab 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -15,10 +15,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/imagemenuitem.h> #include <gdkmm/display.h> diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index f8de11f42..9620382ea 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "find.h" #include <gtkmm/entry.h> diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 1581a5020..27e5f70d2 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/dialog.h> #include <glibmm/main.h> diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index df7a3349e..a75515227 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -6,10 +6,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <set> #include <glibmm/i18n.h> diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index dd926296d..ab7758b04 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "guides.h" #include <glibmm/i18n.h> diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index e7f6e0040..5d4014cb7 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -13,9 +13,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include <glibmm/i18n.h> #include <glibmm/timer.h> diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index b10948229..419567474 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include "inkscape-preferences.h" diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp index c5cc903c6..4409b5186 100644 --- a/src/ui/dialog/knot-properties.cpp +++ b/src/ui/dialog/knot-properties.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "ui/dialog/knot-properties.h" #include <boost/lexical_cast.hpp> diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index cb4dcb0bc..d9f495152 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -9,9 +9,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "layers.h" diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index ca14c0750..b64961d05 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" // only include where actually required! #endif #include "livepatheffect-add.h" diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index ccd71a171..512831f00 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "livepatheffect-editor.h" #include <gtkmm/expander.h> diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp index 0d5f7332d..e992d86ce 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp @@ -4,10 +4,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm.h> #include "lpe-fillet-chamfer-properties.h" #include <boost/lexical_cast.hpp> diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp index 13a20b041..8cf0a04fc 100644 --- a/src/ui/dialog/lpe-powerstroke-properties.cpp +++ b/src/ui/dialog/lpe-powerstroke-properties.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "lpe-powerstroke-properties.h" #include <boost/lexical_cast.hpp> #include <glibmm/i18n.h> diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp index c9a16225e..454034cc5 100644 --- a/src/ui/dialog/memory.cpp +++ b/src/ui/dialog/memory.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "ui/dialog/memory.h" #include <glibmm/i18n.h> #include <glibmm/main.h> diff --git a/src/ui/dialog/messages.cpp b/src/ui/dialog/messages.cpp index 887f77c07..5b0a11349 100644 --- a/src/ui/dialog/messages.cpp +++ b/src/ui/dialog/messages.cpp @@ -10,9 +10,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "messages.h" #include "verbs.h" diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp index f5fb62864..7f30560d5 100644 --- a/src/ui/dialog/new-from-template.cpp +++ b/src/ui/dialog/new-from-template.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include "new-from-template.h" #include "file.h" diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index 2991e1cda..e95dfc05b 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -11,9 +11,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "objects.h" diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index 42daddff2..c21a8d93f 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "ocaldialogs.h" #include "filedialogimpl-gtkmm.h" diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp index 2c1201db4..9901be38c 100644 --- a/src/ui/dialog/pixelartdialog.cpp +++ b/src/ui/dialog/pixelartdialog.cpp @@ -12,8 +12,9 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ + #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #ifdef GLIBMM_DISABLE_DEPRECATED diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp index cb22e254c..02c2e0e09 100644 --- a/src/ui/dialog/print.cpp +++ b/src/ui/dialog/print.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <cmath> #include <gtkmm.h> diff --git a/src/ui/dialog/save-template-dialog.cpp b/src/ui/dialog/save-template-dialog.cpp index 5b7540039..1be831ef8 100644 --- a/src/ui/dialog/save-template-dialog.cpp +++ b/src/ui/dialog/save-template-dialog.cpp @@ -1,7 +1,3 @@ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include "save-template-dialog.h" #include "file.h" diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index 267b52423..653c1d9b0 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -12,6 +12,10 @@ * 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 "spellcheck.h" #include "message-stack.h" @@ -43,11 +47,6 @@ #include <windows.h> #endif -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - - namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h index a65b25440..3fbb28afe 100644 --- a/src/ui/dialog/spellcheck.h +++ b/src/ui/dialog/spellcheck.h @@ -13,7 +13,7 @@ #define SEEN_SPELLCHECK_H #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" // only include where actually required! #endif #include <vector> diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 599a1f287..753da4de0 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -11,10 +11,6 @@ * Released under GNU GPLv2 (or later). Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <message-stack.h> #include <sstream> diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index c6e5cb98e..0b70ee4bb 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <iostream> diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index bbba6a202..3306ba432 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "tags.h" #include <gtkmm/icontheme.h> #include <gtkmm/imagemenuitem.h> diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 16a79acdb..775d9a88e 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include "text-edit.h" diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp index 72dfe60ec..3d3a49daf 100644 --- a/src/ui/dialog/tracedialog.cpp +++ b/src/ui/dialog/tracedialog.cpp @@ -11,9 +11,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "tracedialog.h" #include <gtkmm/notebook.h> diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index ae664ef7f..a239fc72c 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/dialog.h> #include <2geom/transforms.h> diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp index c480624fd..012adb5d3 100644 --- a/src/ui/dialog/undo-history.cpp +++ b/src/ui/dialog/undo-history.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "undo-history.h" #include "document-undo.h" diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 1c42b1d99..41f5f29a0 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -19,10 +19,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/icontheme.h> #include <gtkmm/radiomenuitem.h> #include <gtkmm/separatormenuitem.h> diff --git a/src/ui/monitor.cpp b/src/ui/monitor.cpp index b78681070..af14d797d 100644 --- a/src/ui/monitor.cpp +++ b/src/ui/monitor.cpp @@ -23,10 +23,6 @@ * along with Inkscape. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gdkmm/rectangle.h> #include <gdkmm/window.h> diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index f7ba74a5a..bdcfd9837 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -10,9 +10,6 @@ * Copyright (C) 2014 Authors * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <glibmm/ustring.h> #include <cmath> diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp index abcab90f2..64e7d6812 100644 --- a/src/ui/shape-editor-knotholders.cpp +++ b/src/ui/shape-editor-knotholders.cpp @@ -11,10 +11,6 @@ * Licensed under GNU GPL */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "preferences.h" diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp index 1c61a2dea..8323e2990 100644 --- a/src/ui/shape-editor.cpp +++ b/src/ui/shape-editor.cpp @@ -7,10 +7,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <glibmm/i18n.h> diff --git a/src/ui/toolbar/arc-toolbar.cpp b/src/ui/toolbar/arc-toolbar.cpp index b8650e2b8..8d1548919 100644 --- a/src/ui/toolbar/arc-toolbar.cpp +++ b/src/ui/toolbar/arc-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "arc-toolbar.h" #include <glibmm/i18n.h> diff --git a/src/ui/toolbar/box3d-toolbar.cpp b/src/ui/toolbar/box3d-toolbar.cpp index 7e7c8df10..32a5f2462 100644 --- a/src/ui/toolbar/box3d-toolbar.cpp +++ b/src/ui/toolbar/box3d-toolbar.cpp @@ -24,10 +24,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 <glibmm/i18n.h> diff --git a/src/ui/toolbar/calligraphy-toolbar.cpp b/src/ui/toolbar/calligraphy-toolbar.cpp index 7f4d9648a..b34329437 100644 --- a/src/ui/toolbar/calligraphy-toolbar.cpp +++ b/src/ui/toolbar/calligraphy-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "ui/dialog/calligraphic-profile-rename.h" #include <glibmm/i18n.h> #include "calligraphy-toolbar.h" diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp index 42bf965b7..3f8db155e 100644 --- a/src/ui/toolbar/connector-toolbar.cpp +++ b/src/ui/toolbar/connector-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "connector-toolbar.h" diff --git a/src/ui/toolbar/dropper-toolbar.cpp b/src/ui/toolbar/dropper-toolbar.cpp index c66c5ead0..4e6aa2322 100644 --- a/src/ui/toolbar/dropper-toolbar.cpp +++ b/src/ui/toolbar/dropper-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "dropper-toolbar.h" diff --git a/src/ui/toolbar/eraser-toolbar.cpp b/src/ui/toolbar/eraser-toolbar.cpp index ec028a2c8..e41817e63 100644 --- a/src/ui/toolbar/eraser-toolbar.cpp +++ b/src/ui/toolbar/eraser-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "eraser-toolbar.h" diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp index b6677e221..ff9790046 100644 --- a/src/ui/toolbar/gradient-toolbar.cpp +++ b/src/ui/toolbar/gradient-toolbar.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> diff --git a/src/ui/toolbar/lpe-toolbar.cpp b/src/ui/toolbar/lpe-toolbar.cpp index b42c1ae0c..e0a15eda8 100644 --- a/src/ui/toolbar/lpe-toolbar.cpp +++ b/src/ui/toolbar/lpe-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "live_effects/lpe-line_segment.h" #include "lpe-toolbar.h" diff --git a/src/ui/toolbar/measure-toolbar.cpp b/src/ui/toolbar/measure-toolbar.cpp index 07eefa330..67c523692 100644 --- a/src/ui/toolbar/measure-toolbar.cpp +++ b/src/ui/toolbar/measure-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "measure-toolbar.h" diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp index 80f817ae3..4b1593650 100644 --- a/src/ui/toolbar/mesh-toolbar.cpp +++ b/src/ui/toolbar/mesh-toolbar.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <gtkmm.h> diff --git a/src/ui/toolbar/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp index 2cb9fb364..1e8fcaba0 100644 --- a/src/ui/toolbar/node-toolbar.cpp +++ b/src/ui/toolbar/node-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> diff --git a/src/ui/toolbar/paintbucket-toolbar.cpp b/src/ui/toolbar/paintbucket-toolbar.cpp index c46a007b6..3b0a6b3f4 100644 --- a/src/ui/toolbar/paintbucket-toolbar.cpp +++ b/src/ui/toolbar/paintbucket-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "paintbucket-toolbar.h" diff --git a/src/ui/toolbar/pencil-toolbar.cpp b/src/ui/toolbar/pencil-toolbar.cpp index cf4ba5a5d..00be88490 100644 --- a/src/ui/toolbar/pencil-toolbar.cpp +++ b/src/ui/toolbar/pencil-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm.h> #include <glibmm/i18n.h> diff --git a/src/ui/toolbar/rect-toolbar.cpp b/src/ui/toolbar/rect-toolbar.cpp index f52e4dfa1..092cc1222 100644 --- a/src/ui/toolbar/rect-toolbar.cpp +++ b/src/ui/toolbar/rect-toolbar.cpp @@ -24,10 +24,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 <glibmm/i18n.h> diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp index fcb76a185..6eac48e21 100644 --- a/src/ui/toolbar/select-toolbar.cpp +++ b/src/ui/toolbar/select-toolbar.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <2geom/rect.h> diff --git a/src/ui/toolbar/spiral-toolbar.cpp b/src/ui/toolbar/spiral-toolbar.cpp index b551ea379..c64e83488 100644 --- a/src/ui/toolbar/spiral-toolbar.cpp +++ b/src/ui/toolbar/spiral-toolbar.cpp @@ -24,10 +24,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 <glibmm/i18n.h> diff --git a/src/ui/toolbar/spray-toolbar.cpp b/src/ui/toolbar/spray-toolbar.cpp index 894a69a69..c5f7feae0 100644 --- a/src/ui/toolbar/spray-toolbar.cpp +++ b/src/ui/toolbar/spray-toolbar.cpp @@ -25,10 +25,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm.h> #include "spray-toolbar.h" diff --git a/src/ui/toolbar/star-toolbar.cpp b/src/ui/toolbar/star-toolbar.cpp index 6cd225c78..66acbf03c 100644 --- a/src/ui/toolbar/star-toolbar.cpp +++ b/src/ui/toolbar/star-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "star-toolbar.h" diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index a521c165d..01e259795 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -26,10 +26,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include "text-toolbar.h" diff --git a/src/ui/toolbar/tweak-toolbar.cpp b/src/ui/toolbar/tweak-toolbar.cpp index be6dda4e5..525df419f 100644 --- a/src/ui/toolbar/tweak-toolbar.cpp +++ b/src/ui/toolbar/tweak-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glibmm/i18n.h> #include "tweak-toolbar.h" diff --git a/src/ui/toolbar/zoom-toolbar.cpp b/src/ui/toolbar/zoom-toolbar.cpp index ec28dda89..aeb16374a 100644 --- a/src/ui/toolbar/zoom-toolbar.cpp +++ b/src/ui/toolbar/zoom-toolbar.cpp @@ -24,10 +24,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "zoom-toolbar.h" #include "desktop.h" diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp index dc3f0db0f..cc4b55999 100644 --- a/src/ui/tools/arc-tool.cpp +++ b/src/ui/tools/arc-tool.cpp @@ -15,10 +15,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <glibmm/i18n.h> #include <gdk/gdkkeysyms.h> diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index c0be19479..0b5de4f46 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index de57d4500..43f2d6745 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -17,10 +17,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "flood-tool.h" #include <cmath> diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 6c8a3f2c3..08c637d2e 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -16,10 +16,6 @@ #define DRAW_VERBOSE -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "desktop-style.h" #include "macros.h" #include "message-stack.h" diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp index c00d0324e..3016d30b5 100644 --- a/src/ui/tools/gradient-tool.cpp +++ b/src/ui/tools/gradient-tool.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <gdk/gdkkeysyms.h> diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index dae62d4f9..a61e6dfaa 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <gtk/gtk.h> diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index a7f8d2af2..f11fcac71 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -10,9 +10,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <gtkmm.h> #include <glibmm/i18n.h> diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 251de33b3..c78575972 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - //#define DEBUG_MESH diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 6e8d631df..291737778 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include "config.h" // only include where actually required! #endif #include <cstring> diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp index aa8fe48cd..297708208 100644 --- a/src/ui/tools/star-tool.cpp +++ b/src/ui/tools/star-tool.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp index 8542b1b6f..d79d09692 100644 --- a/src/ui/tools/text-tool.cpp +++ b/src/ui/tools/text-tool.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gdk/gdkkeysyms.h> #include <gtkmm/clipboard.h> #include <glibmm/i18n.h> diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 172668618..b0cfbcce9 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -14,10 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gdk/gdkkeysyms.h> #include <gdkmm/display.h> #include <glibmm/i18n.h> diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index d7f7ba87b..5550e00c8 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "widgets/desktop-widget.h" #include "uxmanager.h" diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp index 21fe10f4a..a265ed918 100644 --- a/src/ui/view/view.cpp +++ b/src/ui/view/view.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <2geom/point.h> #include "document.h" #include "view.h" diff --git a/src/ui/widget/button.cpp b/src/ui/widget/button.cpp index 6c2d419cf..2a491e17c 100644 --- a/src/ui/widget/button.cpp +++ b/src/ui/widget/button.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "button.h" namespace Inkscape { diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp index 704b5c653..281e60886 100644 --- a/src/ui/widget/clipmaskicon.cpp +++ b/src/ui/widget/clipmaskicon.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "ui/widget/clipmaskicon.h" #include "helper/icon-loader.h" diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index bddbb60e8..877a6d011 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" // only include where actually required! #endif #include <set> diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index 788ede294..6f5423de4 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -12,13 +12,13 @@ * This code is in public domain */ -#undef SPCS_PREVIEW -#define noDUMP_CHANGE_INFO - #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" // only include where actually required! #endif +#undef SPCS_PREVIEW +#define noDUMP_CHANGE_INFO + #include <glibmm/i18n.h> #include <gtkmm/label.h> #include <gtkmm/notebook.h> diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h index c34c4faf3..e5ac78939 100644 --- a/src/ui/widget/color-notebook.h +++ b/src/ui/widget/color-notebook.h @@ -15,7 +15,7 @@ #define SEEN_SP_COLOR_NOTEBOOK_H #ifdef HAVE_CONFIG_H -#include <config.h> +# include "config.h" // only include where actually required! #endif #include <boost/ptr_container/ptr_vector.hpp> diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 162634a42..f5334821a 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -2,10 +2,6 @@ * bulia byak <buliabyak@users.sf.net> */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/adjustment.h> #include <glibmm/i18n.h> diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp index 58a236e92..e3b06f09c 100644 --- a/src/ui/widget/color-slider.cpp +++ b/src/ui/widget/color-slider.cpp @@ -11,10 +11,6 @@ * This code is in public domain */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gdkmm/cursor.h> #include <gdkmm/general.h> #include <gtkmm/adjustment.h> diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index 8a74c8d7f..0e0d39ab3 100644 --- a/src/ui/widget/color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -1,7 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "color-wheel-selector.h" #include <glibmm/i18n.h> diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp index 7e90017e8..1e5be3505 100644 --- a/src/ui/widget/dock.cpp +++ b/src/ui/widget/dock.cpp @@ -10,6 +10,10 @@ * 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 "dock.h" #include "inkscape.h" #include "preferences.h" diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp index 48597842b..5bd0a7700 100644 --- a/src/ui/widget/entity-entry.cpp +++ b/src/ui/widget/entity-entry.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "entity-entry.h" #include <gtkmm/scrolledwindow.h> diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp index b1dd9ae8e..9ee6c9a08 100644 --- a/src/ui/widget/entry.cpp +++ b/src/ui/widget/entry.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "entry.h" #include <gtkmm/entry.h> diff --git a/src/ui/widget/font-button.cpp b/src/ui/widget/font-button.cpp index 1137c2d95..b9adedb2c 100644 --- a/src/ui/widget/font-button.cpp +++ b/src/ui/widget/font-button.cpp @@ -3,10 +3,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "font-button.h" #include <glibmm/i18n.h> diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp index 276b05cd8..0d057f2df 100644 --- a/src/ui/widget/font-selector-toolbar.cpp +++ b/src/ui/widget/font-selector-toolbar.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <glibmm/regex.h> #include <gdkmm/display.h> diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp index 132e9bfdf..3def3eb2b 100644 --- a/src/ui/widget/font-selector.cpp +++ b/src/ui/widget/font-selector.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <glibmm/markup.h> diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp index b9b83bc55..06729eb26 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm.h> #include <glibmm/i18n.h> diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp index 9a8317a79..3a2a7b137 100644 --- a/src/ui/widget/font-variations.cpp +++ b/src/ui/widget/font-variations.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <iostream> #include <iomanip> diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp index 5371e56d2..231cc28ee 100644 --- a/src/ui/widget/frame.cpp +++ b/src/ui/widget/frame.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "frame.h" diff --git a/src/ui/widget/iconrenderer.cpp b/src/ui/widget/iconrenderer.cpp index 4db870454..f84b6ffd5 100644 --- a/src/ui/widget/iconrenderer.cpp +++ b/src/ui/widget/iconrenderer.cpp @@ -8,11 +8,6 @@ * Released under GNU GPLv2+, read the file 'COPYING' for more information */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "ui/widget/iconrenderer.h" #include "helper/icon-loader.h" diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp index 3480a2b6a..a38391590 100644 --- a/src/ui/widget/labelled.cpp +++ b/src/ui/widget/labelled.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "helper/icon-loader.h" #include "labelled.h" #include <gtkmm/image.h> diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index 4e8e9813b..2f8e1220a 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp index 356531620..9dac64c32 100644 --- a/src/ui/widget/layertypeicon.cpp +++ b/src/ui/widget/layertypeicon.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "ui/widget/layertypeicon.h" #include "helper/icon-loader.h" diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp index a8325525b..63c95cc3a 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "licensor.h" #include <gtkmm/entry.h> diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index aede866b1..f1a253efc 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -17,10 +17,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "page-sizer.h" #include <glibmm/i18n.h> #include "verbs.h" diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 73897aeb5..255dc2206 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -11,10 +11,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/dialog.h> // for Gtk::RESPONSE_* #include <glibmm/i18n.h> diff --git a/src/ui/widget/point.cpp b/src/ui/widget/point.cpp index 6b31b1856..3a12e87e4 100644 --- a/src/ui/widget/point.cpp +++ b/src/ui/widget/point.cpp @@ -11,11 +11,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - - #include "ui/widget/point.h" namespace Inkscape { diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index e55bbe2af..d712c17ae 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <glibmm/convert.h> #include <glibmm/regex.h> diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp index 3bda641d7..27c2f8f6f 100644 --- a/src/ui/widget/random.cpp +++ b/src/ui/widget/random.cpp @@ -9,11 +9,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - - #include "helper/icon-loader.h" #include "random.h" #include <glibmm/i18n.h> diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index b4c114cff..23376ae38 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "registered-widget.h" #include <gtkmm/radiobutton.h> diff --git a/src/ui/widget/registry.cpp b/src/ui/widget/registry.cpp index 9972e1acd..b8260a694 100644 --- a/src/ui/widget/registry.cpp +++ b/src/ui/widget/registry.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "registry.h" namespace Inkscape { diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp index 220731b7e..79c2573cb 100644 --- a/src/ui/widget/rendering-options.cpp +++ b/src/ui/widget/rendering-options.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm.h> #include "preferences.h" diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp index 6c2056da1..207145411 100644 --- a/src/ui/widget/rotateable.cpp +++ b/src/ui/widget/rotateable.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/eventbox.h> #include <2geom/point.h> diff --git a/src/ui/widget/scalar-unit.cpp b/src/ui/widget/scalar-unit.cpp index fc8c92142..203f4e4a4 100644 --- a/src/ui/widget/scalar-unit.cpp +++ b/src/ui/widget/scalar-unit.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "scalar-unit.h" #include "spinbutton.h" diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp index 441366341..3281d340c 100644 --- a/src/ui/widget/scalar.cpp +++ b/src/ui/widget/scalar.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "scalar.h" #include "spinbutton.h" #include <gtkmm/scale.h> diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index b3efe9c61..e4f5437f5 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "selected-style.h" #include <gtkmm/separatormenuitem.h> diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp index 777a6edf4..4271936a1 100644 --- a/src/ui/widget/spinbutton.cpp +++ b/src/ui/widget/spinbutton.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "spinbutton.h" #include "unit-menu.h" diff --git a/src/ui/widget/text.cpp b/src/ui/widget/text.cpp index 5b6b7468d..7b0df45ad 100644 --- a/src/ui/widget/text.cpp +++ b/src/ui/widget/text.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "text.h" #include <gtkmm/entry.h> diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index 447efdfe0..002681204 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -8,10 +8,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "tolerance-slider.h" #include "registry.h" diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp index fd10b567e..e6453a03b 100644 --- a/src/ui/widget/unit-menu.cpp +++ b/src/ui/widget/unit-menu.cpp @@ -7,10 +7,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <cmath> #include "unit-menu.h" diff --git a/src/util/ege-tags.cpp b/src/util/ege-tags.cpp index f3955129a..d86d6025f 100644 --- a/src/util/ege-tags.cpp +++ b/src/util/ege-tags.cpp @@ -34,10 +34,6 @@ * * ***** END LICENSE BLOCK ***** */ -#if HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include <libintl.h> #if !defined(_) diff --git a/src/util/expression-evaluator.cpp b/src/util/expression-evaluator.cpp index 2c719100c..e9356ef35 100644 --- a/src/util/expression-evaluator.cpp +++ b/src/util/expression-evaluator.cpp @@ -23,8 +23,6 @@ * <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include "util/expression-evaluator.h" #include "util/units.h" diff --git a/src/util/units.cpp b/src/util/units.cpp index 340d3f697..35493bcbc 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <cmath> #include <cerrno> #include <iomanip> diff --git a/src/verbs.cpp b/src/verbs.cpp index 4834f02d0..83875e292 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -24,11 +24,6 @@ * This code is in public domain. */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp index b2401fa93..3e65ae0f2 100644 --- a/src/widgets/dash-selector.cpp +++ b/src/widgets/dash-selector.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "dash-selector.h" #include <cstring> diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index d11943aa7..35a9df65b 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" // only include where actually required! #endif #include <gtkmm/cssprovider.h> diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index d7cbc8991..201afa97b 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -33,9 +33,6 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include <algorithm> using std::min; diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp index 83492329c..6ba5e3b6f 100644 --- a/src/widgets/ege-paint-def.cpp +++ b/src/widgets/ege-paint-def.cpp @@ -34,8 +34,6 @@ * * ***** END LICENSE BLOCK ***** */ -#include "config.h" - #include <libintl.h> #include <cstdint> diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index 673293509..8e419f20e 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -18,10 +18,6 @@ #define noSP_FS_VERBOSE -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/box.h> #include <glibmm/i18n.h> diff --git a/src/widgets/gimp/gimpcolorwheel.c b/src/widgets/gimp/gimpcolorwheel.c index 60e2a51c5..51d2c7e1c 100644 --- a/src/widgets/gimp/gimpcolorwheel.c +++ b/src/widgets/gimp/gimpcolorwheel.c @@ -38,8 +38,6 @@ * Gtk+ 3 code merge: commit bcfc6, gtk3-port branch (2013-01-06) */ -#include "config.h" - #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 10b1ecf04..626fbb2b7 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <glibmm/i18n.h> #include <gtkmm/treeview.h> diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index 8aba394e9..b15275d62 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -19,10 +19,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <set> #include <glibmm.h> diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 3b93f20f5..a3a24470e 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -17,10 +17,6 @@ #define noSP_PS_VERBOSE -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstring> #include <string> #include <vector> diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index cb78f5a58..767692b1e 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glibmm/i18n.h> #include <gtkmm/entry.h> #include <gtkmm/grid.h> diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp index f4931e5e9..8d57ddee6 100644 --- a/src/widgets/sp-color-selector.cpp +++ b/src/widgets/sp-color-selector.cpp @@ -3,10 +3,6 @@ * Jon A. Cruz <jon@joncruz.org> */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cmath> #include <gtk/gtk.h> #include <glibmm/i18n.h> diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 9666fc636..47c59207a 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -11,10 +11,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 <gdk/gdkkeysyms.h> diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp index 0dc041f80..3794daaf2 100644 --- a/src/widgets/spw-utilities.cpp +++ b/src/widgets/spw-utilities.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 006589a33..5fe3adc33 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "stroke-marker-selector.h" #include <glibmm/i18n.h> diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 8c6b7612e..0edb86053 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -26,10 +26,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/action.h> #include <gtkmm/actiongroup.h> diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 8e6a606e1..877083b81 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include <string> #include <stdexcept> diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 7946eebfc..7d043f7e5 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -15,11 +15,8 @@ * Licensed under GNU GPL */ -#include "config.h" - -# include <cstring> - -# include <cstdlib> +#include <cstring> +#include <cstdlib> #include <glib.h> diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp index 8ad1ac06b..23485876c 100644 --- a/src/xml/repr.cpp +++ b/src/xml/repr.cpp @@ -16,10 +16,6 @@ #define noREPR_VERBOSE -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <cstring> #include "xml/repr.h" |