add test for config

[inkscape.git] / src / star-context.cpp

diff --git a/src/star-context.cpp b/src/star-context.cpp
index bee392863d6764d732bb29b09dab06b82a7909d5..cc3d56a113caabd41f45d3b6f445a1a1bab09c77 100644 (file)
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -187,7 +187,6 @@ sp_star_context_selection_changed (Inkscape::Selection * selection, gpointer dat
             ec->shape_repr = shape_repr;
             Inkscape::GC::anchor(shape_repr);
             sp_repr_add_listener (shape_repr, &ec_shape_repr_events, ec);
-            sp_repr_synthesize_events (shape_repr, &ec_shape_repr_events, ec);
         }
     }
 }
@@ -206,7 +205,7 @@ sp_star_context_setup (SPEventContext *ec)
     sp_event_context_read (ec, "rounded");
     sp_event_context_read (ec, "randomized");
 
-    Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop);
+    Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
 
     SPItem *item = selection->singleItem();
         if (item) {
@@ -216,7 +215,6 @@ sp_star_context_setup (SPEventContext *ec)
                 ec->shape_repr = shape_repr;
                 Inkscape::GC::anchor(shape_repr);
                 sp_repr_add_listener (shape_repr, &ec_shape_repr_events, ec);
-                sp_repr_synthesize_events (shape_repr, &ec_shape_repr_events, ec);
             }
         }
 
@@ -253,7 +251,7 @@ sp_star_context_set (SPEventContext *ec, const gchar *key, const gchar *val)
         sc->rounded = (val) ? g_ascii_strtod (val, NULL) : 0.0;
     } else if (!strcmp (key, "randomized")) {
         sc->randomized = (val) ? g_ascii_strtod (val, NULL) : 0.0;
-    }    
+    }
 }
 
 static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent *event)
@@ -261,7 +259,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
     static gboolean dragging;
 
     SPDesktop *desktop = event_context->desktop;
-    Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+    Inkscape::Selection *selection = sp_desktop_selection (desktop);
 
     SPStarContext *sc = SP_STAR_CONTEXT (event_context);
 
@@ -272,12 +270,12 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
     switch (event->type) {
     case GDK_BUTTON_PRESS:
         if (event->button.button == 1) {
-            
+
             dragging = TRUE;
 
             sc->center = Inkscape::setup_for_drag_start(desktop, event_context, event);
-            
-            SnapManager const m(desktop->namedview);
+
+            SnapManager const &m = desktop->namedview->snap_manager;
             sc->center = m.freeSnap(Inkscape::Snapper::SNAP_POINT, sc->center, sc->item).getPoint();
 
             sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
@@ -360,7 +358,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
             }
             break;
         case GDK_Escape:
-            SP_DT_SELECTION(desktop)->clear();
+            sp_desktop_selection(desktop)->clear();
             //TODO: make dragging escapable by Esc
         default:
             break;
@@ -423,7 +421,7 @@ static void sp_star_drag(SPStarContext *sc, NR::Point p, guint state)
     NR::Point p1 = sp_desktop_dt2root_xy_point(desktop, p);
 
     /* Snap corner point with no constraints */
-    SnapManager const m(desktop->namedview);;
+    SnapManager const &m = desktop->namedview->snap_manager;
     p1 = m.freeSnap(Inkscape::Snapper::SNAP_POINT, p1, sc->item).getPoint();
 
     SPStar *star = SP_STAR(sc->item);
@@ -432,7 +430,7 @@ static void sp_star_drag(SPStarContext *sc, NR::Point p, guint state)
     NR::Point const d = p1 - p0;
     NR::Coord const r1 = NR::L2(d);
     double arg1 = atan2(d);
-    
+
     if (state & GDK_CONTROL_MASK) {
         /* Snap angle */
         arg1 = sp_round(arg1, M_PI / snaps);
@@ -448,7 +446,7 @@ static void sp_star_drag(SPStarContext *sc, NR::Point p, guint state)
                                  _("<b>Polygon</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle")
                                  : _("<b>Star</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle") ),
                                rads->str, sp_round((arg1) * 180 / M_PI, 0.0001));
-    
+
     g_string_free(rads, FALSE);
 }
 
@@ -465,8 +463,8 @@ sp_star_finish (SPStarContext * sc)
 
         object->updateRepr(NULL, SP_OBJECT_WRITE_EXT);
 
-        SP_DT_SELECTION(desktop)->set(sc->item);
-        sp_document_done(SP_DT_DOCUMENT(desktop));
+        sp_desktop_selection(desktop)->set(sc->item);
+        sp_document_done(sp_desktop_document(desktop));
 
         sc->item = NULL;
     }