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

(bzr r13341.5.9)

5 files changed, 6 insertions, 6 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index d0a168a14..e622ca420 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -356,7 +356,7 @@ void
 Effect::doAcceptPathPreparations(SPLPEItem *lpeitem)
 {
     // switch to pen context
-    SPDesktop *desktop = inkscape_active_desktop(); // TODO: Is there a better method to find the item's desktop?
+    SPDesktop *desktop = INKSCAPE.active_desktop(); // TODO: Is there a better method to find the item's desktop?
     if (!tools_isactive(desktop, TOOLS_FREEHAND_PEN)) {
         tools_switch(desktop, TOOLS_FREEHAND_PEN);
     }
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index b19b697c0..247496167 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -392,7 +392,7 @@ void LPEBSpline::toMakeCusp(Gtk::Widget *widgWeight) {
 void LPEBSpline::toWeight() { changeWeight(weight); }
 
 void LPEBSpline::changeWeight(double weightValue) {
-  SPDesktop *desktop = inkscape_active_desktop();
+  SPDesktop *desktop = INKSCAPE.active_desktop();
   Inkscape::Selection *selection = sp_desktop_selection(desktop);
   GSList *items = (GSList *)selection->itemList();
   SPItem *item = (SPItem *)g_slist_nth(items, 0)->data;
@@ -432,7 +432,7 @@ bool LPEBSpline::nodeIsSelected(Geom::Point nodePoint) {
 void LPEBSpline::doBSplineFromWidget(SPCurve *curve, double weightValue) {
   using Geom::X;
   using Geom::Y;
-  SPDesktop *desktop = inkscape_active_desktop();
+  SPDesktop *desktop = INKSCAPE.active_desktop();
   if (INK_IS_NODE_TOOL(desktop->event_context)) {
     Inkscape::UI::Tools::NodeTool *nt = INK_NODE_TOOL(desktop->event_context);
     Inkscape::UI::ControlPointSelection::Set &selection =
diff --git a/src/live_effects/lpe-envelope-perspective.cpp b/src/live_effects/lpe-envelope-perspective.cpp
index bfd6e56d7..a16ed7ab5 100644
--- a/src/live_effects/lpe-envelope-perspective.cpp
+++ b/src/live_effects/lpe-envelope-perspective.cpp
@@ -352,7 +352,7 @@ LPEEnvelopePerspective::resetGrid()
     Down_Left_Point.param_set_and_write_default();
     //todo:this hack is only to reposition the knots on reser grid button
     //Better update path effect in LPEITEM
-    SPDesktop * desktop = inkscape_active_desktop();
+    SPDesktop * desktop = INKSCAPE.active_desktop();
     tools_switch(desktop, TOOLS_SELECT);
     tools_switch(desktop, TOOLS_NODES);
 }
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index db609c9e1..13759f126 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -391,7 +391,7 @@ LPELattice2::resetGrid()
     grid_point32x33x34x35.param_set_and_write_default();
     //todo:this hack is only to reposition the knots on reser grid button
     //Better update path effect in LPEITEM
-    SPDesktop * desktop = inkscape_active_desktop();
+    SPDesktop * desktop = INKSCAPE.active_desktop();
     tools_switch(desktop, TOOLS_SELECT);
     tools_switch(desktop, TOOLS_NODES);
 }
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index fcb2fc9fc..88fc27abd 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -32,7 +32,7 @@ TextParam::TextParam( const Glib::ustring& label, const Glib::ustring& tip,
       value(default_value),
       defvalue(default_value)
 {
-    SPDesktop *desktop = inkscape_active_desktop(); // FIXME: we shouldn't use this!
+    SPDesktop *desktop = INKSCAPE.active_desktop(); // FIXME: we shouldn't use this!
     canvas_text = (SPCanvasText *) sp_canvastext_new(sp_desktop_tempgroup(desktop), desktop, Geom::Point(0,0), "");
     sp_canvastext_set_text (canvas_text, default_value.c_str());
     sp_canvastext_set_coords (canvas_text, 0, 0);