Standardise InkscapeApplication GObject implementation (namespace not supported properly)

(bzr r13341.1.179)

30 files changed, 116 insertions, 154 deletions

diff --git a/src/desktop.h b/src/desktop.h
index ec240dd40..509f8a396 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -72,8 +72,9 @@ typedef struct _GdkEventAny GdkEventAny;
 struct _GdkEventWindowState;
 typedef struct _GdkEventWindowState GdkEventWindowState;
 
+struct InkscapeApplication;
+
 namespace Inkscape {
-  struct Application;
   class LayerModel;
   class MessageContext;
   class Selection;
@@ -423,7 +424,7 @@ public:
 
 private:
     Inkscape::UI::View::EditWidgetInterface       *_widget;
-    Inkscape::Application     *_inkscape;
+    InkscapeApplication     *_inkscape;
     Inkscape::MessageContext  *_guides_message_context;
     bool _active;
     Geom::Affine _w2d;
diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp
index a12e3eafc..cf3497c9b 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/dialogs/dialog-events.cpp
@@ -187,7 +187,7 @@ void on_transientize (SPDesktop *desktop, win_data *wd )
 }
 
 void
-sp_transientize_callback ( Inkscape::Application * /*inkscape*/,
+sp_transientize_callback ( InkscapeApplication * /*inkscape*/,
                            SPDesktop *desktop, win_data *wd )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h
index 623058282..b33eb3f38 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/dialogs/dialog-events.h
@@ -29,9 +29,7 @@ class Entry;
 
 class SPDesktop;
 
-namespace Inkscape {
-struct Application;
-} // namespace Inkscape
+struct InkscapeApplication;
  
 typedef struct { 
     GtkWidget *win;
@@ -55,7 +53,7 @@ void sp_transientize             ( GtkWidget *win );
 void on_transientize             ( SPDesktop *desktop, 
                                    win_data *wd );
 
-void sp_transientize_callback    ( Inkscape::Application *inkscape, 
+void sp_transientize_callback    ( InkscapeApplication *inkscape, 
                                    SPDesktop *desktop, 
                                    win_data *wd );
 
diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 53e701648..478266b7b 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -112,7 +112,7 @@ void Inkscape::DocumentUndo::done(SPDocument *doc, const unsigned int event_type
     maybeDone(doc, NULL, event_type, event_description);
 }
 
-void Inkscape::DocumentUndo::resetKey( Inkscape::Application * /*inkscape*/, SPDesktop * /*desktop*/, GObject *base )
+void Inkscape::DocumentUndo::resetKey( InkscapeApplication * /*inkscape*/, SPDesktop * /*desktop*/, GObject *base )
 {
     SPDocument *doc = reinterpret_cast<SPDocument *>(base);
     doc->actionkey.clear();
diff --git a/src/document-undo.h b/src/document-undo.h
index 38e575a34..17b3de252 100644
--- a/src/document-undo.h
+++ b/src/document-undo.h
@@ -9,11 +9,10 @@ typedef struct _GObject GObject;
 
 class SPDesktop;
 class SPDocument;
+struct InkscapeApplication;
 
 namespace Inkscape {
 
-struct Application;
-
 class DocumentUndo
 {
 public:
@@ -42,7 +41,7 @@ public:
 
     static void maybeDone(SPDocument *document, const gchar *keyconst, unsigned int event_type, Glib::ustring const &event_description);
 
-    static void resetKey(Inkscape::Application *inkscape, SPDesktop *desktop, GObject *base);
+    static void resetKey(InkscapeApplication *inkscape, SPDesktop *desktop, GObject *base);
 
     static void cancel(SPDocument *document);
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 4b4c8c678..8ac87dadd 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -71,7 +71,7 @@
 #include "helper/action-context.h"
 #include "helper/sp-marshal.h"
 
-static Inkscape::Application *inkscape = NULL;
+static InkscapeApplication *inkscape = NULL;
 
 /* Backbones of configuration xml data */
 #include "menus-skeleton.h"
@@ -99,16 +99,10 @@ enum {
 # FORWARD DECLARATIONS
 ################################*/
 
-namespace Inkscape {
-struct ApplicationClass;
-}
-
-static void inkscape_class_init (Inkscape::ApplicationClass *klass);
-static void inkscape_init (SPObject *object);
 static void inkscape_dispose (GObject *object);
 
-static void inkscape_activate_desktop_private (Inkscape::Application *inkscape, SPDesktop *desktop);
-static void inkscape_deactivate_desktop_private (Inkscape::Application *inkscape, SPDesktop *desktop);
+static void inkscape_activate_desktop_private (InkscapeApplication *inkscape, SPDesktop *desktop);
+static void inkscape_deactivate_desktop_private (InkscapeApplication *inkscape, SPDesktop *desktop);
 
 class AppSelectionModel {
     Inkscape::LayerModel _layer_model;
@@ -126,7 +120,7 @@ public:
     Inkscape::Selection *getSelection() const { return _selection; }
 };
 
-struct Inkscape::Application {
+struct InkscapeApplication {
     GObject object;
     Inkscape::XML::Document *menus;
     std::map<SPDocument *, int> document_set;
@@ -140,26 +134,25 @@ struct Inkscape::Application {
     guint trackalt;
 };
 
-struct Inkscape::ApplicationClass {
+struct InkscapeApplicationClass {
     GObjectClass object_class;
 
     /* Signals */
-    void (* change_selection) (Inkscape::Application * inkscape, Inkscape::Selection * selection);
-    void (* change_subselection) (Inkscape::Application * inkscape, SPDesktop *desktop);
-    void (* modify_selection) (Inkscape::Application * inkscape, Inkscape::Selection * selection, guint flags);
-    void (* set_selection) (Inkscape::Application * inkscape, Inkscape::Selection * selection);
-    void (* set_eventcontext) (Inkscape::Application * inkscape, Inkscape::UI::Tools::ToolBase * eventcontext);
-    void (* activate_desktop) (Inkscape::Application * inkscape, SPDesktop * desktop);
-    void (* deactivate_desktop) (Inkscape::Application * inkscape, SPDesktop * desktop);
-    void (* destroy_document) (Inkscape::Application *inkscape, SPDocument *doc);
-    void (* color_set) (Inkscape::Application *inkscape, SPColor *color, double opacity);
-    void (* shut_down) (Inkscape::Application *inkscape);
-    void (* dialogs_hide) (Inkscape::Application *inkscape);
-    void (* dialogs_unhide) (Inkscape::Application *inkscape);
-    void (* external_change) (Inkscape::Application *inkscape);
+    void (* change_selection) (InkscapeApplication * inkscape, Inkscape::Selection * selection);
+    void (* change_subselection) (InkscapeApplication * inkscape, SPDesktop *desktop);
+    void (* modify_selection) (InkscapeApplication * inkscape, Inkscape::Selection * selection, guint flags);
+    void (* set_selection) (InkscapeApplication * inkscape, Inkscape::Selection * selection);
+    void (* set_eventcontext) (InkscapeApplication * inkscape, Inkscape::UI::Tools::ToolBase * eventcontext);
+    void (* activate_desktop) (InkscapeApplication * inkscape, SPDesktop * desktop);
+    void (* deactivate_desktop) (InkscapeApplication * inkscape, SPDesktop * desktop);
+    void (* destroy_document) (InkscapeApplication *inkscape, SPDocument *doc);
+    void (* color_set) (InkscapeApplication *inkscape, SPColor *color, double opacity);
+    void (* shut_down) (InkscapeApplication *inkscape);
+    void (* dialogs_hide) (InkscapeApplication *inkscape);
+    void (* dialogs_unhide) (InkscapeApplication *inkscape);
+    void (* external_change) (InkscapeApplication *inkscape);
 };
 
-static GObjectClass * parent_class;
 static guint inkscape_signals[LAST_SIGNAL] = {0};
 
 static void (* segv_handler) (int) = SIG_DFL;
@@ -175,48 +168,21 @@ static void (* bus_handler)  (int) = SIG_DFL;
 #define INKSCAPE_LEGACY_PROFILE_DIR ".inkscape"
 #define MENUS_FILE "menus.xml"
 
-
-/**
- *  Retrieves the GType for the Inkscape Application object.
- */
-GType
-inkscape_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof (Inkscape::ApplicationClass),
-            NULL, NULL,
-            (GClassInitFunc) inkscape_class_init,
-            NULL, NULL,
-            sizeof (Inkscape::Application),
-            4,
-            (GInstanceInitFunc) inkscape_init,
-            NULL
-        };
-        type = g_type_register_static (G_TYPE_OBJECT, "Inkscape_Application", &info, (GTypeFlags)0);
-    }
-    return type;
-}
-
+G_DEFINE_TYPE(InkscapeApplication, inkscape, G_TYPE_OBJECT);
 
 /**
  *  Initializes the inkscape class, registering all of its signal handlers
  *  and virtual functions
  */
 static void
-inkscape_class_init (Inkscape::ApplicationClass * klass)
+inkscape_class_init (InkscapeApplicationClass * klass)
 {
-    GObjectClass * object_class;
-
-    object_class = (GObjectClass *) klass;
-
-    parent_class = (GObjectClass *)g_type_class_peek_parent (klass);
+    GObjectClass * object_class = G_OBJECT_CLASS(klass);
 
     inkscape_signals[MODIFY_SELECTION] = g_signal_new ("modify_selection",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, modify_selection),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, modify_selection),
                                NULL, NULL,
                                sp_marshal_VOID__POINTER_UINT,
                                G_TYPE_NONE, 2,
@@ -224,7 +190,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[CHANGE_SELECTION] = g_signal_new ("change_selection",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, change_selection),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, change_selection),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__POINTER,
                                G_TYPE_NONE, 1,
@@ -232,7 +198,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[CHANGE_SUBSELECTION] = g_signal_new ("change_subselection",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, change_subselection),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, change_subselection),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__POINTER,
                                G_TYPE_NONE, 1,
@@ -240,7 +206,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[SET_SELECTION] =    g_signal_new ("set_selection",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, set_selection),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, set_selection),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__POINTER,
                                G_TYPE_NONE, 1,
@@ -248,7 +214,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[SET_EVENTCONTEXT] = g_signal_new ("set_eventcontext",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, set_eventcontext),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, set_eventcontext),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__POINTER,
                                G_TYPE_NONE, 1,
@@ -256,7 +222,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[ACTIVATE_DESKTOP] = g_signal_new ("activate_desktop",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, activate_desktop),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, activate_desktop),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__POINTER,
                                G_TYPE_NONE, 1,
@@ -264,7 +230,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[DEACTIVATE_DESKTOP] = g_signal_new ("deactivate_desktop",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, deactivate_desktop),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, deactivate_desktop),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__POINTER,
                                G_TYPE_NONE, 1,
@@ -272,28 +238,28 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
     inkscape_signals[SHUTDOWN_SIGNAL] =        g_signal_new ("shut_down",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, shut_down),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, shut_down),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__VOID,
                                G_TYPE_NONE, 0);
     inkscape_signals[DIALOGS_HIDE] =        g_signal_new ("dialogs_hide",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, dialogs_hide),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, dialogs_hide),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__VOID,
                                G_TYPE_NONE, 0);
     inkscape_signals[DIALOGS_UNHIDE] =        g_signal_new ("dialogs_unhide",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, dialogs_unhide),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, dialogs_unhide),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__VOID,
                                G_TYPE_NONE, 0);
     inkscape_signals[EXTERNAL_CHANGE] =   g_signal_new ("external_change",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_FIRST,
-                               G_STRUCT_OFFSET (Inkscape::ApplicationClass, external_change),
+                               G_STRUCT_OFFSET (InkscapeApplicationClass, external_change),
                                NULL, NULL,
                                g_cclosure_marshal_VOID__VOID,
                                G_TYPE_NONE, 0);
