From d1947e768272c703674129d5c583204ff2b59251 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 13 Jul 2016 13:36:19 +0200 Subject: Second part of new SPObject children list (bzr r14954.1.19) --- src/sp-tref.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index ba592058b..66866c9f7 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -506,9 +506,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) { -- cgit v1.2.3 From 24d3f50003ca3cec6a03a7f5267cc4fe5588c69f Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 14 Jul 2016 13:17:21 +0200 Subject: Renamed children list in SPObject (bzr r14954.1.21) --- src/sp-tref.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 66866c9f7..48e2b41f6 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -506,7 +506,7 @@ sp_tref_convert_to_tspan(SPObject *obj) //////////////////// else { GSList *l = NULL; - for (auto& child: obj->_children) { + for (auto& child: obj->children) { sp_object_ref(&child, obj); l = g_slist_prepend (l, &child); } -- cgit v1.2.3 From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/sp-tref.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index ba592058b..20bfc8cd0 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 -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/sp-tref.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 20bfc8cd0..ba592058b 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -22,9 +22,14 @@ #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 -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/sp-tref.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index ba592058b..20bfc8cd0 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 -- cgit v1.2.3 From 349536d49558ec5841e799eb33a4cbbb3fa9722d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 5 Feb 2017 16:04:35 +0000 Subject: Fix C++11 errors and warnings with g++-7 Fixed bugs: - https://launchpad.net/bugs/1660992 (bzr r15477) --- src/sp-tref.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index e25ddb5a4..014876478 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -16,13 +16,15 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "sp-tref.h" + #include +#include "bad-uri-exception.h" #include "attributes.h" #include "document.h" #include "sp-factory.h" #include "sp-text.h" -#include "sp-tref.h" #include "style.h" #include "text-editing.h" -- cgit v1.2.3