[glom] LayoutGroup: Correct the get_items_recursive_with_groups() implementaiton.



commit 21c24f04f7f7186baf8a097c448eefb10b2b03e8
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Dec 12 10:40:20 2011 +0100

    LayoutGroup: Correct the get_items_recursive_with_groups() implementaiton.
    
    * glom/libglom/data_structure/layout/layoutgroup.cc: Call the correct
    method recursively. This fixes make check.

 ChangeLog                                         |    7 +++++++
 glom/libglom/data_structure/layout/layoutgroup.cc |    2 +-
 tests/test_document_load.cc                       |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e682562..ff48d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-12-12  Murray Cumming  <murrayc murrayc com>
 
+	LayoutGroup: Correct the get_items_recursive_with_groups() implementaiton.
+
+	* glom/libglom/data_structure/layout/layoutgroup.cc: Call the correct 
+	method recursively. This fixes make check.
+
+2011-12-12  Murray Cumming  <murrayc murrayc com>
+
 	test_document_load: Test LayoutGroup::get_items_recursive().
 
 	* tests/test_document_load.cc: And get_items_recursive_with_groups().
diff --git a/glom/libglom/data_structure/layout/layoutgroup.cc b/glom/libglom/data_structure/layout/layoutgroup.cc
index 56f8157..de0c286 100644
--- a/glom/libglom/data_structure/layout/layoutgroup.cc
+++ b/glom/libglom/data_structure/layout/layoutgroup.cc
@@ -265,7 +265,7 @@ LayoutGroup::type_list_const_items LayoutGroup::get_items_recursive_with_groups(
     sharedptr<const LayoutGroup> group = sharedptr<const LayoutGroup>::cast_dynamic(item);
     if(group)
     {
-      const type_list_const_items sub_result = group->get_items_recursive();
+      const type_list_const_items sub_result = group->get_items_recursive_with_groups();
       result.insert(result.end(), sub_result.begin(), sub_result.end());
     }
   }
diff --git a/tests/test_document_load.cc b/tests/test_document_load.cc
index 47f17e9..118d279 100644
--- a/tests/test_document_load.cc
+++ b/tests/test_document_load.cc
@@ -95,7 +95,7 @@ static Glom::sharedptr<const Glom::LayoutItem_Portal> get_portal_from_details_la
         Glom::sharedptr<const Glom::LayoutItem_Portal>::cast_dynamic(layout_item);
       if(!portal)
         continue;
-      
+
       if(portal->get_relationship_name() == relationship_name)
         return portal;
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]