[glom/glom-1-28] Fix a bad conflict resolution.

[Murray Cumming <murrayc src gnome org>]

commit 3786acecec8322a4774a505a1f7be2361a919ddd
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Feb 25 17:55:04 2016 +0100

    Fix a bad conflict resolution.

 glom/mode_data/box_data_details.cc    |    2 +-
 glom/mode_data/flowtablewithfields.cc |    7 +++----
 glom/mode_data/flowtablewithfields.h  |   13 ++++---------
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index f320a20..0e7ac04 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -224,7 +224,7 @@ void Box_Data_Details::create_layout()
 
     for(Document::type_list_layout_groups::const_iterator iter = layout_groups.begin(); iter != 
layout_groups.end(); ++iter)
     {
-      m_FlowTable.add_layout_group(*iter, false /* no indent at this top level */);
+      m_FlowTable.add_layout_group_or_derived(*iter, false /* no indent at this top level */);
     }
 
     m_FlowTable.align_child_group_labels();
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 80c239d..34e4b71 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -155,14 +155,14 @@ void FlowTableWithFields::add_layout_item(const sharedptr<LayoutItem>& item)
 
 void FlowTableWithFields::add_layout_group_or_derived(const sharedptr<LayoutGroup>& group, bool with_indent)
 {
-  auto portal = std::dynamic_pointer_cast<LayoutItem_Portal>(group);
+  auto portal = sharedptr<LayoutItem_Portal>::cast_dynamic(group);
   if(portal)
   {
     add_layout_portal(portal);
   }
   else
   {
-    auto notebook = std::dynamic_pointer_cast<LayoutItem_Notebook>(group);
+    auto notebook = sharedptr<LayoutItem_Notebook>::cast_dynamic(group);
     if(notebook)
     {
       add_layout_notebook(notebook);
@@ -174,8 +174,7 @@ void FlowTableWithFields::add_layout_group_or_derived(const sharedptr<LayoutGrou
   }
 }
           
-void FlowTableWithFields::add_layout_group(const std::shared_ptr<LayoutGroup>& group, bool with_indent)
->>>>>>> 59a1b05... Box_Data_Details/FlowTableWithFields: Allow notebooks at the top-level.
+void FlowTableWithFields::add_layout_group(const sharedptr<LayoutGroup>& group, bool with_indent)
 {
   if(!group)
     return;
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 9a5e793..109d69f 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -92,7 +92,7 @@ public:
     /**
    * @param with_indent Pass true for top-level groups, to avoid wasting extra space with an unnecessary 
indent.
    */
-  void add_layout_group_or_derived(const std::shared_ptr<LayoutGroup>& group, bool with_indent = true);
+  void add_layout_group_or_derived(const sharedptr<LayoutGroup>& group, bool with_indent = true);
 
   void set_field_editable(const sharedptr<const LayoutItem_Field>& field, bool editable = true);
 
@@ -252,21 +252,16 @@ private:
   void add_imageobject(const sharedptr<LayoutItem_Image>& layoutitem_image, const Glib::ustring& table_name);
 
   void add_layoutwidgetbase(LayoutWidgetBase* layout_widget);
-<<<<<<< HEAD
-  void add_layout_notebook(const sharedptr<LayoutItem_Notebook>& notebook);
-  void add_layout_portal(const sharedptr<LayoutItem_Portal>& portal);
-=======
 
   /** Add a normal group, not a notebook or portal.
    * See also add_layout_group_or_derived().
    *
    * @param with_indent Pass true for top-level groups, to avoid wasting extra space with an unnecessary 
indent.
    */
-  void add_layout_group(const std::shared_ptr<LayoutGroup>& group, bool with_indent = true);
+  void add_layout_group(const sharedptr<LayoutGroup>& group, bool with_indent = true);
 
-  void add_layout_notebook(const std::shared_ptr<LayoutItem_Notebook>& notebook);
-  void add_layout_portal(const std::shared_ptr<LayoutItem_Portal>& portal);
->>>>>>> 59a1b05... Box_Data_Details/FlowTableWithFields: Allow notebooks at the top-level.
+  void add_layout_notebook(const sharedptr<LayoutItem_Notebook>& notebook);
+  void add_layout_portal(const sharedptr<LayoutItem_Portal>& portal);
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY