summaryrefslogtreecommitdiffstats
path: root/src/sp-tref.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
committerTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
commitff848ebc9919d158c3ec3d7420e72b6aca99a3ea (patch)
tree030ab171865d0ed7f6bae3ef68315639cdb2622b /src/sp-tref.cpp
parentMerging 0.92.x branch (diff)
parentCloneTiler: Further C++ification (diff)
downloadinkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.tar.gz
inkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.zip
Merge trunk
(bzr r14950.1.20)
Diffstat (limited to 'src/sp-tref.cpp')
-rw-r--r--src/sp-tref.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp
index ba592058b..e25ddb5a4 100644
--- a/src/sp-tref.cpp
+++ b/src/sp-tref.cpp
@@ -22,14 +22,9 @@
#include "document.h"
#include "sp-factory.h"
#include "sp-text.h"
-#include "sp-tspan.h"
#include "sp-tref.h"
#include "style.h"
#include "text-editing.h"
-#include "uri.h"
-
-#include "xml/node.h"
-#include "xml/repr.h"
//#define DEBUG_TREF
#ifdef DEBUG_TREF
@@ -506,9 +501,9 @@ sp_tref_convert_to_tspan(SPObject *obj)
////////////////////
else {
GSList *l = NULL;
- for (SPObject *child = obj->firstChild() ; child != NULL ; child = child->getNext() ) {
- sp_object_ref(child, obj);
- l = g_slist_prepend (l, child);
+ for (auto& child: obj->children) {
+ sp_object_ref(&child, obj);
+ l = g_slist_prepend (l, &child);
}
l = g_slist_reverse (l);
while (l) {