5. Refactoring of Application class: make copy/assignment operators private, disallow pointers to Application

(bzr r13341.5.9)

1 files changed, 45 insertions, 65 deletions

diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 08344d9b2..8feb5b994 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -58,15 +58,15 @@ public:
 #endif
 
     static void sizeAllocate(GtkWidget *widget, GtkAllocation *allocation);
-    static void modifySelectionCB(Application *inkscape, Selection *selection, guint flags, SPWidget *spw);
-    static void changeSelectionCB(Application *inkscape, Selection *selection, SPWidget *spw);
-    static void setSelectionCB(Application *inkscape, Selection *selection, SPWidget *spw);
+    static void modifySelectionCB(Selection *selection, guint flags, SPWidget *spw);
+    static void changeSelectionCB(Selection *selection, SPWidget *spw);
+    static void setSelectionCB(Selection *selection, SPWidget *spw);
 
-    static GtkWidget *constructGlobal(SPWidget *spw, Inkscape::Application *inkscape);
+    static GtkWidget *constructGlobal(SPWidget *spw);
 
-    void modifySelection(Application *inkscape, Selection *selection, guint flags);
-    void changeSelection(Application *inkscape, Selection *selection);
-    void setSelection(Application *inkscape, Selection *selection);
+    void modifySelection(Selection *selection, guint flags);
+    void changeSelection(Selection *selection);
+    void setSelection(Selection *selection);
 
 private:
     static GtkBinClass *parentClass;
@@ -172,8 +172,6 @@ void SPWidgetImpl::classInit(SPWidgetClass *klass)
 
 void SPWidgetImpl::init(SPWidget *spw)
 {
-    spw->inkscape = NULL;
-
     spw->_impl = new SPWidgetImpl(*spw); // ctor invoked after all other init
 }
 
@@ -181,21 +179,12 @@ void SPWidgetImpl::dispose(GObject *object)
 {
     SPWidget *spw = reinterpret_cast<SPWidget *>(object);
 
-    if (spw->inkscape) {
-        // Disconnect signals
-
-        // the checks are necessary because when destroy is caused by the program shutting down,
-        // the inkscape object may already be (partly?) invalid --bb
-        if (dynamic_cast<Inkscape::Application *>(spw->inkscape)) {
-            spw->selModified.disconnect();
-            spw->selChanged.disconnect();
-            spw->selSet.disconnect();            
-        }
-        //if (G_IS_OBJECT(spw->inkscape) && G_OBJECT_GET_CLASS(spw->inkscape)) {
-            //sp_signal_disconnect_by_data(spw->inkscape, spw);
-        //}
-        spw->inkscape = NULL;
-    }
+    // Disconnect signals
+    if (Application::exists()) {
+        spw->selModified.disconnect();
+        spw->selChanged.disconnect();
+        spw->selSet.disconnect();
+    }            
 
     delete spw->_impl;
     spw->_impl = 0;
@@ -209,23 +198,20 @@ void SPWidgetImpl::show(GtkWidget *widget)
 {
     SPWidget *spw = SP_WIDGET(widget);
 
-    if (spw->inkscape) {
+    if (Application::exists()) {
         // Connect signals
-        spw->selModified = spw->inkscape->signal_selection_modified.connect(
-                sigc::bind<0>(
+        spw->selModified = INKSCAPE.signal_selection_modified.connect(
                 sigc::bind(
-                sigc::ptr_fun(SPWidgetImpl::modifySelectionCB), spw), spw->inkscape
-        ));
-        spw->selChanged = spw->inkscape->signal_selection_changed.connect(
-                sigc::bind<0>(
+                sigc::ptr_fun(SPWidgetImpl::modifySelectionCB), spw)
+        );
+        spw->selChanged = INKSCAPE.signal_selection_changed.connect(
                 sigc::bind(
-                sigc::ptr_fun(SPWidgetImpl::changeSelectionCB), spw), spw->inkscape
-        ));
-        spw->selSet = spw->inkscape->signal_selection_set.connect(
-                sigc::bind<0>(
+                sigc::ptr_fun(SPWidgetImpl::changeSelectionCB), spw)
+        );
+        spw->selSet = INKSCAPE.signal_selection_set.connect(
                 sigc::bind(
-                sigc::ptr_fun(SPWidgetImpl::setSelectionCB), spw), spw->inkscape
-        ));
+                sigc::ptr_fun(SPWidgetImpl::setSelectionCB), spw)
+        );
     }
 
     if (reinterpret_cast<GtkWidgetClass *>(parentClass)->show) {
@@ -237,7 +223,7 @@ void SPWidgetImpl::hide(GtkWidget *widget)
 {
     SPWidget *spw = SP_WIDGET (widget);
 
-    if (spw->inkscape) {
+    if (Application::exists()) {
         // Disconnect signals
         spw->selModified.disconnect();
         spw->selChanged.disconnect();
@@ -313,27 +299,21 @@ void SPWidgetImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation)
     }
 }
 
-GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw, Inkscape::Application *inkscape)
+GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw)
 {
-    g_return_val_if_fail(!spw->inkscape, NULL);
-
-    spw->inkscape = inkscape;
     if (gtk_widget_get_visible(GTK_WIDGET(spw))) {
-        spw->selModified = spw->inkscape->signal_selection_modified.connect(
-                sigc::bind<0>(
+        spw->selModified = INKSCAPE.signal_selection_modified.connect(
                 sigc::bind(
-                sigc::ptr_fun(SPWidgetImpl::modifySelectionCB), spw), spw->inkscape
-        ));
-        spw->selChanged = spw->inkscape->signal_selection_changed.connect(
-                sigc::bind<0>(
+                sigc::ptr_fun(SPWidgetImpl::modifySelectionCB), spw)
+        );
+        spw->selChanged = INKSCAPE.signal_selection_changed.connect(
                 sigc::bind(
-                sigc::ptr_fun(SPWidgetImpl::changeSelectionCB), spw), spw->inkscape
-        ));
-        spw->selSet = spw->inkscape->signal_selection_set.connect(
-                sigc::bind<0>(
+                sigc::ptr_fun(SPWidgetImpl::changeSelectionCB), spw)
+        );
+        spw->selSet = INKSCAPE.signal_selection_set.connect(
                 sigc::bind(
-                sigc::ptr_fun(SPWidgetImpl::setSelectionCB), spw), spw->inkscape
-        ));
+                sigc::ptr_fun(SPWidgetImpl::setSelectionCB), spw)
+        );
     }
 
     g_signal_emit(spw, signals[CONSTRUCT], 0);
