diff options
88 files changed, 43 insertions, 303 deletions
diff --git a/src/cms-color-types.h b/src/cms-color-types.h index 2d75373eb..380448795 100644 --- a/src/cms-color-types.h +++ b/src/cms-color-types.h @@ -6,10 +6,6 @@ * A simple abstraction to provide opaque compatibility with either lcms or lcms2. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif // HAVE_CONFIG_H - #if HAVE_LIBLCMS1 # include <icc34.h> #endif diff --git a/src/colorspace.h b/src/colorspace.h index 9d18492a8..8819757de 100644 --- a/src/colorspace.h +++ b/src/colorspace.h @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif // HAVE_CONFIG_H - #if HAVE_STDINT_H # include <cstdint> #endif diff --git a/src/desktop.h b/src/desktop.h index 9087f8d31..379d36a78 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -21,10 +21,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <cstddef> #include <sigc++/sigc++.h> diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h index ba2213e0b..8241f7cb0 100644 --- a/src/display/cairo-templates.h +++ b/src/display/cairo-templates.h @@ -12,10 +12,6 @@ #ifndef SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H #define SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glib.h> #ifdef HAVE_OPENMP diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp index d27e6104a..6f9c6c2b0 100644 --- a/src/display/nr-filter-colormatrix.cpp +++ b/src/display/nr-filter-colormatrix.cpp @@ -10,6 +10,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <cmath> #include <algorithm> #include "display/cairo-templates.h" diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp index 38b66e230..9e9c753fa 100644 --- a/src/display/nr-filter-component-transfer.cpp +++ b/src/display/nr-filter-component-transfer.cpp @@ -10,6 +10,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <cmath> #include "display/cairo-templates.h" #include "display/cairo-utils.h" diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp index 0eabde3ae..22a888c6d 100644 --- a/src/display/nr-filter-composite.cpp +++ b/src/display/nr-filter-composite.cpp @@ -9,6 +9,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <cmath> #include "display/cairo-templates.h" diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp index 3ab5f74f7..2b6413c19 100644 --- a/src/display/nr-filter-convolve-matrix.cpp +++ b/src/display/nr-filter-convolve-matrix.cpp @@ -10,6 +10,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <vector> #include "display/cairo-templates.h" #include "display/cairo-utils.h" diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp index 183f76676..657f04304 100644 --- a/src/display/nr-filter-diffuselighting.cpp +++ b/src/display/nr-filter-diffuselighting.cpp @@ -11,6 +11,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <glib.h> #include "display/cairo-templates.h" diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp index 18b6c2810..e6f0cdee4 100644 --- a/src/display/nr-filter-displacement-map.cpp +++ b/src/display/nr-filter-displacement-map.cpp @@ -9,6 +9,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "display/cairo-templates.h" #include "display/cairo-utils.h" #include "display/nr-filter-displacement-map.h" diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp index 22b73228e..f97ab1bd6 100644 --- a/src/display/nr-filter-morphology.cpp +++ b/src/display/nr-filter-morphology.cpp @@ -9,6 +9,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <cmath> #include <algorithm> #include <deque> diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp index f989119b7..0cdd441e9 100644 --- a/src/display/nr-filter-specularlighting.cpp +++ b/src/display/nr-filter-specularlighting.cpp @@ -10,6 +10,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <glib.h> #include <cmath> diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp index 2c7668631..db0abbb54 100644 --- a/src/display/nr-filter-turbulence.cpp +++ b/src/display/nr-filter-turbulence.cpp @@ -17,6 +17,10 @@ * Released under GNU GPL version 2 (or later), read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "display/cairo-templates.h" #include "display/cairo-utils.h" #include "display/nr-filter.h" diff --git a/src/display/sp-canvas-group.h b/src/display/sp-canvas-group.h index 9aa99d563..a6a2c99c1 100644 --- a/src/display/sp-canvas-group.h +++ b/src/display/sp-canvas-group.h @@ -19,10 +19,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glib-object.h> #define SP_TYPE_CANVAS_GROUP (sp_canvas_group_get_type()) diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h index 00edb4dee..5591291cf 100644 --- a/src/display/sp-canvas-item.h +++ b/src/display/sp-canvas-item.h @@ -19,10 +19,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <2geom/rect.h> #include <glib-object.h> diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index 4e9a81d83..cf29acce8 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -20,10 +20,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtk/gtk.h> #include <cstdint> #include <glibmm/ustring.h> diff --git a/src/extension/effect.h b/src/extension/effect.h index b37e2bc7e..d0666dc7d 100644 --- a/src/extension/effect.h +++ b/src/extension/effect.h @@ -11,7 +11,6 @@ #ifndef INKSCAPE_EXTENSION_EFFECT_H__ #define INKSCAPE_EXTENSION_EFFECT_H__ -#include <config.h> #include <glibmm/i18n.h> #include "verbs.h" #include "extension.h" diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h index 1bafdf8a7..c84395814 100644 --- a/src/extension/execution-env.h +++ b/src/extension/execution-env.h @@ -10,8 +10,6 @@ #ifndef INKSCAPE_EXTENSION_EXECUTION_ENV_H__ #define INKSCAPE_EXTENSION_EXECUTION_ENV_H__ -#include <config.h> - #include <glibmm/main.h> #include <glibmm/ustring.h> diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h index d58c78c73..fe9ab7221 100644 --- a/src/extension/internal/cairo-render-context.h +++ b/src/extension/internal/cairo-render-context.h @@ -13,10 +13,6 @@ * Licensed under GNU GPL */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "extension/extension.h" #include <set> #include <string> diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h index 03ffe2a1c..f93cb4f5f 100644 --- a/src/extension/internal/cairo-renderer.h +++ b/src/extension/internal/cairo-renderer.h @@ -14,10 +14,6 @@ * Licensed under GNU GPL */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "extension/extension.h" #include <set> #include <string> diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index 205db202e..683cdfc28 100644 --- a/src/extension/internal/emf-print.h +++ b/src/extension/internal/emf-print.h @@ -12,10 +12,6 @@ #ifndef SEEN_INKSCAPE_EXTENSION_INTERNAL_EMF_PRINT_H #define SEEN_INKSCAPE_EXTENSION_INTERNAL_EMF_PRINT_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <3rdparty/libuemf/uemf.h> #include "extension/internal/metafile-print.h" diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h index ba9f63d04..0df8b0251 100644 --- a/src/extension/internal/filter/filter.h +++ b/src/extension/internal/filter/filter.h @@ -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 "extension/implementation/implementation.h" diff --git a/src/extension/internal/latex-pstricks.h b/src/extension/internal/latex-pstricks.h index fe9472b68..50ec8560a 100644 --- a/src/extension/internal/latex-pstricks.h +++ b/src/extension/internal/latex-pstricks.h @@ -12,15 +12,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <config.h> +#include <stack> #include "extension/implementation/implementation.h" #include "extension/extension.h" #include "svg/stringstream.h" -#include <stack> - namespace Inkscape { namespace Extension { namespace Internal { diff --git a/src/extension/internal/latex-text-renderer.h b/src/extension/internal/latex-text-renderer.h index 7f0dd9cd9..f011f6f29 100644 --- a/src/extension/internal/latex-text-renderer.h +++ b/src/extension/internal/latex-text-renderer.h @@ -13,10 +13,6 @@ * Licensed under GNU GPL */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "extension/extension.h" #include <2geom/affine.h> #include <stack> diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h index a69b1acee..e3af76045 100644 --- a/src/extension/internal/metafile-inout.h +++ b/src/extension/internal/metafile-inout.h @@ -11,10 +11,6 @@ #ifndef SEEN_INKSCAPE_EXTENSION_INTERNAL_METAFILE_INOUT_H #define SEEN_INKSCAPE_EXTENSION_INTERNAL_METAFILE_INOUT_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #define PNG_SKIP_SETJMP_CHECK // else any further png.h include blows up in the compiler #include <png.h> #include <cstdio> diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index 6209d3f73..d7bcf330c 100644 --- a/src/extension/internal/metafile-print.h +++ b/src/extension/internal/metafile-print.h @@ -11,10 +11,6 @@ #ifndef SEEN_INKSCAPE_EXTENSION_INTERNAL_METAFILE_PRINT_H #define SEEN_INKSCAPE_EXTENSION_INTERNAL_METAFILE_PRINT_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <map> #include <stack> #include <glibmm/ustring.h> diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index 5f68b77c1..4f2de2f96 100644 --- a/src/extension/internal/wmf-print.h +++ b/src/extension/internal/wmf-print.h @@ -11,10 +11,6 @@ #ifndef SEEN_INKSCAPE_EXTENSION_INTERNAL_WMF_PRINT_H #define SEEN_INKSCAPE_EXTENSION_INTERNAL_WMF_PRINT_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <3rdparty/libuemf/uwmf.h> #include "extension/internal/metafile-print.h" diff --git a/src/inkgc/gc-core.h b/src/inkgc/gc-core.h index e5f8cb772..a9a3ec3a5 100644 --- a/src/inkgc/gc-core.h +++ b/src/inkgc/gc-core.h @@ -12,10 +12,6 @@ #ifndef SEEN_INKSCAPE_GC_CORE_H #define SEEN_INKSCAPE_GC_CORE_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <new> #include <cstdlib> diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h index 3dd9e66d7..82476fbae 100644 --- a/src/libnrtype/FontFactory.h +++ b/src/libnrtype/FontFactory.h @@ -7,15 +7,10 @@ #ifndef my_font_factory #define my_font_factory -//#include <glibmm/ustring.h> - #include <functional> #include <algorithm> #include <utility> -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif #ifdef _WIN32 //#define USE_PANGO_WIN32 // disable for Bug 165665 #endif diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index a4ba7171c..f9917bb85 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -13,9 +13,6 @@ //#define DEBUG_TEXTLAYOUT_DUMPASTEXT -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include <2geom/d2.h> #include <2geom/affine.h> #include <glibmm/ustring.h> diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index 48a1fa80b..994eff44e 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -9,10 +9,6 @@ #ifndef my_defs #define my_defs -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstdint> // error codes (mostly obsolete) diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 4cafe85ac..05bbab1ca 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -1,10 +1,6 @@ #ifndef SEEN_MENUS_SKELETON_H #define SEEN_MENUS_SKELETON_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #ifdef __cplusplus #undef N_ #define N_(x) x diff --git a/src/path-prefix.h b/src/path-prefix.h index 5e8eec085..f875a6c69 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -13,8 +13,8 @@ #ifndef SEEN_PATH_PREFIX_H #define SEEN_PATH_PREFIX_H -#ifndef INKSCAPE_DATADIR -# error "INKSCAPE_DATADIR undefined. Must #include config.h before anything else." +#ifdef HAVE_CONFIG_H +# include "config.h" #endif #include "prefix.h" diff --git a/src/trace/trace.h b/src/trace/trace.h index e258fe027..82bd672d4 100644 --- a/src/trace/trace.h +++ b/src/trace/trace.h @@ -9,10 +9,6 @@ #ifndef SEEN_TRACE_H #define SEEN_TRACE_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - # include <cstring> #include <glibmm/refptr.h> diff --git a/src/ui/control-types.h b/src/ui/control-types.h index 1a0230324..09160a76c 100644 --- a/src/ui/control-types.h +++ b/src/ui/control-types.h @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - namespace Inkscape { diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h index 0e5bce9ba..b8d15b9c6 100644 --- a/src/ui/dialog/calligraphic-profile-rename.h +++ b/src/ui/dialog/calligraphic-profile-rename.h @@ -11,10 +11,6 @@ #ifndef INKSCAPE_DIALOG_CALLIGRAPHIC_PROFILE_H #define INKSCAPE_DIALOG_CALLIGRAPHIC_PROFILE_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/dialog.h> #include <gtkmm/entry.h> #include <gtkmm/label.h> diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h index 1696bdb15..34f5bf5a3 100644 --- a/src/ui/dialog/document-metadata.h +++ b/src/ui/dialog/document-metadata.h @@ -13,10 +13,6 @@ #ifndef INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <list> #include <cstddef> #include "ui/widget/panel.h" diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h index b254c3ef6..182247703 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -9,9 +9,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -# include "config.h" -#endif #include <glibmm.h> diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index d4b8fb661..397f8b587 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -12,10 +12,6 @@ #ifndef INKSCAPE_UI_DIALOG_FIND_H #define INKSCAPE_UI_DIALOG_FIND_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "ui/widget/panel.h" #include "ui/widget/button.h" #include "ui/widget/entry.h" diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h index aacbbce22..e1dc397a2 100644 --- a/src/ui/dialog/guides.h +++ b/src/ui/dialog/guides.h @@ -11,10 +11,6 @@ #ifndef INKSCAPE_DIALOG_GUIDELINE_H #define INKSCAPE_DIALOG_GUIDELINE_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/dialog.h> #include <gtkmm/grid.h> diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index adcfca358..2aa76d9dd 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -15,10 +15,6 @@ #ifndef INKSCAPE_UI_DIALOG_INKSCAPE_PREFERENCES_H #define INKSCAPE_UI_DIALOG_INKSCAPE_PREFERENCES_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <iostream> #include <vector> #include "ui/widget/preferences-widget.h" diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h index f263f383b..8d3500910 100644 --- a/src/ui/dialog/layer-properties.h +++ b/src/ui/dialog/layer-properties.h @@ -12,10 +12,6 @@ #ifndef INKSCAPE_DIALOG_LAYER_PROPERTIES_H #define INKSCAPE_DIALOG_LAYER_PROPERTIES_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/dialog.h> #include <gtkmm/entry.h> #include <gtkmm/label.h> diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h index 89864664d..eb115d5e4 100644 --- a/src/ui/dialog/layers.h +++ b/src/ui/dialog/layers.h @@ -12,10 +12,6 @@ #ifndef SEEN_LAYERS_PANEL_H #define SEEN_LAYERS_PANEL_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/treeview.h> #include <gtkmm/treestore.h> diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h index f603219c4..bc501c68e 100644 --- a/src/ui/dialog/object-properties.h +++ b/src/ui/dialog/object-properties.h @@ -29,10 +29,6 @@ #ifndef SEEN_DIALOGS_ITEM_PROPERTIES_H #define SEEN_DIALOGS_ITEM_PROPERTIES_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "ui/widget/panel.h" #include "ui/widget/frame.h" diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h index 13b632f61..95e9863a9 100644 --- a/src/ui/dialog/objects.h +++ b/src/ui/dialog/objects.h @@ -14,10 +14,6 @@ #ifndef SEEN_OBJECTS_PANEL_H #define SEEN_OBJECTS_PANEL_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/treeview.h> #include <gtkmm/treestore.h> diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h index ebae47a1b..15513bd26 100644 --- a/src/ui/dialog/ocaldialogs.h +++ b/src/ui/dialog/ocaldialogs.h @@ -13,10 +13,6 @@ #ifndef __OCAL_DIALOG_H__ #define __OCAL_DIALOG_H__ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - // Gtkmm includes #include <gtkmm/box.h> #include <gtkmm/eventbox.h> diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h index 0a8704445..9faa8b69d 100644 --- a/src/ui/dialog/panel-dialog.h +++ b/src/ui/dialog/panel-dialog.h @@ -11,10 +11,6 @@ #ifndef INKSCAPE_PANEL_DIALOG_H #define INKSCAPE_PANEL_DIALOG_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <glibmm/i18n.h> #include <gtkmm/dialog.h> diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h index 0df26423a..32f7c8ab3 100644 --- a/src/ui/dialog/polar-arrange-tab.h +++ b/src/ui/dialog/polar-arrange-tab.h @@ -10,10 +10,6 @@ #ifndef INKSCAPE_UI_DIALOG_POLAR_ARRANGE_TAB_H #define INKSCAPE_UI_DIALOG_POLAR_ARRANGE_TAB_H -#if HAVE_CONFIG_H - #include "config.h" -#endif - #include "ui/widget/scalar-unit.h" #include "ui/widget/anchor-selector.h" #include "ui/dialog/arrange-tab.h" diff --git a/src/ui/dialog/prototype.h b/src/ui/dialog/prototype.h index ee955d59b..001e3d39f 100644 --- a/src/ui/dialog/prototype.h +++ b/src/ui/dialog/prototype.h @@ -12,10 +12,6 @@ #ifndef SEEN_PROTOTYPE_PANEL_H #define SEEN_PROTOTYPE_PANEL_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <iostream> #include "ui/widget/panel.h" #include "ui/dialog/desktop-tracker.h" diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index f6ca8cdd3..f95b44eda 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -18,10 +18,6 @@ #ifndef INKSCAPE_UI_DIALOG_TEXT_EDIT_H #define INKSCAPE_UI_DIALOG_TEXT_EDIT_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/notebook.h> #include <gtkmm/button.h> diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h index 70e4770f7..765bc9652 100644 --- a/src/ui/dialog/tile.h +++ b/src/ui/dialog/tile.h @@ -16,10 +16,6 @@ #ifndef SEEN_UI_DIALOG_TILE_H #define SEEN_UI_DIALOG_TILE_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/notebook.h> #include <gtkmm/checkbutton.h> diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h index d5049bb84..e7f260b4b 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -13,10 +13,6 @@ #ifndef SEEN_DIALOGS_XML_TREE_H #define SEEN_DIALOGS_XML_TREE_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "ui/widget/panel.h" #include <gtkmm/entry.h> #include <gtkmm/textview.h> diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h index cccc0ea9e..63273d3b0 100644 --- a/src/ui/previewholder.h +++ b/src/ui/previewholder.h @@ -13,10 +13,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/bin.h> namespace Gtk { diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h index 594f6b633..f8c99dde0 100644 --- a/src/ui/tool/node.h +++ b/src/ui/tool/node.h @@ -12,10 +12,6 @@ #ifndef SEEN_UI_TOOL_NODE_H #define SEEN_UI_TOOL_NODE_H -#if HAVE_CONFIG_H - #include "config.h" -#endif - #include <iterator> #include <iosfwd> #include <stdexcept> diff --git a/src/ui/tools-switch.h b/src/ui/tools-switch.h index d396597ca..1bf785aca 100644 --- a/src/ui/tools-switch.h +++ b/src/ui/tools-switch.h @@ -12,10 +12,6 @@ #ifndef SEEN_TOOLS_SWITCH_H #define SEEN_TOOLS_SWITCH_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - class SPDesktop; class SPItem; namespace Geom { diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h index 0fb488948..022989973 100644 --- a/src/ui/tools/measure-tool.h +++ b/src/ui/tools/measure-tool.h @@ -12,10 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <cstddef> #include <sigc++/sigc++.h> #include "ui/tools/tool-base.h" diff --git a/src/ui/widget/addtoicon.h b/src/ui/widget/addtoicon.h index c17ae907a..2cfcda958 100644 --- a/src/ui/widget/addtoicon.h +++ b/src/ui/widget/addtoicon.h @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> #include <glibmm/property.h> diff --git a/src/ui/widget/alignment-selector.h b/src/ui/widget/alignment-selector.h index c1208477b..67d6941f1 100644 --- a/src/ui/widget/alignment-selector.h +++ b/src/ui/widget/alignment-selector.h @@ -7,10 +7,6 @@ #ifndef ANCHOR_SELECTOR_H_ #define ANCHOR_SELECTOR_H_ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/bin.h> #include <gtkmm/button.h> #include <gtkmm/grid.h> diff --git a/src/ui/widget/anchor-selector.h b/src/ui/widget/anchor-selector.h index ad3114c3f..03f070154 100644 --- a/src/ui/widget/anchor-selector.h +++ b/src/ui/widget/anchor-selector.h @@ -10,10 +10,6 @@ #ifndef ANCHOR_SELECTOR_H_ #define ANCHOR_SELECTOR_H_ -#if HAVE_CONFIG_H - #include "config.h" -#endif - #include <gtkmm/bin.h> #include <gtkmm/togglebutton.h> #include <gtkmm/grid.h> diff --git a/src/ui/widget/clipmaskicon.h b/src/ui/widget/clipmaskicon.h index 25725e33a..836c0d5e2 100644 --- a/src/ui/widget/clipmaskicon.h +++ b/src/ui/widget/clipmaskicon.h @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> #include <glibmm/property.h> diff --git a/src/ui/widget/color-icc-selector.h b/src/ui/widget/color-icc-selector.h index 43ef26858..310db0664 100644 --- a/src/ui/widget/color-icc-selector.h +++ b/src/ui/widget/color-icc-selector.h @@ -1,10 +1,6 @@ #ifndef SEEN_SP_COLOR_ICC_SELECTOR_H #define SEEN_SP_COLOR_ICC_SELECTOR_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/widget.h> #include <gtkmm/grid.h> diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h index 520b6fe24..8422961ec 100644 --- a/src/ui/widget/color-preview.h +++ b/src/ui/widget/color-preview.h @@ -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/widget.h> namespace Inkscape { diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h index 0e98b86c3..d14b5edaa 100644 --- a/src/ui/widget/color-scales.h +++ b/src/ui/widget/color-scales.h @@ -1,10 +1,6 @@ #ifndef SEEN_SP_COLOR_SCALES_H #define SEEN_SP_COLOR_SCALES_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/grid.h> #include "ui/selected-color.h" diff --git a/src/ui/widget/color-wheel-selector.h b/src/ui/widget/color-wheel-selector.h index 67669fa2d..39c5f752e 100644 --- a/src/ui/widget/color-wheel-selector.h +++ b/src/ui/widget/color-wheel-selector.h @@ -12,10 +12,6 @@ #ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H #define SEEN_SP_COLOR_WHEEL_SELECTOR_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <gtkmm/grid.h> #include "ui/selected-color.h" diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h index 2b69fab45..789abc224 100644 --- a/src/ui/widget/dock-item.h +++ b/src/ui/widget/dock-item.h @@ -11,10 +11,6 @@ #ifndef INKSCAPE_UI_WIGET_DOCK_ITEM_H #define INKSCAPE_UI_WIGET_DOCK_ITEM_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <gtkmm/frame.h> #include <gtkmm/window.h> diff --git a/src/ui/widget/highlight-picker.h b/src/ui/widget/highlight-picker.h index 6cfdf162c..5e98ebd45 100644 --- a/src/ui/widget/highlight-picker.h +++ b/src/ui/widget/highlight-picker.h @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> #include <glibmm/property.h> diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h index 86c12bc03..fc97c2982 100644 --- a/src/ui/widget/imagetoggler.h +++ b/src/ui/widget/imagetoggler.h @@ -10,10 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> #include <glibmm/property.h> diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h index b736007f4..5003edb0b 100644 --- a/src/ui/widget/insertordericon.h +++ b/src/ui/widget/insertordericon.h @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> diff --git a/src/ui/widget/layertypeicon.h b/src/ui/widget/layertypeicon.h index e84bef261..017910e27 100644 --- a/src/ui/widget/layertypeicon.h +++ b/src/ui/widget/layertypeicon.h @@ -9,10 +9,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> #include <glibmm/property.h> diff --git a/src/ui/widget/notebook-page.h b/src/ui/widget/notebook-page.h index 6eb23907c..2e6fbba06 100644 --- a/src/ui/widget/notebook-page.h +++ b/src/ui/widget/notebook-page.h @@ -10,10 +10,6 @@ #ifndef INKSCAPE_UI_WIDGET_NOTEBOOK_PAGE_H #define INKSCAPE_UI_WIDGET_NOTEBOOK_PAGE_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> namespace Gtk { diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h index d64034b8c..e90205514 100644 --- a/src/ui/widget/page-sizer.h +++ b/src/ui/widget/page-sizer.h @@ -10,10 +10,6 @@ #ifndef INKSCAPE_UI_WIDGET_PAGE_SIZER_H #define INKSCAPE_UI_WIDGET_PAGE_SIZER_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <cstddef> #include "ui/widget/registered-widget.h" #include <sigc++/sigc++.h> diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h index 708d2b957..340c1acdd 100644 --- a/src/ui/widget/panel.h +++ b/src/ui/widget/panel.h @@ -13,10 +13,6 @@ #ifndef SEEN_INKSCAPE_UI_WIDGET_PANEL_H #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/box.h> #include <map> diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index 80cbf46b6..6a1e5cab7 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -15,10 +15,6 @@ #ifndef INKSCAPE_UI_WIDGET_INKSCAPE_PREFERENCES_H #define INKSCAPE_UI_WIDGET_INKSCAPE_PREFERENCES_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <iostream> #include <vector> diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h index 1437624fa..f65680242 100644 --- a/src/ui/widget/selected-style.h +++ b/src/ui/widget/selected-style.h @@ -11,10 +11,6 @@ #ifndef INKSCAPE_UI_CURRENT_STYLE_H #define INKSCAPE_UI_CURRENT_STYLE_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/grid.h> diff --git a/src/ui/widget/spin-scale.h b/src/ui/widget/spin-scale.h index 316ac5a87..743f0e393 100644 --- a/src/ui/widget/spin-scale.h +++ b/src/ui/widget/spin-scale.h @@ -10,10 +10,6 @@ #ifndef INKSCAPE_UI_WIDGET_SPIN_SCALE_H #define INKSCAPE_UI_WIDGET_SPIN_SCALE_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/togglebutton.h> diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h index fe03c85d3..8c7c1fde6 100644 --- a/src/ui/widget/spin-slider.h +++ b/src/ui/widget/spin-slider.h @@ -10,10 +10,6 @@ #ifndef INKSCAPE_UI_WIDGET_SPIN_SLIDER_H #define INKSCAPE_UI_WIDGET_SPIN_SLIDER_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/scale.h> diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h index bda5ce315..7a56a5d04 100644 --- a/src/ui/widget/style-swatch.h +++ b/src/ui/widget/style-swatch.h @@ -13,10 +13,6 @@ #ifndef INKSCAPE_UI_CURRENT_STYLE_H #define INKSCAPE_UI_CURRENT_STYLE_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/eventbox.h> diff --git a/src/util/unordered-containers.h b/src/util/unordered-containers.h index 0bda8191f..9d869142d 100644 --- a/src/util/unordered-containers.h +++ b/src/util/unordered-containers.h @@ -12,10 +12,6 @@ #ifndef SEEN_INK_UTIL_UNORDERED_CONTAINERS_H #define SEEN_INK_UTIL_UNORDERED_CONTAINERS_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glibmm/ustring.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/src/verbs.h b/src/verbs.h index b448cbf7f..fe17cb2d1 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -13,10 +13,6 @@ * This code is GPL if done by Ted or David */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <cstring> #include <string> #include <glibmm/ustring.h> diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h index 3e22866b4..eb48003a6 100644 --- a/src/widgets/dash-selector.h +++ b/src/widgets/dash-selector.h @@ -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/box.h> #include <gtkmm/combobox.h> #include <gtkmm/liststore.h> diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h index 8317dd451..4eb37b5e8 100644 --- a/src/widgets/gradient-selector.h +++ b/src/widgets/gradient-selector.h @@ -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/liststore.h> #include <gtkmm/scrolledwindow.h> diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 0bc5fcbe4..27f818832 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -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/liststore.h> #include <sigc++/connection.h> #include "gradient-selector.h" diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index f9d32b492..d7c7e6326 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -12,10 +12,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <glib.h> #include <gtk/gtk.h> diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index 2749b90ef..f77404019 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -12,6 +12,10 @@ * 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-attribute-widget.h b/src/widgets/sp-attribute-widget.h index b76b642db..d8b350e58 100644 --- a/src/widgets/sp-attribute-widget.h +++ b/src/widgets/sp-attribute-widget.h @@ -15,10 +15,6 @@ #ifndef SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include <gtkmm/widget.h> #include <cstddef> #include <sigc++/connection.h> diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h index 6367c8ac8..e58a8adcd 100644 --- a/src/widgets/sp-color-selector.h +++ b/src/widgets/sp-color-selector.h @@ -1,10 +1,6 @@ #ifndef SEEN_SP_COLOR_SELECTOR_H #define SEEN_SP_COLOR_SELECTOR_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtk/gtk.h> #include "color.h" diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index 382d87ac6..5ee626b68 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -17,10 +17,6 @@ #ifndef SEEN_DIALOGS_STROKE_STYLE_H #define SEEN_DIALOGS_STROKE_STYLE_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glibmm/i18n.h> #include <gtkmm/grid.h> #include <gtkmm/radiobutton.h> diff --git a/src/widgets/style-utils.h b/src/widgets/style-utils.h index 65b635f0c..ba63cb898 100644 --- a/src/widgets/style-utils.h +++ b/src/widgets/style-utils.h @@ -19,10 +19,6 @@ #ifndef SEEN_DIALOGS_STYLE_UTILS_H #define SEEN_DIALOGS_STYLE_UTILS_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "desktop-style.h" namespace Inkscape { |