summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/originalitemarray.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
commit169dff19d4da8d76e69b8e896aa25b0013639c03 (patch)
treea0c070fa95188b5cde708ac285e6a2db9df4a83f /src/live_effects/parameter/originalitemarray.cpp
parentAvoid creating a new document before opening an old document. (diff)
downloadinkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.tar.gz
inkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.zip
modernize loops
Diffstat (limited to '')
-rw-r--r--src/live_effects/parameter/originalitemarray.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index 8182b0d9c..1b826c888 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -293,8 +293,7 @@ OriginalItemArrayParam::on_link_button_click()
}
os << (*iter)->href << "," << ((*iter)->actived ? "1" : "0");
}
- for (auto i=itemsid.begin();i!=itemsid.end();++i) {
- Glib::ustring itemid = *i;
+ for (auto itemid : itemsid) {
// add '#' at start to make it an uri.
itemid.insert(itemid.begin(), '#');
@@ -423,13 +422,13 @@ gchar * OriginalItemArrayParam::param_getSVGValue() const
{
Inkscape::SVGOStringStream os;
bool foundOne = false;
- for (std::vector<ItemAndActive*>::const_iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
+ for (auto iter : _vector) {
if (foundOne) {
os << "|";
} else {
foundOne = true;
}
- os << (*iter)->href << "," << ((*iter)->actived ? "1" : "0");
+ os << iter->href << "," << (iter->actived ? "1" : "0");
}
return g_strdup(os.str().c_str());
}
@@ -441,9 +440,9 @@ gchar * OriginalItemArrayParam::param_getDefaultSVGValue() const
void OriginalItemArrayParam::update()
{
- for (std::vector<ItemAndActive*>::iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
- SPObject *linked_obj = (*iter)->ref.getObject();
- linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, *iter);
+ for (auto & iter : _vector) {
+ SPObject *linked_obj = iter->ref.getObject();
+ linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, iter);
}
}