more vectorization, this time in bluredge

diff --git a/ChangeLog b/ChangeLog
index 3a1be5f51cb07e69bba726ffe2620be0f118f67a..d267a6fa494ac4c28ccac50667d4a05282564c12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 2006-05-08  MenTaLguY  <mental@rydia.net>
 
-       * src/streams-zlib.cpp, src/streams-jar.cpp, src/splivarot.cpp:
+       * src/streams-zlib.cpp, src/streams-jar.cpp, src/splivarot.cpp,
+         src/extension/internal/bluredge.cpp:
 
          use std::vector rather than dynamically-sized automatic arrays,
-         plus cleanups and minor fixes
+         plus cleanups and minor fixes, and dead code removal
 
 2006-05-08  MenTaLguY  <mental@rydia.net>
 

diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 29036df7a86b38f8ecc05f9c03a32257f7de873c..678e492ee414257cf36f5582e42b990323da6143 100644 (file)
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -12,6 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <vector>
 #include "desktop.h"
 #include "selection.h"
 #include "helper/action.h"
@@ -65,16 +66,13 @@ BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View
     items.insert<GSListConstIterator<SPItem *> >(items.end(), selection->itemList(), NULL);
     selection->clear();
 
-    std::list<SPItem *> new_items;
     for(std::list<SPItem *>::iterator item = items.begin();
             item != items.end(); item++) {
         SPItem * spitem = *item;
 
-        Inkscape::XML::Node * new_items[steps];
+        std::vector<Inkscape::XML::Node *> new_items(steps);
         Inkscape::XML::Node * new_group = sp_repr_new("svg:g");
         (SP_OBJECT_REPR(spitem)->parent())->appendChild(new_group);
-        /** \todo  Need to figure out how to get from XML::Node to SPItem */
-        /* new_items.push_back(); */
 
         double orig_opacity = sp_repr_css_double_property(sp_repr_css_attr(SP_OBJECT_REPR(spitem), "style"), "opacity", 1.0);
         char opacity_string[64];
@@ -99,8 +97,7 @@ BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View
                 offset *= -1.0;
                 prefs_set_double_attribute("options.defaultoffsetwidth", "value", offset);
                 sp_action_perform(Inkscape::Verb::get(SP_VERB_SELECTION_INSET)->get_action(document), NULL);
-            } else if (offset == 0.0) {
-            } else {
+            } else if (offset > 0.0) {
                 prefs_set_double_attribute("options.defaultoffsetwidth", "value", offset);
                 sp_action_perform(Inkscape::Verb::get(SP_VERB_SELECTION_OFFSET)->get_action(document), NULL);
             }
@@ -114,7 +111,6 @@ BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View
 
     selection->clear();
     selection->add(items.begin(), items.end());
-    selection->add(new_items.begin(), new_items.end());
 
     return;
 }