summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 01:17:35 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 01:17:35 +0000
commitbc776cf2ee8744fb0b49cb3ef9f53e835515624b (patch)
treee7ce49e8b4a222bcb57ec45f003e50a57fa9e233
parentMerge branch 'master' into menuInverseClipMask (diff)
downloadinkscape-bc776cf2ee8744fb0b49cb3ef9f53e835515624b.tar.gz
inkscape-bc776cf2ee8744fb0b49cb3ef9f53e835515624b.zip
Rename wrong named function
-rw-r--r--src/live_effects/lpe-powermask.cpp2
-rw-r--r--src/verbs.cpp6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp
index b7c88584b..396a3b3ca 100644
--- a/src/live_effects/lpe-powermask.cpp
+++ b/src/live_effects/lpe-powermask.cpp
@@ -303,7 +303,7 @@ LPEPowerMask::doOnRemove (SPLPEItem const* lpeitem)
}
}
-void sp_inverse_powerclip(Inkscape::Selection *sel) {
+void sp_inverse_powermask(Inkscape::Selection *sel) {
if (!sel->isEmpty()) {
auto selList = sel->items();
for(auto i = boost::rbegin(selList); i != boost::rend(selList); ++i) {
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 27fc29dd4..d0975af16 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1597,8 +1597,7 @@ void ObjectVerb::perform( SPAction *action, void *data)
break;
case SP_VERB_OBJECT_SET_INVERSE_MASK:
sel->setMask(false, false);
- using Inkscape::LivePathEffect;
- sp_inverse_powermask(sp_action_get_selection(action));
+ Inkscape::LivePathEffect::sp_inverse_powermask(sp_action_get_selection(action));
break;
case SP_VERB_OBJECT_EDIT_MASK:
sel->editMask(false);
@@ -1611,8 +1610,7 @@ void ObjectVerb::perform( SPAction *action, void *data)
break;
case SP_VERB_OBJECT_SET_INVERSE_CLIPPATH:
sel->setMask(true, false);
- using Inkscape::LivePathEffect;
- sp_inverse_powerclip(sp_action_get_selection(action));
+ Inkscape::LivePathEffect::sp_inverse_powerclip(sp_action_get_selection(action));
break;
case SP_VERB_OBJECT_CREATE_CLIP_GROUP:
sel->setClipGroup();