@@ -341,32 +321,32 @@ GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw, Inkscape::Application *i
     return GTK_WIDGET(spw);
 }
 
-void SPWidgetImpl::modifySelectionCB(Application *inkscape, Selection *selection, guint flags, SPWidget *spw)
+void SPWidgetImpl::modifySelectionCB(Selection *selection, guint flags, SPWidget *spw)
 {
-    spw->_impl->modifySelection(inkscape, selection, flags);
+    spw->_impl->modifySelection(selection, flags);
 }
 
-void SPWidgetImpl::changeSelectionCB(Application *inkscape, Selection *selection, SPWidget *spw)
+void SPWidgetImpl::changeSelectionCB(Selection *selection, SPWidget *spw)
 {
-    spw->_impl->changeSelection(inkscape, selection);
+    spw->_impl->changeSelection(selection);
 }
 
-void SPWidgetImpl::setSelectionCB(Application *inkscape, Selection *selection, SPWidget *spw)
+void SPWidgetImpl::setSelectionCB(Selection *selection, SPWidget *spw)
 {
-    spw->_impl->setSelection(inkscape, selection);
+    spw->_impl->setSelection(selection);
 }
 
-void SPWidgetImpl::modifySelection(Application * /*inkscape*/, Selection *selection, guint flags)
+void SPWidgetImpl::modifySelection(Selection *selection, guint flags)
 {
     g_signal_emit(&_target, signals[MODIFY_SELECTION], 0, selection, flags);
 }
 
-void SPWidgetImpl::changeSelection(Application * /*inkscape*/, Selection *selection)
+void SPWidgetImpl::changeSelection(Selection *selection)
 {
     g_signal_emit(&_target, signals[CHANGE_SELECTION], 0, selection);
 }
 
-void SPWidgetImpl::setSelection(Application * /*inkscape*/, Selection *selection)
+void SPWidgetImpl::setSelection(Selection *selection)
 {
     // Emit "set_selection" signal
     g_signal_emit(&_target, signals[SET_SELECTION], 0, selection);
@@ -377,11 +357,11 @@ void SPWidgetImpl::setSelection(Application * /*inkscape*/, Selection *selection
 
 // Methods
 
-GtkWidget *sp_widget_new_global(Inkscape::Application *inkscape)
+GtkWidget *sp_widget_new_global()
 {
     SPWidget *spw = reinterpret_cast<SPWidget*>(g_object_new(SP_TYPE_WIDGET, NULL));
 
-    if (!SPWidgetImpl::constructGlobal(spw, inkscape)) {
+    if (!SPWidgetImpl::constructGlobal(spw)) {
         g_object_unref(spw);
         spw = 0;
     }