@@ -494,10 +460,10 @@ void inkscape_autosave_init()
 
 
 static void
-inkscape_init (SPObject * object)
+inkscape_init (InkscapeApplication * object)
 {
     if (!inkscape) {
-        inkscape = (Inkscape::Application *) object;
+        inkscape = (InkscapeApplication *) object;
     } else {
         g_assert_not_reached ();
     }
@@ -515,7 +481,7 @@ inkscape_init (SPObject * object)
 static void
 inkscape_dispose (GObject *object)
 {
-    Inkscape::Application *inkscape = (Inkscape::Application *) object;
+    InkscapeApplication *inkscape = (InkscapeApplication *) object;
 
     g_assert (!inkscape->desktops);
 
@@ -530,7 +496,7 @@ inkscape_dispose (GObject *object)
     inkscape->selection_models.~map();
     inkscape->document_set.~map();
 
-    G_OBJECT_CLASS (parent_class)->dispose (object);
+    G_OBJECT_CLASS (inkscape_parent_class)->dispose (object);
 
     gtk_main_quit ();
 }
@@ -580,14 +546,14 @@ void inkscape_trackalt(guint trackvalue)
 
 
 static void
-inkscape_activate_desktop_private (Inkscape::Application */*inkscape*/, SPDesktop *desktop)
+inkscape_activate_desktop_private (InkscapeApplication */*inkscape*/, SPDesktop *desktop)
 {
     desktop->set_active (true);
 }
 
 
 static void
-inkscape_deactivate_desktop_private (Inkscape::Application */*inkscape*/, SPDesktop *desktop)
+inkscape_deactivate_desktop_private (InkscapeApplication */*inkscape*/, SPDesktop *desktop)
 {
     desktop->set_active (false);
 }
@@ -835,7 +801,7 @@ private:
 void
 inkscape_application_init (const gchar *argv0, gboolean use_gui)
 {
-    inkscape = (Inkscape::Application *)g_object_new (SP_TYPE_INKSCAPE, NULL);
+    inkscape = (InkscapeApplication *)g_object_new (SP_TYPE_INKSCAPE, NULL);
     /* fixme: load application defaults */
 
     segv_handler = signal (SIGSEGV, inkscape_crash_handler);
@@ -904,9 +870,9 @@ inkscape_application_init (const gchar *argv0, gboolean use_gui)
 }
 
 /**
- *  Returns the current Inkscape::Application global object
+ *  Returns the current InkscapeApplication global object
  */
-Inkscape::Application *
+InkscapeApplication *
 inkscape_get_instance()
 {
         return inkscape;
@@ -921,7 +887,7 @@ gboolean inkscape_use_gui()
  *  Menus management
  *
  */
-bool inkscape_load_menus( Inkscape::Application * inkscape )
+bool inkscape_load_menus( InkscapeApplication * inkscape )
 {
     gchar *fn = profile_path(MENUS_FILE);
     gchar *menus_xml = 0;
@@ -1391,7 +1357,7 @@ inkscape_action_context_for_document(SPDocument *doc)
 #####################*/
 
 void
-inkscape_refresh_display (Inkscape::Application *inkscape)
+inkscape_refresh_display (InkscapeApplication *inkscape)
 {
     for (GSList *l = inkscape->desktops; l != NULL; l = l->next) {
         (static_cast<Inkscape::UI::View::View*>(l->data))->requestRedraw();
@@ -1404,7 +1370,7 @@ inkscape_refresh_display (Inkscape::Application *inkscape)
  *  saves the preferences if appropriate, and quits.
  */
 void
-inkscape_exit (Inkscape::Application */*inkscape*/)
+inkscape_exit (InkscapeApplication */*inkscape*/)
 {
     g_assert (INKSCAPE);
 
@@ -1546,7 +1512,7 @@ profile_path(const char *filename)
 }
 
 Inkscape::XML::Node *
-inkscape_get_menus (Inkscape::Application * inkscape)
+inkscape_get_menus (InkscapeApplication * inkscape)
 {
     Inkscape::XML::Node *repr = inkscape->menus->root();
     g_assert (!(strcmp (repr->name(), "inkscape")));
diff --git a/src/inkscape.h b/src/inkscape.h
index 823e7524f..3a9b85fc9 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -28,9 +28,10 @@ class ToolBase;
 }
 }
 
+struct InkscapeApplication;
+
 namespace Inkscape {
     class ActionContext;
-    struct Application;
     namespace XML {
         class Node;
         struct Document;
@@ -46,11 +47,11 @@ void inkscape_application_init (const gchar *argv0, gboolean use_gui);
 bool inkscape_load_config (const gchar *filename, Inkscape::XML::Document *config, const gchar *skeleton, unsigned int skel_size, const gchar *e_notreg, const gchar *e_notxml, const gchar *e_notsp, const gchar *warn);
 
 /* Menus */
-bool inkscape_load_menus (Inkscape::Application * inkscape);
-bool inkscape_save_menus (Inkscape::Application * inkscape);
-Inkscape::XML::Node *inkscape_get_menus (Inkscape::Application * inkscape);
+bool inkscape_load_menus (InkscapeApplication * inkscape);
+bool inkscape_save_menus (InkscapeApplication * inkscape);
+Inkscape::XML::Node *inkscape_get_menus (InkscapeApplication * inkscape);
 
-Inkscape::Application *inkscape_get_instance();
+InkscapeApplication *inkscape_get_instance();
 gboolean inkscape_use_gui();
 
 bool inkscapeIsCrashing();
@@ -108,13 +109,13 @@ bool inkscape_remove_document (SPDocument *document);
  * fixme: This has to be rethought
  */
 
-void inkscape_refresh_display (Inkscape::Application *inkscape);
+void inkscape_refresh_display (InkscapeApplication *inkscape);
 
 /*
  * fixme: This also
  */
 
-void inkscape_exit (Inkscape::Application *inkscape);
+void inkscape_exit (InkscapeApplication *inkscape);
 
 #endif
 
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 82bd08e34..4188c832f 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -62,7 +62,7 @@
 
 #include "inkscape-private.h"
 
-Inkscape::Application *inkscape;
+InkscapeApplication *inkscape;
 
 #include <iostream>
 
@@ -232,7 +232,7 @@ main (int argc, const char **argv)
     ss.view = NULL;
     ss.fullscreen = false;
 
-    inkscape = (Inkscape::Application *)g_object_new (SP_TYPE_INKSCAPE, NULL);
+    inkscape = (InkscapeApplication *)g_object_new (SP_TYPE_INKSCAPE, NULL);
 
     // starting at where the commandline options stopped parsing because
     // we want all the files to be in the list
@@ -572,7 +572,7 @@ static void usage()
 
 #ifdef XXX
 /* TODO !!! make this temporary stub unnecessary */
-Inkscape::Application *inkscape_get_instance() { return NULL; }
+InkscapeApplication *inkscape_get_instance() { return NULL; }
 void inkscape_ref (void) {}
 void inkscape_unref (void) {}
 void inkscape_add_document (SPDocument *document) {}
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index e02ccd3f1..8352de1e3 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -829,14 +829,14 @@ private :
 
 
 
-static void on_tool_changed(Inkscape::Application */*inkscape*/, Inkscape::UI::Tools::ToolBase */*context*/, AlignAndDistribute *daad)
+static void on_tool_changed(InkscapeApplication */*inkscape*/, Inkscape::UI::Tools::ToolBase */*context*/, AlignAndDistribute *daad)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop && desktop->getEventContext())
         daad->setMode(tools_active(desktop) == TOOLS_NODES);
 }
 
-static void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selection */*selection*/, AlignAndDistribute *daad)
+static void on_selection_changed(InkscapeApplication */*inkscape*/, Inkscape::Selection */*selection*/, AlignAndDistribute *daad)
 {
     daad->randomize_bbox = Geom::OptRect();
 }
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index e5f18216c..d9e2c03ba 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -1349,7 +1349,7 @@ void CloneTiler::on_picker_color_changed(guint rgba)
     is_updating = false;
 }
 
-void CloneTiler::clonetiler_change_selection(Inkscape::Application * /*inkscape*/, Inkscape::Selection *selection, GtkWidget *dlg)
+void CloneTiler::clonetiler_change_selection(InkscapeApplication * /*inkscape*/, Inkscape::Selection *selection, GtkWidget *dlg)
 {
     GtkWidget *buttons = GTK_WIDGET(g_object_get_data (G_OBJECT(dlg), "buttons_on_tiles"));
     GtkWidget *status = GTK_WIDGET(g_object_get_data (G_OBJECT(dlg), "status"));
@@ -1378,7 +1378,7 @@ void CloneTiler::clonetiler_change_selection(Inkscape::Application * /*inkscape*
     }
 }
 
-void CloneTiler::clonetiler_external_change(Inkscape::Application * /*inkscape*/, GtkWidget *dlg)
+void CloneTiler::clonetiler_external_change(InkscapeApplication * /*inkscape*/, GtkWidget *dlg)
 {
     clonetiler_change_selection (NULL, sp_desktop_selection(SP_ACTIVE_DESKTOP), dlg);
 }
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index e2a0240ee..9bacc701d 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -58,8 +58,8 @@ protected:
     static void clonetiler_keep_bbox_toggled(GtkToggleButton *tb, gpointer /*data*/);
     static void clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg);
     static void clonetiler_unclump(GtkWidget */*widget*/, void *);
-    static void clonetiler_change_selection(Inkscape::Application * /*inkscape*/, Inkscape::Selection *selection, GtkWidget *dlg);
-    static void clonetiler_external_change(Inkscape::Application * /*inkscape*/, GtkWidget *dlg);
+    static void clonetiler_change_selection(InkscapeApplication * /*inkscape*/, Inkscape::Selection *selection, GtkWidget *dlg);
+    static void clonetiler_external_change(InkscapeApplication * /*inkscape*/, GtkWidget *dlg);
     static void clonetiler_disconnect_gsignal(GObject *widget, gpointer source);
     static void clonetiler_reset(GtkWidget */*widget*/, GtkWidget *dlg);
     static guint clonetiler_number_of_clones(SPObject *obj);
diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp
index 8a359dd2d..3ed998252 100644
--- a/src/ui/dialog/desktop-tracker.cpp
+++ b/src/ui/dialog/desktop-tracker.cpp
@@ -94,7 +94,7 @@ sigc::connection DesktopTracker::connectDesktopChanged( const sigc::slot<void, S
     return desktopChangedSig.connect(slot);
 }
 
-gboolean DesktopTracker::activateDesktopCB(Inkscape::Application */*inkscape*/, SPDesktop *desktop, DesktopTracker *self )
+gboolean DesktopTracker::activateDesktopCB(InkscapeApplication */*inkscape*/, SPDesktop *desktop, DesktopTracker *self )
 {
     if (self && self->trackActive) {
         self->setDesktop(desktop);
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index 7da55cf2f..7b944ddfa 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -12,11 +12,10 @@
 
 typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
+struct InkscapeApplication;
 
 namespace Inkscape {
 
-struct Application;
-
 namespace UI {
 namespace Dialog {
 
@@ -37,7 +36,7 @@ public:
     sigc::connection connectDesktopChanged( const sigc::slot<void, SPDesktop*> & slot );
 
 private:
-    static gboolean activateDesktopCB(Inkscape::Application *inkscape, SPDesktop *desktop, DesktopTracker *self );
+    static gboolean activateDesktopCB(InkscapeApplication *inkscape, SPDesktop *desktop, DesktopTracker *self );
     static bool hierarchyChangeCB(GtkWidget *widget, GtkWidget* prev, DesktopTracker *self);
 
     void handleHierarchyChange();
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 7e69e439a..0da638546 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -70,13 +70,13 @@ inline Dialog *create() { return PanelDialog<B>::template create<T>(); }
 
 /**
  *  This class is provided as a container for Inkscape's various
- *  dialogs.  This allows Inkscape::Application to treat the various
+ *  dialogs.  This allows InkscapeApplication to treat the various
  *  dialogs it invokes, as abstractions.
  *
  *  DialogManager is essentially a cache of dialogs.  It lets us
  *  initialize dialogs lazily - instead of constructing them during
  *  application startup, they're constructed the first time they're
- *  actually invoked by Inkscape::Application.  The constructed
+ *  actually invoked by InkscapeApplication.  The constructed
  *  dialog is held here after that, so future invokations of the
  *  dialog don't need to get re-constructed each time.  The memory for
  *  the dialogs are then reclaimed when the DialogManager is destroyed.
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index f2c63ed8d..4f0d9fbe1 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -41,7 +41,7 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-void sp_retransientize(Inkscape::Application */*inkscape*/, SPDesktop *desktop, gpointer dlgPtr)
+void sp_retransientize(InkscapeApplication */*inkscape*/, SPDesktop *desktop, gpointer dlgPtr)
 {
     Dialog *dlg = static_cast<Dialog *>(dlgPtr);
     dlg->onDesktopActivated (desktop);
diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index ec5d203bc..ccff43a56 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -18,10 +18,10 @@
 #include "floating-behavior.h"
 
 class SPDesktop;
+struct InkscapeApplication;
 
 namespace Inkscape {
 class Selection;
-struct Application;
 }
 
 namespace Inkscape {
@@ -30,7 +30,7 @@ namespace Dialog {
 
 enum BehaviorType { FLOATING, DOCK };
 
-void sp_retransientize(Inkscape::Application *inkscape, SPDesktop *desktop, gpointer dlgPtr);
+void sp_retransientize(InkscapeApplication *inkscape, SPDesktop *desktop, gpointer dlgPtr);
 gboolean sp_retransientize_again(gpointer dlgPtr);
 void sp_dialog_shutdown(GObject *object, gpointer dlgPtr);
 
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 09c505860..77ea175d9 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -223,7 +223,7 @@ DocumentMetadata::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *)
 }
 
 void 
-DocumentMetadata::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
+DocumentMetadata::_handleActivateDesktop(InkscapeApplication *, SPDesktop *desktop)
 {
     Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->addListener(&_repr_events, this);
@@ -231,7 +231,7 @@ DocumentMetadata::_handleActivateDesktop(Inkscape::Application *, SPDesktop *des
 }
 
 void
-DocumentMetadata::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop)
+DocumentMetadata::_handleDeactivateDesktop(InkscapeApplication *, SPDesktop *desktop)
 {
     Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->removeListenerByData(this);
diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 3b7ed1ec8..77084bc3d 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -56,8 +56,8 @@ protected:
     void  init();
 
     void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
-    void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
-    void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
+    void _handleActivateDesktop(InkscapeApplication *application, SPDesktop *desktop);
+    void _handleDeactivateDesktop(InkscapeApplication *application, SPDesktop *desktop);
 
     Gtk::Notebook  _notebook;
 
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 4e4616724..5ad82644e 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -1594,7 +1594,7 @@ void DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument
     update();
 }
 
-void DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
+void DocumentProperties::_handleActivateDesktop(InkscapeApplication *, SPDesktop *desktop)
 {
     Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->addListener(&_repr_events, this);
@@ -1603,7 +1603,7 @@ void DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDeskt
     update();
 }
 
-void DocumentProperties::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop)
+void DocumentProperties::_handleDeactivateDesktop(InkscapeApplication *, SPDesktop *desktop)
 {
     Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->removeListenerByData(this);
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 495f3177d..ee7e88b18 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -94,8 +94,8 @@ protected:
     void  save_default_metadata();
 
     void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
-    void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
-    void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
+    void _handleActivateDesktop(InkscapeApplication *application, SPDesktop *desktop);
+    void _handleDeactivateDesktop(InkscapeApplication *application, SPDesktop *desktop);
 
     Inkscape::XML::SignalObserver _emb_profiles_observer, _scripts_observer;
     Gtk::Notebook  _notebook;
diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h
index 340cb860f..35c98ef9c 100644
--- a/src/ui/dialog/fill-and-stroke.h
+++ b/src/ui/dialog/fill-and-stroke.h
@@ -41,7 +41,7 @@ public:
 
     virtual void setDesktop(SPDesktop *desktop);
 
-    void selectionChanged(Inkscape::Application *inkscape,
+    void selectionChanged(InkscapeApplication *inkscape,
                           Inkscape::Selection *selection);
 
     void showPageFill();
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 72217c729..1417b39fa 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -572,7 +572,7 @@ void GridArrangeTab::updateSelection()
 ## Experimental
 ##########################*/
 
-static void updateSelectionCallback(Inkscape::Application */*inkscape*/, Inkscape::Selection */*selection*/, GridArrangeTab *dlg)
+static void updateSelectionCallback(InkscapeApplication */*inkscape*/, Inkscape::Selection */*selection*/, GridArrangeTab *dlg)
 {
     dlg->updateSelection();
 }
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 1fefd811e..b4a355083 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -49,19 +49,19 @@ public:
     virtual UI::Widget::Panel &getPanel() { return _panel; }
 
 protected:
-    static void handle_deactivate_desktop(Inkscape::Application *application, SPDesktop *desktop, void *data) {
+    static void handle_deactivate_desktop(InkscapeApplication *application, SPDesktop *desktop, void *data) {
         g_return_if_fail(data != NULL);
         static_cast<PanelDialogBase *>(data)->_propagateDesktopDeactivated(application, desktop);
     }
 
-    static void _handle_activate_desktop(Inkscape::Application *application, SPDesktop *desktop, void *data) {
+    static void _handle_activate_desktop(InkscapeApplication *application, SPDesktop *desktop, void *data) {
         g_return_if_fail(data != NULL);
         static_cast<PanelDialogBase *>(data)->_propagateDesktopActivated(application, desktop);
     }
 
     inline virtual void _propagateDocumentReplaced(SPDesktop* desktop, SPDocument *document);
-    inline virtual void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *);
-    inline virtual void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *);
+    inline virtual void _propagateDesktopActivated(InkscapeApplication *, SPDesktop *);
+    inline virtual void _propagateDesktopDeactivated(InkscapeApplication *, SPDesktop *);
 
     UI::Widget::Panel &_panel;
     sigc::connection _document_replaced_connection;
@@ -134,14 +134,14 @@ void PanelDialogBase::_propagateDocumentReplaced(SPDesktop *desktop, SPDocument
     _panel.signalDocumentReplaced().emit(desktop, document);
 }
 
-void PanelDialogBase::_propagateDesktopActivated(Inkscape::Application *application, SPDesktop *desktop)
+void PanelDialogBase::_propagateDesktopActivated(InkscapeApplication *application, SPDesktop *desktop)
 {
     _document_replaced_connection =
         desktop->connectDocumentReplaced(sigc::mem_fun(*this, &PanelDialogBase::_propagateDocumentReplaced));
     _panel.signalActivateDesktop().emit(application, desktop);
 }
 
-void PanelDialogBase::_propagateDesktopDeactivated(Inkscape::Application *application, SPDesktop *desktop)
+void PanelDialogBase::_propagateDesktopDeactivated(InkscapeApplication *application, SPDesktop *desktop)
 {
     _document_replaced_connection.disconnect();
     _panel.signalDeactiveDesktop().emit(application, desktop);
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index a7f0b068e..3e135b9b2 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -47,13 +47,13 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-static void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, Transformation *daad)
+static void on_selection_changed(InkscapeApplication */*inkscape*/, Inkscape::Selection *selection, Transformation *daad)
 {
     int page = daad->getCurrentPage();
     daad->updateSelection((Inkscape::UI::Dialog::Transformation::PageType)page, selection);
 }
 
-static void on_selection_modified( Inkscape::Application */*inkscape*/,
+static void on_selection_modified( InkscapeApplication */*inkscape*/,
                                    Inkscape::Selection *selection,
                                    guint /*flags*/,
                                    Transformation *daad )
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 537db0fdd..e4cd76345 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -40,7 +40,7 @@ namespace UI {
 namespace Widget {
 
 /*void ObjectCompositeSettings::_on_desktop_activate(
-    Inkscape::Application *application,
+    InkscapeApplication *application,
     SPDesktop *desktop,
     ObjectCompositeSettings *w
 ) {
@@ -50,7 +50,7 @@ namespace Widget {
 }
 
 void ObjectCompositeSettings::_on_desktop_deactivate(
-    Inkscape::Application *application,
+    InkscapeApplication *application,
     SPDesktop *desktop,
     ObjectCompositeSettings *w
 ) {
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index 19a6cb2a5..e375bf24a 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -30,9 +30,9 @@
 #include "ui/widget/spinbutton.h"
 
 class SPDesktop;
+struct InkscapeApplication;
 
 namespace Inkscape {
-struct Application;
 
 namespace UI {
 namespace Widget {
@@ -66,8 +66,8 @@ private:
     gulong _desktop_activated;
     sigc::connection _subject_changed;
     
-    static void _on_desktop_activate(Inkscape::Application *application, SPDesktop *desktop, ObjectCompositeSettings *w);
-    static void _on_desktop_deactivate(Inkscape::Application *application, SPDesktop *desktop, ObjectCompositeSettings *w);
+    static void _on_desktop_activate(InkscapeApplication *application, SPDesktop *desktop, ObjectCompositeSettings *w);
+    static void _on_desktop_deactivate(InkscapeApplication *application, SPDesktop *desktop, ObjectCompositeSettings *w);
     void _subjectChanged();
     void _blendBlurValueChanged();
     void _opacityValueChanged();
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index b37137228..0abd81b16 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -643,13 +643,13 @@ Panel::signalDocumentReplaced()
     return _signal_document_replaced;
 }
 
-sigc::signal<void, Inkscape::Application *, SPDesktop *> &
+sigc::signal<void, InkscapeApplication *, SPDesktop *> &
 Panel::signalActivateDesktop()
 {
     return _signal_activate_desktop;
 }
 
-sigc::signal<void, Inkscape::Application *, SPDesktop *> &
+sigc::signal<void, InkscapeApplication *, SPDesktop *> &
 Panel::signalDeactiveDesktop()
 {
     return _signal_deactive_desktop;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 0c3d822b8..177314797 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -45,9 +45,9 @@ namespace Gtk {
 	class MenuItem;
 }
 
-namespace Inkscape {
+struct InkscapeApplication;
 
-struct Application;
+namespace Inkscape {
 class Selection;
 
 namespace UI {
@@ -116,8 +116,8 @@ public:
     void setResponseSensitive(int response_id, bool setting);
 
     virtual sigc::signal<void, SPDesktop *, SPDocument *> &signalDocumentReplaced();
-    virtual sigc::signal<void, Inkscape::Application *, SPDesktop *> &signalActivateDesktop();
-    virtual sigc::signal<void, Inkscape::Application *, SPDesktop *> &signalDeactiveDesktop();
+    virtual sigc::signal<void, InkscapeApplication *, SPDesktop *> &signalActivateDesktop();
+    virtual sigc::signal<void, InkscapeApplication *, SPDesktop *> &signalDeactiveDesktop();
 
 protected:
     /**
@@ -147,8 +147,8 @@ protected:
     sigc::signal<void, int> _signal_response;
     sigc::signal<void>      _signal_present;
     sigc::signal<void, SPDesktop *, SPDocument *> _signal_document_replaced;
-    sigc::signal<void, Inkscape::Application *, SPDesktop *> _signal_activate_desktop;
-    sigc::signal<void, Inkscape::Application *, SPDesktop *> _signal_deactive_desktop;
+    sigc::signal<void, InkscapeApplication *, SPDesktop *> _signal_activate_desktop;
+    sigc::signal<void, InkscapeApplication *, SPDesktop *> _signal_deactive_desktop;
 
 private:
     void _init();
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
 /*