Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / ui / dialog / livepatheffect-editor.cpp

diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index d05790b3e66b291b999de709a67fc254695719f9..bf60fe059471b7d465bdc839426dc09b4758a4d4 100644 (file)
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -5,6 +5,7 @@
  *   Johan Engelen <j.b.c.engelen@utwente.nl>
  *   Steren Giannini <steren.giannini@gmail.com>
  *   Bastien Bouclet <bgkweb@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2007 Authors
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
@@ -299,6 +300,10 @@ LivePathEffectEditor::effect_list_reload(SPLPEItem *lpeitem)
     PathEffectList::iterator it;
     for( it = effectlist.begin() ; it!=effectlist.end(); it++ )
     {
+        if ( !(*it)->lpeobject ) {
+            continue;
+        }
+
         if ((*it)->lpeobject->get_lpe()) {
             Gtk::TreeModel::Row row = *(effectlist_store->append());
             row[columns.col_name] = (*it)->lpeobject->get_lpe()->getName();
@@ -372,8 +377,8 @@ LivePathEffectEditor::onApply()
 
             LivePathEffect::Effect::createAndApply(data->key.c_str(), doc, item);
 
-            SPDocumentUndo::done(doc, SP_VERB_DIALOG_LIVE_PATH_EFFECT,
-                     _("Create and apply path effect"));
+            DocumentUndo::done(doc, SP_VERB_DIALOG_LIVE_PATH_EFFECT,
+                               _("Create and apply path effect"));
 
             lpe_list_locked = false;
             onSelectionChanged(sel);
@@ -390,8 +395,8 @@ LivePathEffectEditor::onRemove()
         if ( item && SP_IS_LPE_ITEM(item) ) {
             sp_lpe_item_remove_current_path_effect(SP_LPE_ITEM(item), false);
 
-            SPDocumentUndo::done ( sp_desktop_document (current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
-                               _("Remove path effect") );
+            DocumentUndo::done( sp_desktop_document(current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
+                                _("Remove path effect") );
 
             effect_list_reload(SP_LPE_ITEM(item));
         }
@@ -406,8 +411,8 @@ void LivePathEffectEditor::onUp()
         if ( item && SP_IS_LPE_ITEM(item) ) {
             sp_lpe_item_up_current_path_effect(SP_LPE_ITEM(item));
 
-            SPDocumentUndo::done ( sp_desktop_document (current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
-                               _("Move path effect up") );
+            DocumentUndo::done( sp_desktop_document(current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
+                                _("Move path effect up") );
 
             effect_list_reload(SP_LPE_ITEM(item));
         }
@@ -422,8 +427,8 @@ void LivePathEffectEditor::onDown()
         if ( item && SP_IS_LPE_ITEM(item) ) {
             sp_lpe_item_down_current_path_effect(SP_LPE_ITEM(item));
 
-            SPDocumentUndo::done ( sp_desktop_document (current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
-                               _("Move path effect down") );
+            DocumentUndo::done( sp_desktop_document(current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
+                                _("Move path effect down") );
 
             effect_list_reload(SP_LPE_ITEM(item));
         }
@@ -461,8 +466,8 @@ void LivePathEffectEditor::on_visibility_toggled( Glib::ustring const& str )
         /* FIXME: this explicit writing to SVG is wrong. The lpe_item should have a method to disable/enable an effect within its stack.
          * So one can call:  lpe_item->setActive(lpeobjref->lpeobject); */
         lpeobjref->lpeobject->get_lpe()->getRepr()->setAttribute("is_visible", newValue ? "true" : "false");
-        SPDocumentUndo::done( sp_desktop_document(current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
-                          newValue ? _("Activate path effect") : _("Deactivate path effect"));
+        DocumentUndo::done( sp_desktop_document(current_desktop), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
+                            newValue ? _("Activate path effect") : _("Deactivate path effect"));
     }
 }
 
@@ -479,4 +484,4 @@ void LivePathEffectEditor::on_visibility_toggled( Glib::ustring const& str )
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :