[glom/glom-1-28] FlowTableWithFields: Remove uses of C++11 auto.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-28] FlowTableWithFields: Remove uses of C++11 auto.
- Date: Thu, 25 Feb 2016 19:15:02 +0000 (UTC)
commit c8b35ce9459097f1c3ac17dd1660d9039d2e51c6
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Feb 25 18:50:00 2016 +0100
FlowTableWithFields: Remove uses of C++11 auto.
glom/mode_data/flowtablewithfields.cc | 4 ++--
glom/mode_design/layout/dialog_layout_details.cc | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 34e4b71..e5b048d 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 = sharedptr<LayoutItem_Portal>::cast_dynamic(group);
+ sharedptr<LayoutItem_Portal> portal = sharedptr<LayoutItem_Portal>::cast_dynamic(group);
if(portal)
{
add_layout_portal(portal);
}
else
{
- auto notebook = sharedptr<LayoutItem_Notebook>::cast_dynamic(group);
+ sharedptr<LayoutItem_Notebook> notebook = sharedptr<LayoutItem_Notebook>::cast_dynamic(group);
if(notebook)
{
add_layout_notebook(notebook);
diff --git a/glom/mode_design/layout/dialog_layout_details.cc
b/glom/mode_design/layout/dialog_layout_details.cc
index 7d09165..045fc21 100644
--- a/glom/mode_design/layout/dialog_layout_details.cc
+++ b/glom/mode_design/layout/dialog_layout_details.cc
@@ -1073,14 +1073,14 @@ void Dialog_Layout_Details::save_to_document()
sharedptr<LayoutItem> layout_item = row[m_model_items->m_columns.m_col_layout_item];
//There may be top-level groups, but no top-level fields, because the fields must be in a group (so
that they are in columns)
- auto layout_group = sharedptr<LayoutGroup>::cast_dynamic(layout_item);
+ sharedptr<LayoutGroup> layout_group = sharedptr<LayoutGroup>::cast_dynamic(layout_item);
if(!layout_group)
continue;
//TODO: This is very ugly:
- auto layout_portal = sharedptr<LayoutItem_Portal>::cast_dynamic(layout_item);
- auto layout_calendar_portal = sharedptr<LayoutItem_CalendarPortal>::cast_dynamic(layout_item);
- auto layout_notebook = sharedptr<LayoutItem_Notebook>::cast_dynamic(layout_item);
+ sharedptr<LayoutItem_Portal> layout_portal = sharedptr<LayoutItem_Portal>::cast_dynamic(layout_item);
+ sharedptr<LayoutItem_CalendarPortal> layout_calendar_portal =
sharedptr<LayoutItem_CalendarPortal>::cast_dynamic(layout_item);
+ sharedptr<LayoutItem_Notebook> layout_notebook =
sharedptr<LayoutItem_Notebook>::cast_dynamic(layout_item);
sharedptr<LayoutGroup> group;
if(layout_portal) {
group = sharedptr<LayoutItem_Portal>::create();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]