diff options
Diffstat (limited to 'src')
28 files changed, 101 insertions, 97 deletions
diff --git a/src/extension/db.h b/src/extension/db.h index bc07c8591..0014f4449 100644 --- a/src/extension/db.h +++ b/src/extension/db.h @@ -12,18 +12,24 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifndef __MODULES_DB_H__ -#define __MODULES_DB_H__ +#ifndef SEEN_MODULES_DB_H +#define SEEN_MODULES_DB_H #include <map> #include <list> #include <cstring> -#include "extension/extension.h" +#include <glib.h> + namespace Inkscape { namespace Extension { +class Input; +class Output; +class Effect; +class Extension; + class DB { private: /** A string comparison function to be used in the moduledict @@ -74,7 +80,7 @@ extern DB db; } } /* namespace Extension, Inkscape */ -#endif /* __MODULES_DB_H__ */ +#endif // SEEN_MODULES_DB_H /* Local Variables: diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index a83cac88d..01c3e129a 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -17,6 +17,7 @@ #include "path-prefix.h" #include "dependency.h" #include "db.h" +#include "extension.h" namespace Inkscape { namespace Extension { diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h index c2d4e7e4a..be7cf3fb7 100644 --- a/src/extension/execution-env.h +++ b/src/extension/execution-env.h @@ -18,12 +18,18 @@ #include <gtkmm/dialog.h> #include "forward.h" -#include "extension-forward.h" #include "extension.h" namespace Inkscape { namespace Extension { +class Effect; + +namespace Implementation +{ +class ImplementationDocumentCache; +} + class ExecutionEnv { private: enum state_t { diff --git a/src/extension/extension-forward.h b/src/extension/extension-forward.h deleted file mode 100644 index d836c29ab..000000000 --- a/src/extension/extension-forward.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef SEEN_EXTENSION_FORWARD_H -#define SEEN_EXTENSION_FORWARD_H - -namespace Inkscape { -namespace Extension { - -class Effect; -class Extension; -class Input; -class Output; -class Print; - -class Dependency; -class Parameter; -class ExpirationTimer; - -namespace Implementation { -class Implementation; -class ImplementationDocumentCache; -} - -} } - -#endif /* !SEEN_EXTENSION_FORWARD_H */ - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index a70c79943..72db7438c 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -1,4 +1,3 @@ -#define __SP_MODULE_C__ /** \file * * Inkscape::Extension::Extension: @@ -30,6 +29,7 @@ #include "inkscape.h" #include "extension/implementation/implementation.h" +#include "extension.h" #include "db.h" #include "dependency.h" diff --git a/src/extension/extension.h b/src/extension/extension.h index eddddf62c..273bc79e4 100644 --- a/src/extension/extension.h +++ b/src/extension/extension.h @@ -1,5 +1,5 @@ -#ifndef __INK_EXTENSION_H__ -#define __INK_EXTENSION_H__ +#ifndef INK_EXTENSION_H +#define INK_EXTENSION_H /** \file * Frontend to certain, possibly pluggable, actions. @@ -22,7 +22,6 @@ #include <gtkmm/table.h> #include <glibmm/ustring.h> #include "xml/repr.h" -#include "extension/extension-forward.h" /** The key that is used to identify that the I/O should be autodetected */ #define SP_MODULE_KEY_AUTODETECT "autodetect" @@ -68,6 +67,17 @@ struct SPDocument; namespace Inkscape { namespace Extension { +class Dependency; +class ExpirationTimer; +class ExpirationTimer; +class Parameter; + +namespace Implementation +{ +class Implementation; +} + + /** The object that is the basis for the Extension system. This object contains all of the information that all Extension have. The individual items are detailed within. This is the interface that @@ -163,7 +173,7 @@ public: private: void make_param (Inkscape::XML::Node * paramrepr); - Parameter * get_param (const gchar * name); + Parameter * get_param (const gchar * name); public: bool get_param_bool (const gchar * name, @@ -269,7 +279,7 @@ public: } /* namespace Extension */ } /* namespace Inkscape */ -#endif /* __INK_EXTENSION_H__ */ +#endif // INK_EXTENSION_H /* Local Variables: diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index a09f7c863..e648a66cd 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -17,13 +17,19 @@ #include <gtkmm/widget.h> #include "forward.h" -#include "extension/extension-forward.h" #include "xml/node.h" #include <2geom/forward.h> #include <2geom/point.h> namespace Inkscape { namespace Extension { + +class Effect; +class Extension; +class Input; +class Output; +class Print; + namespace Implementation { /** \brief A cache for the document and this implementation */ diff --git a/src/extension/internal/bitmap/imagemagick.h b/src/extension/internal/bitmap/imagemagick.h index 1b150fc3d..08b322503 100644 --- a/src/extension/internal/bitmap/imagemagick.h +++ b/src/extension/internal/bitmap/imagemagick.h @@ -1,5 +1,5 @@ -#ifndef __INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H__ -#define __INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H__ +#ifndef INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H +#define INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H /* * Copyright (C) 2007 Authors: @@ -10,11 +10,14 @@ */ #include "extension/implementation/implementation.h" -#include "extension/extension-forward.h" #include <Magick++.h> namespace Inkscape { namespace Extension { + +class Effect; +class Extension; + namespace Internal { namespace Bitmap { @@ -37,4 +40,4 @@ public: }; /* namespace Extension */ }; /* namespace Inkscape */ -#endif /* __INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H__ */ +#endif // INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H diff --git a/src/extension/internal/bluredge.h b/src/extension/internal/bluredge.h index 48e30c054..d8fe056f7 100644 --- a/src/extension/internal/bluredge.h +++ b/src/extension/internal/bluredge.h @@ -7,11 +7,14 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "extension/extension-forward.h" #include "extension/implementation/implementation.h" namespace Inkscape { namespace Extension { + +class Effect; +class Extension; + namespace Internal { /** \brief Implementation class of the GIMP gradient plugin. This mostly diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h index a5d5d9d4e..08bc1c3f0 100644 --- a/src/extension/internal/filter/filter.h +++ b/src/extension/internal/filter/filter.h @@ -1,5 +1,5 @@ -#ifndef __INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H__ -#define __INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H__ +#ifndef INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H +#define INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H /* * Copyright (C) 2008 Authors: @@ -11,10 +11,13 @@ #include <glibmm/i18n.h> #include "extension/implementation/implementation.h" -#include "extension/extension-forward.h" namespace Inkscape { namespace Extension { + +class Effect; +class Extension; + namespace Internal { namespace Filter { @@ -52,4 +55,4 @@ public: }; /* namespace Extension */ }; /* namespace Inkscape */ -#endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H__ */ +#endif // INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H diff --git a/src/extension/internal/gimpgrad.h b/src/extension/internal/gimpgrad.h index ed409ef93..5ab48a147 100644 --- a/src/extension/internal/gimpgrad.h +++ b/src/extension/internal/gimpgrad.h @@ -13,10 +13,12 @@ #include <glibmm/ustring.h> #include "extension/implementation/implementation.h" -#include "extension/extension-forward.h" namespace Inkscape { namespace Extension { + +class Extension; + namespace Internal { /** \brief Implementation class of the GIMP gradient plugin. This mostly diff --git a/src/extension/internal/grid.h b/src/extension/internal/grid.h index 1f37b1441..c54135d81 100644 --- a/src/extension/internal/grid.h +++ b/src/extension/internal/grid.h @@ -8,10 +8,13 @@ */ #include "extension/implementation/implementation.h" -#include "extension/extension-forward.h" namespace Inkscape { namespace Extension { + +class Effect; +class Extension; + namespace Internal { /** \brief Implementation class of the GIMP gradient plugin. This mostly diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h index 6fc22e8aa..ca008cda5 100644 --- a/src/extension/param/enum.h +++ b/src/extension/param/enum.h @@ -17,13 +17,13 @@ #include <gtkmm/widget.h> #include "xml/document.h" -#include <extension/extension-forward.h> #include "parameter.h" namespace Inkscape { namespace Extension { +class Extension; // \brief A class to represent a notebookparameter of an extension diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h index fb21c9b63..983ad3161 100644 --- a/src/extension/param/notebook.h +++ b/src/extension/param/notebook.h @@ -17,13 +17,13 @@ #include <gtkmm/widget.h> #include "xml/document.h" -#include <extension/extension-forward.h> #include "parameter.h" namespace Inkscape { namespace Extension { +class Extension; // \brief A class to represent a notebookparameter of an extension diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h index d8ed68439..e7a7538b7 100644 --- a/src/extension/param/parameter.h +++ b/src/extension/param/parameter.h @@ -18,12 +18,14 @@ #include "xml/document.h" #include "xml/node.h" #include "document.h" -#include "extension/extension-forward.h" #include <color.h> namespace Inkscape { namespace Extension { +class Extension; + + /** * @brief The root directory in the preferences database for extension-related parameters * diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h index e15afdbc7..cf33bb381 100644 --- a/src/extension/param/radiobutton.h +++ b/src/extension/param/radiobutton.h @@ -17,13 +17,13 @@ #include <gtkmm/widget.h> #include "xml/document.h" -#include <extension/extension-forward.h> #include "parameter.h" namespace Inkscape { namespace Extension { +class Extension; // \brief A class to represent a radiobutton parameter of an extension diff --git a/src/extension/system.h b/src/extension/system.h index b6740e109..716539de1 100644 --- a/src/extension/system.h +++ b/src/extension/system.h @@ -21,6 +21,8 @@ namespace Inkscape { namespace Extension { +class Print; + /** * Used to distinguish between the various invocations of the save dialogs (and thus to determine * the file type and save path offered in the dialog) diff --git a/src/extension/timer.h b/src/extension/timer.h index 33b9829e9..b257c770a 100644 --- a/src/extension/timer.h +++ b/src/extension/timer.h @@ -16,11 +16,12 @@ #include <stddef.h> #include <sigc++/sigc++.h> #include <glibmm/timeval.h> -#include "extension-forward.h" namespace Inkscape { namespace Extension { +class Extension; + class ExpirationTimer { /** \brief Circularly linked list of all timers */ static ExpirationTimer * timer_list; diff --git a/src/file.h b/src/file.h index cf3adec2b..5a43ffa5e 100644 --- a/src/file.h +++ b/src/file.h @@ -1,5 +1,5 @@ -#ifndef __SP_FILE_H__ -#define __SP_FILE_H__ +#ifndef SEEN_SP_FILE_H +#define SEEN_SP_FILE_H /* * File/Print operations @@ -19,7 +19,6 @@ #include <glib/gslist.h> #include <gtk/gtk.h> -#include "extension/extension-forward.h" #include "extension/system.h" struct SPDesktop; @@ -193,7 +192,7 @@ void sp_file_print (Gtk::Window& parentWindow); void sp_file_vacuum (); -#endif +#endif // SEEN_SP_FILE_H /* diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h index 9843ebcfb..58a98d1a9 100644 --- a/src/libnrtype/FontFactory.h +++ b/src/libnrtype/FontFactory.h @@ -23,7 +23,6 @@ #include "nr-type-primitives.h" #include "nr-type-pos-def.h" #include "font-style-to-pos.h" -#include <libnrtype/nrtype-forward.h> #include "../style.h" /* Freetype */ @@ -34,6 +33,9 @@ #include <freetype/freetype.h> #endif + +class font_instance; + namespace Glib { class ustring; diff --git a/src/libnrtype/TextWrapper.h b/src/libnrtype/TextWrapper.h index b4a3cc724..1f96851ef 100644 --- a/src/libnrtype/TextWrapper.h +++ b/src/libnrtype/TextWrapper.h @@ -13,7 +13,6 @@ #include <pango/pango.h> -#include <libnrtype/nrtype-forward.h> #include "libnrtype/boundary-type.h" // miscanellous but useful data for a given text: chunking into logical pieces @@ -24,6 +23,7 @@ struct text_boundary; struct one_glyph; struct one_box; struct one_para; +class font_instance; class text_wrapper { public: diff --git a/src/libnrtype/font-glyph.h b/src/libnrtype/font-glyph.h index b6954a482..3f136daaf 100644 --- a/src/libnrtype/font-glyph.h +++ b/src/libnrtype/font-glyph.h @@ -1,7 +1,6 @@ #ifndef SEEN_LIBNRTYPE_FONT_GLYPH_H #define SEEN_LIBNRTYPE_FONT_GLYPH_H -#include <libnrtype/nrtype-forward.h> #include <2geom/forward.h> // the info for a glyph in a font. it's totally resolution- and fontsize-independent diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h index b66230d87..d00569984 100644 --- a/src/libnrtype/font-instance.h +++ b/src/libnrtype/font-instance.h @@ -7,10 +7,12 @@ #include <require-config.h> #include "FontFactory.h" -#include <libnrtype/nrtype-forward.h> #include <libnrtype/font-style.h> #include <2geom/d2.h> +class font_factory; +struct font_glyph; + // the font_instance are the template of several raster_font; they provide metrics and outlines // that are drawn by the raster_font, so the raster_font needs info relative to the way the // font need to be drawn. note that fontsize is a scale factor in the transform matrix diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h index 23c8548fe..57b3798a2 100644 --- a/src/libnrtype/font-lister.h +++ b/src/libnrtype/font-lister.h @@ -16,7 +16,6 @@ #include <glibmm.h> #include <gtkmm.h> -#include "nrtype-forward.h" #include "nr-type-primitives.h" namespace Inkscape diff --git a/src/libnrtype/nrtype-forward.h b/src/libnrtype/nrtype-forward.h deleted file mode 100644 index 6050ffa6b..000000000 --- a/src/libnrtype/nrtype-forward.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef SEEN_LIBNRTYPE_NRTYPE_FORWARD_H -#define SEEN_LIBNRTYPE_NRTYPE_FORWARD_H - -class font_factory; -struct font_glyph; -class font_instance; -struct font_style; - -#endif /* !SEEN_LIBNRTYPE_NRTYPE_FORWARD_H */ - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/print.h b/src/print.h index 422f18669..35e45f6ed 100644 --- a/src/print.h +++ b/src/print.h @@ -15,7 +15,15 @@ //#include <libnr/nr-path.h> #include <2geom/forward.h> #include "forward.h" -#include "extension/extension-forward.h" + + +namespace Inkscape { +namespace Extension { + +class Print; + +} // namespace Extension +} // namespace Inkscape struct SPPrintContext { Inkscape::Extension::Print *module; diff --git a/src/ui/dialog/extensions.cpp b/src/ui/dialog/extensions.cpp index 242b79368..ed38860d1 100644 --- a/src/ui/dialog/extensions.cpp +++ b/src/ui/dialog/extensions.cpp @@ -15,6 +15,7 @@ #include "extension/db.h" #include "extensions.h" +#include "extension/extension.h" namespace Inkscape { diff --git a/src/widgets/font-selector.h b/src/widgets/font-selector.h index 3fc425f65..340a76f7f 100644 --- a/src/widgets/font-selector.h +++ b/src/widgets/font-selector.h @@ -1,5 +1,5 @@ -#ifndef __SP_FONT_SELECTOR_H__ -#define __SP_FONT_SELECTOR_H__ +#ifndef SP_FONT_SELECTOR_H +#define SP_FONT_SELECTOR_H /* * Font selection widgets @@ -22,9 +22,10 @@ struct SPFontSelector; #define SP_FONT_SELECTOR(o) (GTK_CHECK_CAST ((o), SP_TYPE_FONT_SELECTOR, SPFontSelector)) #define SP_IS_FONT_SELECTOR(o) (GTK_CHECK_TYPE ((o), SP_TYPE_FONT_SELECTOR)) -#include <libnrtype/nrtype-forward.h> #include <gtk/gtkwidget.h> +class font_instance; + /* SPFontSelector */ GType sp_font_selector_get_type (void); @@ -38,7 +39,7 @@ double sp_font_selector_get_size (SPFontSelector *fsel); -#endif +#endif // SP_FONT_SELECTOR_H /* Local Variables: |