Merged gsoc work. Created better data structure for selections, replaced SPObject children list, improved spray tool, split tests to separate executables

(bzr r15047)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index ed88432f1..0c5f3cf47 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -335,13 +335,13 @@ unsigned long sp_gradient_to_hhssll(SPGradient *gr)
 
 static GSList *get_all_doc_items(GSList *list, SPObject *from, bool onlyvisible, bool onlysensitive, bool ingroups, GSList const *exclude)
 {
-    for ( SPObject *child = from->firstChild() ; child; child = child->getNext() ) {
-        if (SP_IS_ITEM(child)) {
-            list = g_slist_prepend(list, SP_ITEM(child));
+    for (auto& child: from->children) {
+        if (SP_IS_ITEM(&child)) {
+            list = g_slist_prepend(list, SP_ITEM(&child));
         }
 
-        if (ingroups || SP_IS_ITEM(child)) {
-            list = get_all_doc_items(list, child, onlyvisible, onlysensitive, ingroups, exclude);
+        if (ingroups || SP_IS_ITEM(&child)) {
+            list = get_all_doc_items(list, &child, onlyvisible, onlysensitive, ingroups, exclude);
         }
     }
 
@@ -489,10 +489,10 @@ static void verify_grad(SPGradient *gradient)
     int i = 0;
     SPStop *stop = NULL;
     /* count stops */
-    for ( SPObject *ochild = gradient->firstChild() ; ochild ; ochild = ochild->getNext() ) {
-        if (SP_IS_STOP(ochild)) {
+    for (auto& ochild: gradient->children) {
+        if (SP_IS_STOP(&ochild)) {
             i++;
-            stop = SP_STOP(ochild);
+            stop = SP_STOP(&ochild);
         }
     }
 
@@ -532,9 +532,9 @@ static void select_stop_in_list( GtkWidget *vb, SPGradient *gradient, SPStop *ne
     GtkWidget *combo_box = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(vb), "combo_box"));
 
     int i = 0;
-    for ( SPObject *ochild = gradient->firstChild() ; ochild ; ochild = ochild->getNext() ) {
-        if (SP_IS_STOP(ochild)) {
-            if (ochild == new_stop) {
+    for (auto& ochild: gradient->children) {
+        if (SP_IS_STOP(&ochild)) {
+            if (&ochild == new_stop) {
                 gtk_combo_box_set_active (GTK_COMBO_BOX(combo_box) , i);
                 break;
             }
@@ -567,9 +567,9 @@ static void update_stop_list( GtkWidget *vb, SPGradient *gradient, SPStop *new_s
     /* Populate the combobox store */
     GSList *sl = NULL;
     if ( gradient->hasStops() ) {
-        for ( SPObject *ochild = gradient->firstChild() ; ochild ; ochild = ochild->getNext() ) {
-            if (SP_IS_STOP(ochild)) {
-                sl = g_slist_append(sl, ochild);
+        for (auto& ochild: gradient->children) {
+            if (SP_IS_STOP(&ochild)) {
+                sl = g_slist_append(sl, &ochild);
             }
         }
     }