summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2017-01-07 18:59:44 +0000
committerJabiertxof <jtx@jtx>2017-01-07 18:59:44 +0000
commit2a434d30cbf94a89598f6a2ae7e0c5943a245dae (patch)
tree802af1d08a550816222debbe01cbbf3bac6e8f93 /src
parentUpdate to trunk (diff)
downloadinkscape-2a434d30cbf94a89598f6a2ae7e0c5943a245dae.tar.gz
inkscape-2a434d30cbf94a89598f6a2ae7e0c5943a245dae.zip
Some naming fix and headers
(bzr r15295.1.59)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp12
-rw-r--r--src/live_effects/lpe-mirror_symmetry.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index e51812a38..a8b1e321d 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -104,7 +104,7 @@ LPEMirrorSymmetry::doAfterEffect (SPLPEItem const* lpeitem)
toMirror(m);
} else {
processObjects(LPE_ERASE);
- elements.clear();
+ items.clear();
}
}
@@ -232,8 +232,8 @@ LPEMirrorSymmetry::toMirror(Geom::Affine transform)
Inkscape::XML::Document *xml_doc = document->getReprDoc();
const char * id_origin_char = id_origin.param_getSVGValue();
const char * elemref_id = g_strdup(Glib::ustring("mirror-").append(id_origin_char).c_str());
- elements.clear();
- elements.push_back(elemref_id);
+ items.clear();
+ items.push_back(elemref_id);
SPObject *elemref= NULL;
Inkscape::XML::Node *phantom = NULL;
if (elemref = document->getObjectById(elemref_id)) {
@@ -348,8 +348,8 @@ void
LPEMirrorSymmetry::processObjects(LpeAction lpe_action)
{
SPDocument * document = SP_ACTIVE_DOCUMENT;
- for (std::vector<const char *>::iterator el_it = elements.begin();
- el_it != elements.end(); ++el_it) {
+ for (std::vector<const char *>::iterator el_it = items.begin();
+ el_it != items.end(); ++el_it) {
const char * id = *el_it;
if (!id || strlen(id) == 0) {
return;
@@ -393,7 +393,7 @@ LPEMirrorSymmetry::processObjects(LpeAction lpe_action)
}
}
if (lpe_action == LPE_ERASE || lpe_action == LPE_TO_OBJECTS) {
- elements.clear();
+ items.clear();
}
}
diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h
index 2122a41e4..5a6db5062 100644
--- a/src/live_effects/lpe-mirror_symmetry.h
+++ b/src/live_effects/lpe-mirror_symmetry.h
@@ -67,7 +67,7 @@ private:
PointParam center_point;
TextParam id_origin;
Geom::Point previous_center;
- std::vector<const char *> elements;
+ std::vector<const char *> items;
SPObject * container;
LPEMirrorSymmetry(const LPEMirrorSymmetry&);
LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&);