summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/db.h14
-rw-r--r--src/extension/dependency.cpp1
-rw-r--r--src/extension/execution-env.h8
-rw-r--r--src/extension/extension-forward.h35
-rw-r--r--src/extension/extension.cpp2
-rw-r--r--src/extension/extension.h20
-rw-r--r--src/extension/implementation/implementation.h8
-rw-r--r--src/extension/internal/bitmap/imagemagick.h11
-rw-r--r--src/extension/internal/bluredge.h5
-rw-r--r--src/extension/internal/filter/filter.h11
-rw-r--r--src/extension/internal/gimpgrad.h4
-rw-r--r--src/extension/internal/grid.h5
-rw-r--r--src/extension/param/enum.h2
-rw-r--r--src/extension/param/notebook.h2
-rw-r--r--src/extension/param/parameter.h4
-rw-r--r--src/extension/param/radiobutton.h2
-rw-r--r--src/extension/system.h2
-rw-r--r--src/extension/timer.h3
18 files changed, 76 insertions, 63 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;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 08:26:21 +0000