summaryrefslogtreecommitdiffstats
path: root/src/helper
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2011-10-05 07:06:08 +0000
committerJon A. Cruz <jon@joncruz.org>2011-10-05 07:06:08 +0000
commitcd5e6c8856a1ac7b94e0fa799c471eaa8c8ecae4 (patch)
treea2cc09e750a94433c9a90052474ea7a6889ec6b5 /src/helper
parentCleaned up display-forward.h, including many redundant usages. (diff)
downloadinkscape-cd5e6c8856a1ac7b94e0fa799c471eaa8c8ecae4.tar.gz
inkscape-cd5e6c8856a1ac7b94e0fa799c471eaa8c8ecae4.zip
Cleanup for src/forward.h. (About 19 of the affected files did not require the contents forward.h at all).
(bzr r10667)
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/action.h7
-rw-r--r--src/helper/stock-items.h6
2 files changed, 10 insertions, 3 deletions
diff --git a/src/helper/action.h b/src/helper/action.h
index e7c799992..0cd010b34 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -14,7 +14,7 @@
#include <sigc++/sigc++.h>
#include <glibmm/ustring.h>
-#include "forward.h"
+#include <glib-object.h>
struct SPAction;
struct SPActionClass;
@@ -26,6 +26,11 @@ struct SPActionClass;
namespace Inkscape {
class Verb;
+namespace UI {
+namespace View {
+class View;
+} // namespace View
+} // namespace UI
}
/** All the data that is required to be an action. This
diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h
index ddad55415..7299e070e 100644
--- a/src/helper/stock-items.h
+++ b/src/helper/stock-items.h
@@ -1,4 +1,5 @@
-#define __INK_STOCK_ITEMS__
+#ifndef SEEN_INK_STOCK_ITEMS_H
+#define SEEN_INK_STOCK_ITEMS_H
/*
* Stock-items
@@ -14,7 +15,8 @@
#include <glib/gtypes.h>
-#include <forward.h>
+class SPObject;
SPObject *get_stock_item(gchar const *urn);
+#endif // SEEN_INK_STOCK_ITEMS_H