summaryrefslogtreecommitdiffstats
path: root/src/selection-chemistry.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2019-05-23 08:06:12 +0000
committerShlomi Fish <shlomif@shlomifish.org>2019-06-06 12:57:27 +0000
commitcb8c36249e983866378e7915e6605ef92d247923 (patch)
tree53ec0a0745250375aaeb4b5a52f821380ccb614a /src/selection-chemistry.cpp
parentCI: Avoid failure due to sorting issue (diff)
downloadinkscape-cb8c36249e983866378e7915e6605ef92d247923.tar.gz
inkscape-cb8c36249e983866378e7915e6605ef92d247923.zip
Refactoring: call setAttribute() directly.
Call this->setAttribute(...) directly instead of this->getRepr()->setAttribute(...). This avoids clutter and mental indirection. See http://wiki.inkscape.org/wiki/index.php?title=Refactoring_projects&oldid=112116 and https://en.wikipedia.org/wiki/Law_of_Demeter . --- I hereby disclaim any implicit or explicit ownership of my changes in this changeset, and put them under a multiple licence consisting of your choice of one of more of: - The CC0 / Public Domain - https://creativecommons.org/choose/zero/ . - The MIT / Expat license - https://en.wikipedia.org/wiki/MIT_License - The default licence of your project - The https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License - version 2.1 or higher - The https://en.wikipedia.org/wiki/GNU_General_Public_License - version 2 or higher - Any licence in the 2018-Aug-27 popular licenses list of https://opensource.org/licenses - The https://en.wikipedia.org/wiki/Apache_License version 2.0 or later - The https://en.wikipedia.org/wiki/Artistic_License version 2.0 or later - The https://en.wikipedia.org/wiki/ISC_license - The https://opensource.org/licenses/BSD-2-Clause Crediting me will be nice, but not mandatory, and you can change the licence of the project without needing my permission.
Diffstat (limited to 'src/selection-chemistry.cpp')
-rwxr-xr-xsrc/selection-chemistry.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index e40743635..ea9d1eace 100755
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -520,7 +520,7 @@ void ObjectSet::duplicate(bool suppressDone, bool duplicateLayer)
// we have both orig and clone in selection, relink
// std::cout << id << " old, its ori: " << orig->getId() << "; will relink:" << new_ids[i] << " to " << new_ids[j] << "\n";
SPObject *new_clone = doc->getObjectById(new_ids[i]);
- new_clone->getRepr()->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
+ new_clone->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
new_clone->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
}
}
@@ -528,7 +528,7 @@ void ObjectSet::duplicate(bool suppressDone, bool duplicateLayer)
gchar *source_href = offset->sourceHref;
for (guint j = 0; j < old_ids.size(); j++) {
if (source_href && source_href[0]=='#' && !strcmp(source_href+1, old_ids[j])) {
- doc->getObjectById(new_ids[i])->getRepr()->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
+ doc->getObjectById(new_ids[i])->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
}
}
} else if (text) {
@@ -537,7 +537,7 @@ void ObjectSet::duplicate(bool suppressDone, bool duplicateLayer)
const gchar *source_href = sp_textpath_get_path_item(textpath)->getId();
for (guint j = 0; j < old_ids.size(); j++) {
if (!strcmp(source_href, old_ids[j])) {
- doc->getObjectById(new_ids[i])->firstChild()->getRepr()->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
+ doc->getObjectById(new_ids[i])->firstChild()->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
}
}
} else if (path) {
@@ -547,10 +547,10 @@ void ObjectSet::duplicate(bool suppressDone, bool duplicateLayer)
SPObject *new_clone = doc->getObjectById(new_ids[i]);
for (guint j = 0; j < old_ids.size(); j++) {
if(old_start == Glib::ustring("#") + old_ids[j]) {
- new_clone->getRepr()->setAttribute("inkscape:connection-start", Glib::ustring("#") + new_ids[j]);
+ new_clone->setAttribute("inkscape:connection-start", Glib::ustring("#") + new_ids[j]);
}
if(old_end == Glib::ustring("#") + old_ids[j]) {
- new_clone->getRepr()->setAttribute("inkscape:connection-end", Glib::ustring("#") + new_ids[j]);
+ new_clone->setAttribute("inkscape:connection-end", Glib::ustring("#") + new_ids[j]);
}
}
}
@@ -2666,7 +2666,7 @@ void ObjectSet::relink()
SPItem *item = *i;
if (dynamic_cast<SPUse *>(item)) {
- item->getRepr()->setAttribute("xlink:href", newref);
+ item->setAttribute("xlink:href", newref);
item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
relinked = true;
}
@@ -4150,7 +4150,7 @@ void ObjectSet::unsetMask(const bool apply_clip_path, const bool skip_undo) {
}
}
- (*i)->getRepr()->setAttribute(attributeName, "none");
+ (*i)->setAttribute(attributeName, "none");
SPGroup *group = dynamic_cast<SPGroup *>(*i);
if (ungroup_masked && group) {