Standardise InkscapeApplication GObject implementation (namespace not supported properly)

(bzr r13341.1.179)

2 files changed, 6 insertions, 8 deletions

diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 257d8ef30..fdf5ec500 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -59,7 +59,7 @@ public:
     static void changeSelectionCB(Application *inkscape, Selection *selection, SPWidget *spw);
     static void setSelectionCB(Application *inkscape, Selection *selection, SPWidget *spw);
 
-    static GtkWidget *constructGlobal(SPWidget *spw, Inkscape::Application *inkscape);
+    static GtkWidget *constructGlobal(SPWidget *spw, InkscapeApplication *inkscape);
 
     void modifySelection(Application *inkscape, Selection *selection, guint flags);
     void changeSelection(Application *inkscape, Selection *selection);
@@ -264,7 +264,7 @@ void SPWidgetImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation)
     }
 }
 
-GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw, Inkscape::Application *inkscape)
+GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw, InkscapeApplication *inkscape)
 {
     g_return_val_if_fail(!spw->inkscape, NULL);
 
@@ -316,7 +316,7 @@ void SPWidgetImpl::setSelection(Application * /*inkscape*/, Selection *selection
 
 // Methods
 
-GtkWidget *sp_widget_new_global(Inkscape::Application *inkscape)
+GtkWidget *sp_widget_new_global(InkscapeApplication *inkscape)
 {
     SPWidget *spw = reinterpret_cast<SPWidget*>(g_object_new(SP_TYPE_WIDGET, NULL));
 
diff --git a/src/widgets/sp-widget.h b/src/widgets/sp-widget.h
index e23a6da4f..b3cce32a6 100644
--- a/src/widgets/sp-widget.h
+++ b/src/widgets/sp-widget.h
@@ -24,20 +24,18 @@
 #define SP_IS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_WIDGET))
 #define SP_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_WIDGET))
 
+struct InkscapeApplication;
 
 namespace Inkscape {
-
-struct Application;
 class Selection;
 class SPWidgetImpl;
-
 }
 
 struct SPWidget {
     friend class Inkscape::SPWidgetImpl;
 
     GtkBin bin;
-    Inkscape::Application *inkscape;
+    InkscapeApplication *inkscape;
 
     Inkscape::SPWidgetImpl *_impl;
 };
@@ -56,7 +54,7 @@ struct SPWidgetClass {
 GType sp_widget_get_type();
 
 /** Generic constructor for global widget. */
-GtkWidget *sp_widget_new_global(Inkscape::Application *inkscape);
+GtkWidget *sp_widget_new_global(InkscapeApplication *inkscape);
 
 #endif // SEEN_SP_WIDGET_H
 /*