summaryrefslogtreecommitdiffstats
path: root/src/sp-filter-primitive.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-filter-primitive.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-filter-primitive.cpp')
-rw-r--r--src/sp-filter-primitive.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index b18850914..0fbeed15b 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -14,20 +14,16 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
#endif
#include <string.h>
#include "display/nr-filter-primitive.h"
-#include "display/nr-filter-types.h"
#include "attributes.h"
#include "style.h"
#include "sp-filter-primitive.h"
-#include "xml/repr.h"
-#include "sp-filter.h"
-#include "sp-item.h"
// CPPIFY: Make pure virtual.
@@ -246,8 +242,10 @@ int sp_filter_primitive_read_result(SPFilterPrimitive *prim, gchar const *name)
*/
int sp_filter_primitive_name_previous_out(SPFilterPrimitive *prim) {
SPFilter *parent = SP_FILTER(prim->parent);
- SPObject *i = parent->children;
- while (i && i->next != prim) i = i->next;
+ SPObject *i = parent->firstChild();
+ while (i && i->getNext() != prim) {
+ i = i->getNext();
+ }
if (i) {
SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
if (i_prim->image_out < 0) {