Patch by Daniel_J for 522327

diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index 022de409055cb0725e1a064b215cc3757dce3d5f..6afa07d773721f0c0febe39b360809ea5c1523a3 100644 (file)
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -749,7 +749,7 @@ set_to_accumulated(SPEraserContext *dc)
                 if ( eraserMode ) {
                     toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
                 } else {
-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
                     toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
                 }
                 toWorkOn = g_slist_remove( toWorkOn, acid );

diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index 7cb671f51c67722ae8861f6507cc78276f5bbf0e..89afca1331a6308de07d6f93d054073993978fe3 100644 (file)
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -161,7 +161,7 @@ Filter::filters_load_node (Inkscape::XML::Node * node, gchar * menuname)
        mywriter writer;
        sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
 
-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
+    Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
        g_free(xml_str);
     return;
 }

diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 30e622507b56c2640148f38a56db783e1836db91..c2d80b28b4e02dc0d9e235e2d186dc4c2914fcbb 100644 (file)
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -219,7 +219,7 @@ Filter::filter_init (gchar const * id, gchar const * name, gchar const * submenu
                 "<menu-tip>%s</menu-tip>\n"
             "</effect>\n"
         "</inkscape-extension>\n", name, id, submenu, tip);
-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
+    Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
        g_free(xml_str);
     return;
 }

diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 7b622338480a85124c78052ed2f9f4c0c68029b3..612ae1cfc6cbceef49f8b34e0b2b53d2d88cf6cb 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -900,7 +900,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
     if (is_point_fill) {
         fill_points.push_back(Geom::Point(event->button.x, event->button.y));
     } else {
-        Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
+        Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
         fill_points = r->getPoints();
     }
 
@@ -1206,7 +1206,7 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
 
     case GDK_BUTTON_RELEASE:
         if (event->button.button == 1 && !event_context->space_panning) {
-            Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
+            Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
             if (r->is_started()) {
                 // set "busy" cursor
                 desktop->setWaitingCursor();

diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index ed20f9b619e79b5cc090b074d41f61cff0015839..ddb153ffd927477a88fcb42505f8f362d18924f0 100644 (file)
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -650,7 +650,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 if (!event_context->within_tolerance) {
                     // we've been dragging, either do nothing (grdrag handles that),
                     // or rubberband-select if we have rubberband
-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
                     if (r->is_started() && !event_context->within_tolerance) {
                         // this was a rubberband drag
                         if (r->getMode() == RUBBERBAND_MODE_RECT) {

diff --git a/src/select-context.cpp b/src/select-context.cpp
index a9e1ff62318bd0e381bd5eaa3112260471fdda52..028c8634b62435475a926670ec97082a881c66f7 100644 (file)
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -608,7 +608,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     }
                     sc->item = NULL;
                 } else {
-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
                     if (r->is_started() && !within_tolerance) {
                         // this was a rubberband drag
                         GSList *items = NULL;