[glom] More removing of camelCase from variable names.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] More removing of camelCase from variable names.
- Date: Wed, 30 Mar 2016 13:17:36 +0000 (UTC)
commit 7790c538564fcf3800eb6ffe78a4d6b598b90be6
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Mar 30 15:16:44 2016 +0200
More removing of camelCase from variable names.
glom/bakery/busy_cursor.cc | 30 ++--
glom/bakery/busy_cursor.h | 6 +-
glom/mode_data/box_data_details.cc | 2 +-
glom/mode_data/datawidget/cellrenderer_dblist.cc | 2 +-
.../datawidget/combochoiceswithtreemodel.cc | 14 +-
.../datawidget/combochoiceswithtreemodel.h | 2 +-
glom/mode_data/db_adddel/db_adddel.cc | 192 +++++++++---------
glom/mode_data/db_adddel/db_adddel.h | 6 +-
glom/mode_design/fields/combo_fieldtype.cc | 24 ++--
glom/mode_design/fields/combo_fieldtype.h | 4 +-
.../window_relationships_overview.cc | 12 +-
.../window_relationships_overview.h | 4 +-
glom/print_layout/print_layout_utils.cc | 2 +-
glom/utility_widgets/adddel/adddel.cc | 204 ++++++++++----------
glom/utility_widgets/adddel/adddel.h | 10 +-
glom/utility_widgets/adddel/adddel_withbuttons.cc | 2 +-
glom/utility_widgets/cellrendererlist.cc | 12 +-
glom/utility_widgets/cellrendererlist.h | 2 +-
glom/utility_widgets/flowtable.h | 2 +-
19 files changed, 266 insertions(+), 266 deletions(-)
---
diff --git a/glom/bakery/busy_cursor.cc b/glom/bakery/busy_cursor.cc
index 6d7004e..79bfc30 100644
--- a/glom/bakery/busy_cursor.cc
+++ b/glom/bakery/busy_cursor.cc
@@ -13,29 +13,29 @@ BusyCursor::BusyCursor(Gtk::Window& window, Gdk::CursorType cursor_type)
}
BusyCursor::BusyCursor(Gtk::Window* window, Gdk::CursorType cursor_type)
-: m_pWindow(window) //If this is a nested cursor then remember the previously-set cursor, so we can restore
it.
+: m_window(window) //If this is a nested cursor then remember the previously-set cursor, so we can restore
it.
{
- if(!m_pWindow)
+ if(!m_window)
return;
- m_Cursor = Gdk::Cursor::create(m_pWindow->get_display(), cursor_type);
+ m_cursor = Gdk::Cursor::create(m_window->get_display(), cursor_type);
- m_refWindow = m_pWindow->get_window();
- if(!m_refWindow)
+ m_gdk_window = m_window->get_window();
+ if(!m_gdk_window)
return;
- auto iter = m_map_cursors.find(m_pWindow);
+ auto iter = m_map_cursors.find(m_window);
if(iter != m_map_cursors.end())
{
m_old_cursor = iter->second; //Remember the existing cursor.
}
- m_map_cursors[m_pWindow] = m_Cursor; //Let a further nested cursor know about the new cursor in use.
+ m_map_cursors[m_window] = m_cursor; //Let a further nested cursor know about the new cursor in use.
//Change the cursor:
- if(m_refWindow)
- m_refWindow->set_cursor(m_Cursor);
+ if(m_gdk_window)
+ m_gdk_window->set_cursor(m_cursor);
force_gui_update();
}
@@ -45,15 +45,15 @@ BusyCursor::~BusyCursor()
//Restore the old cursor:
if(m_old_cursor)
{
- if(m_refWindow)
- m_refWindow->set_cursor(m_old_cursor);
+ if(m_gdk_window)
+ m_gdk_window->set_cursor(m_old_cursor);
}
else
{
- if(m_refWindow)
- m_refWindow->set_cursor();
+ if(m_gdk_window)
+ m_gdk_window->set_cursor();
- auto iter = m_map_cursors.find(m_pWindow);
+ auto iter = m_map_cursors.find(m_window);
if(iter != m_map_cursors.end())
m_map_cursors.erase(iter);
}
@@ -64,7 +64,7 @@ BusyCursor::~BusyCursor()
void BusyCursor::force_gui_update()
{
- if(m_refWindow)
+ if(m_gdk_window)
{
//Force the GUI to update:
//TODO: Make sure that gtkmm has some non-Gtk::Main API for this:
diff --git a/glom/bakery/busy_cursor.h b/glom/bakery/busy_cursor.h
index 2e2536a..a345a23 100644
--- a/glom/bakery/busy_cursor.h
+++ b/glom/bakery/busy_cursor.h
@@ -46,9 +46,9 @@ private:
void force_gui_update();
- Glib::RefPtr<Gdk::Cursor> m_Cursor;
- Gtk::Window* m_pWindow;
- Glib::RefPtr<Gdk::Window> m_refWindow;
+ Glib::RefPtr<Gdk::Cursor> m_cursor;
+ Gtk::Window* m_window;
+ Glib::RefPtr<Gdk::Window> m_gdk_window;
typedef std::map<Gtk::Window*, Glib::RefPtr<Gdk::Cursor> > type_map_cursors;
static type_map_cursors m_map_cursors;
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index a4ac9a3..b9dba8b 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -72,7 +72,7 @@ Box_Data_Details::Box_Data_Details(bool bWithNavButtons /* = true */)
//m_strHint = _("When you change the data in a field the database is updated immediately.\n Click [New] to
add a new record.\n Leave automatic ID fields empty - they will be filled for you.");
- //m_ScrolledWindow.set_border_width(Utils::to_utype(UiUtils::DefaultSpacings::SMALL));
+ //m_scrolled_window.set_border_width(Utils::to_utype(UiUtils::DefaultSpacings::SMALL));
// Allow vertical scrolling, but never scroll horizontally:
m_ScrolledWindow.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
diff --git a/glom/mode_data/datawidget/cellrenderer_dblist.cc
b/glom/mode_data/datawidget/cellrenderer_dblist.cc
index 1b6e66b..e29c3ec 100644
--- a/glom/mode_data/datawidget/cellrenderer_dblist.cc
+++ b/glom/mode_data/datawidget/cellrenderer_dblist.cc
@@ -42,7 +42,7 @@ void CellRendererDbList::set_choices_fixed(const Formatting::type_list_values& l
//Show model in the view:
property_model() = model;
- property_text_column() = get_fixed_model_text_column(); //This must be a text column, in m_refModel.
+ property_text_column() = get_fixed_model_text_column(); //This must be a text column, in m_model.
property_editable() = true; //It would be useless if we couldn't edit it.
//The other cells are added in on_editing_started().
diff --git a/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
b/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
index ffd7571..1e1338f 100644
--- a/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
@@ -52,7 +52,7 @@ ComboChoicesWithTreeModel::~ComboChoicesWithTreeModel()
int ComboChoicesWithTreeModel::get_fixed_model_text_column() const
{
- const auto count = m_refModel->get_n_columns();
+ const auto count = m_model->get_n_columns();
if(count > 0)
return count -1;
else
@@ -92,7 +92,7 @@ void ComboChoicesWithTreeModel::create_model_non_db(guint columns_count)
}
//Create the model:
- m_refModel = Gtk::ListStore::create(record);
+ m_model = Gtk::ListStore::create(record);
}
void ComboChoicesWithTreeModel::delete_model()
@@ -129,7 +129,7 @@ void ComboChoicesWithTreeModel::set_choices_with_second(const type_list_values_w
if(layout_choice_extra)
extra_fields = layout_choice_extra->get_items_recursive();
- auto list_store = Glib::RefPtr<Gtk::ListStore>::cast_dynamic(m_refModel);
+ auto list_store = Glib::RefPtr<Gtk::ListStore>::cast_dynamic(m_model);
if(!list_store)
{
std::cerr << G_STRFUNC << ": list_store is null.\n";
@@ -184,7 +184,7 @@ void ComboChoicesWithTreeModel::set_choices_fixed(const Formatting::type_list_va
{
create_model_non_db(1); //Use a regular ListStore without a dynamic column?
- auto list_store = Glib::RefPtr<Gtk::ListStore>::cast_dynamic(m_refModel);
+ auto list_store = Glib::RefPtr<Gtk::ListStore>::cast_dynamic(m_model);
if(!list_store)
{
std::cerr << G_STRFUNC << ": list_store is null.\n";
@@ -291,8 +291,8 @@ void ComboChoicesWithTreeModel::set_choices_related(const std::shared_ptr<const
//because Combo(has_entry) needs it.
//TODO: Avoid getting the actual data if the user does not have view rights.
const auto table_privs = Privs::get_current_privs(found_set.m_table_name);
- m_refModel = DbTreeModelWithExtraText::create(found_set, layout_items, table_privs.m_view, false /* find
mode */, m_db_layout_items);
- if(!m_refModel)
+ m_model = DbTreeModelWithExtraText::create(found_set, layout_items, table_privs.m_view, false /* find mode
*/, m_db_layout_items);
+ if(!m_model)
{
std::cerr << G_STRFUNC << ": DbTreeModel::create() returned a null model.\n";
}
@@ -303,7 +303,7 @@ void ComboChoicesWithTreeModel::set_choices_related(const std::shared_ptr<const
Glib::RefPtr<Gtk::TreeModel> ComboChoicesWithTreeModel::get_choices_model()
{
- return m_refModel;
+ return m_model;
}
void ComboChoicesWithTreeModel::set_cell_for_field_value(Gtk::CellRenderer* cell, const
std::shared_ptr<const LayoutItem_Field>& field, const Gnome::Gda::Value& value)
diff --git a/glom/mode_data/datawidget/combochoiceswithtreemodel.h
b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
index 3d4b6d2..ce01317 100644
--- a/glom/mode_data/datawidget/combochoiceswithtreemodel.h
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
@@ -88,7 +88,7 @@ private:
/// Render the model data to the cells in the view.
void on_cell_data(const Gtk::TreeModel::iterator& iter, Gtk::CellRenderer* cell, guint model_column_index);
- Glib::RefPtr<Gtk::TreeModel> m_refModel;
+ Glib::RefPtr<Gtk::TreeModel> m_model;
void delete_model();
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index ba79cee..2e78daf 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -75,23 +75,23 @@ DbAddDel::DbAddDel()
// TODO: Maybe this should be a constructor parameter, so that multiple
// DbAddDels in a single Window can be addressed separately.
#ifdef GTKMM_ATKMM_ENABLED
- m_TreeView.get_accessible()->set_name(_("Table Content"));
+ m_tree_view.get_accessible()->set_name(_("Table Content"));
#endif
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_IN);
- m_TreeView.set_fixed_height_mode(); //This allows some optimizations.
- m_ScrolledWindow.add(m_TreeView);
- pack_start(m_ScrolledWindow);
+ m_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window.set_shadow_type(Gtk::SHADOW_IN);
+ m_tree_view.set_fixed_height_mode(); //This allows some optimizations.
+ m_scrolled_window.add(m_tree_view);
+ pack_start(m_scrolled_window);
- m_TreeView.show();
+ m_tree_view.show();
//Make sure that the TreeView doesn't start out only big enough for zero items.
set_height_rows(6, 6);
- m_TreeView.add_events(Gdk::BUTTON_PRESS_MASK); //Allow us to catch button_press_event and
button_release_event
- m_TreeView.signal_button_press_event().connect_notify( sigc::mem_fun(*this,
&DbAddDel::on_treeview_button_press_event) );
- m_TreeView.signal_columns_changed().connect( sigc::mem_fun(*this, &DbAddDel::on_treeview_columns_changed)
);
+ m_tree_view.add_events(Gdk::BUTTON_PRESS_MASK); //Allow us to catch button_press_event and
button_release_event
+ m_tree_view.signal_button_press_event().connect_notify( sigc::mem_fun(*this,
&DbAddDel::on_treeview_button_press_event) );
+ m_tree_view.signal_columns_changed().connect( sigc::mem_fun(*this, &DbAddDel::on_treeview_columns_changed)
);
//signal_button_press_event().connect(sigc::mem_fun(*this, &DbAddDel::on_button_press_event_Popup));
//add_blank();
@@ -111,7 +111,7 @@ DbAddDel::DbAddDel()
signal_style_changed().connect(sigc::mem_fun(*this, &DbAddDel::on_self_style_changed));
#endif // !GLOM_ENABLE_CLIENT_ONLY
- auto refSelection = m_TreeView.get_selection();
+ auto refSelection = m_tree_view.get_selection();
if(refSelection)
{
refSelection->signal_changed().connect(
@@ -144,7 +144,7 @@ void DbAddDel::set_height_rows_actual(gulong rows_count)
const guint height_for_rows = rows_count * get_fixed_cell_height();
//std::cout << "debug: height_for_rows = " << height_for_rows << std::endl;
const guint extra_for_treeview = 50; //TODO: Find some way to guess this.
- m_ScrolledWindow.set_min_content_height(height_for_rows + extra_for_treeview);
+ m_scrolled_window.set_min_content_height(height_for_rows + extra_for_treeview);
}
void DbAddDel::do_user_requested_edit()
@@ -165,10 +165,10 @@ void DbAddDel::on_idle_row_edit()
void DbAddDel::on_cell_button_clicked(const Gtk::TreeModel::Path& path)
{
- if(!m_refListStore)
+ if(!m_list_store)
return;
- auto iter = m_refListStore->get_iter(path);
+ auto iter = m_list_store->get_iter(path);
if(iter)
{
select_item(iter, false /* start_editing */);
@@ -198,7 +198,7 @@ void DbAddDel::on_MenuPopup_activate_Delete()
{
finish_editing();
- auto refSelection = m_TreeView.get_selection();
+ auto refSelection = m_tree_view.get_selection();
if(refSelection)
{
auto iter = refSelection->get_selected();
@@ -320,8 +320,8 @@ bool DbAddDel::on_button_press_event_Popup(GdkEventButton *button_event)
Gtk::TreeModel::iterator DbAddDel::get_item_placeholder()
{
//Get the existing placeholder row, or add one if necessary:
- if(m_refListStore)
- return m_refListStore->get_placeholder_row();
+ if(m_list_store)
+ return m_list_store->get_placeholder_row();
else
return Gtk::TreeModel::iterator();
}
@@ -330,7 +330,7 @@ Gnome::Gda::Value DbAddDel::get_value(const Gtk::TreeModel::iterator& iter, cons
{
Gnome::Gda::Value value;
- if(m_refListStore)
+ if(m_list_store)
{
Gtk::TreeModel::Row treerow = *iter;
@@ -368,29 +368,29 @@ Gnome::Gda::Value DbAddDel::get_value_selected(const std::shared_ptr<const Layou
Gtk::TreeModel::iterator DbAddDel::get_item_selected()
{
- auto refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_tree_view.get_selection();
if(refTreeSelection)
{
return refTreeSelection->get_selected();
}
- if(m_refListStore)
- return m_refListStore->children().end();
+ if(m_list_store)
+ return m_list_store->children().end();
else
return Gtk::TreeModel::iterator();
}
Gtk::TreeModel::iterator DbAddDel::get_item_selected() const
{
- Glib::RefPtr<const Gtk::TreeSelection> refTreeSelection = m_TreeView.get_selection();
+ Glib::RefPtr<const Gtk::TreeSelection> refTreeSelection = m_tree_view.get_selection();
if(refTreeSelection)
{
auto unconst = Glib::RefPtr<Gtk::TreeSelection>::cast_const(refTreeSelection);
return unconst->get_selected();
}
- if(m_refListStore)
- return m_refListStore->children().end();
+ if(m_list_store)
+ return m_list_store->children().end();
else
return Gtk::TreeModel::iterator();
}
@@ -398,10 +398,10 @@ Gtk::TreeModel::iterator DbAddDel::get_item_selected() const
Gtk::TreeModel::iterator DbAddDel::get_row(const Gnome::Gda::Value& key)
{
- if(!m_refListStore)
+ if(!m_list_store)
return Gtk::TreeModel::iterator();
- for(auto iter = m_refListStore->children().begin(); iter != m_refListStore->children().end(); ++iter)
+ for(auto iter = m_list_store->children().begin(); iter != m_list_store->children().end(); ++iter)
{
//Gtk::TreeModel::Row row = *iter;
const auto valTemp = get_value_key(iter);
@@ -411,7 +411,7 @@ Gtk::TreeModel::iterator DbAddDel::get_row(const Gnome::Gda::Value& key)
}
}
- return m_refListStore->children().end();
+ return m_list_store->children().end();
}
bool DbAddDel::select_item(const Gtk::TreeModel::iterator& iter, bool start_editing)
@@ -430,7 +430,7 @@ bool DbAddDel::select_item(const Gtk::TreeModel::iterator& iter, bool start_edit
bool DbAddDel::select_item(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const LayoutItem>&
layout_item, bool start_editing)
{
- if(!m_refListStore)
+ if(!m_list_store)
return false;
InnerIgnore innerIgnore(this); //see comments for InnerIgnore class
@@ -449,22 +449,22 @@ bool DbAddDel::select_item(const Gtk::TreeModel::iterator& iter, const std::shar
treemodel_col += get_count_hidden_system_columns();
- auto refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_tree_view.get_selection();
g_assert(refTreeSelection);
refTreeSelection->select(iter);
- Gtk::TreeModel::Path path = m_refListStore->get_path(iter);
+ Gtk::TreeModel::Path path = m_list_store->get_path(iter);
guint view_column_index = 0;
const auto test = get_view_column_index(treemodel_col, view_column_index);
if(test)
{
- auto pColumn = m_TreeView.get_column(view_column_index);
+ auto pColumn = m_tree_view.get_column(view_column_index);
if(pColumn)
{
if(pColumn != m_treeviewcolumn_button) //This would activate the button. Let's avoid this, though it
should never happen.
{
- m_TreeView.set_cursor(path, *pColumn, start_editing);
+ m_tree_view.set_cursor(path, *pColumn, start_editing);
}
}
else
@@ -481,10 +481,10 @@ bool DbAddDel::select_item(const Gtk::TreeModel::iterator& iter, const std::shar
guint DbAddDel::get_count() const
{
- if(!m_refListStore)
+ if(!m_list_store)
return 0;
- guint iCount = m_refListStore->children().size();
+ guint iCount = m_list_store->children().size();
//Take account of the extra blank for new entries:
if(get_allow_user_actions()) //If it has the extra row.
@@ -497,7 +497,7 @@ guint DbAddDel::get_count() const
guint DbAddDel::get_columns_count() const
{
- return m_TreeView.get_columns().size();
+ return m_tree_view.get_columns().size();
}
guint DbAddDel::get_fixed_cell_height()
@@ -510,7 +510,7 @@ guint DbAddDel::get_fixed_cell_height()
// when all columns are known.
//Get a default:
- auto refLayoutDefault = m_TreeView.create_pango_layout("ExampleEg");
+ auto refLayoutDefault = m_tree_view.create_pango_layout("ExampleEg");
int width_default = 0;
int height_default = 0;
refLayoutDefault->get_pixel_size(width_default, height_default);
@@ -532,7 +532,7 @@ guint DbAddDel::get_fixed_cell_height()
continue;
// Translators: This is just some example text used to discover an appropriate height for user-entered
text in the UI. This text itself is never shown to the user.
- auto refLayout = m_TreeView.create_pango_layout(_("ExampleEg"));
+ auto refLayout = m_tree_view.create_pango_layout(_("ExampleEg"));
const Pango::FontDescription font(font_name);
refLayout->set_font_description(font);
int width = 0;
@@ -548,7 +548,7 @@ guint DbAddDel::get_fixed_cell_height()
//We get this style property, which might be causing it. murrayc
//TODO: Find out if this is reallyt the right way to calculate the correct height:
int extra_height = 0;
- gtk_widget_style_get(GTK_WIDGET(m_TreeView.gobj()), "vertical-separator", &extra_height, (void*)0);
+ gtk_widget_style_get(GTK_WIDGET(m_tree_view.gobj()), "vertical-separator", &extra_height, (void*)0);
//std::cout << "debug: extra_height=" << extra_height << std::endl;
return m_fixed_cell_height + extra_height;
@@ -632,20 +632,20 @@ void DbAddDel::construct_specified_columns()
{
//std::cout << "debug: " << G_STRFUNC << ": showing hint model: m_find_mode=" << m_find_mode <<
std::endl;
- m_refListStore.reset();
+ m_list_store.reset();
if(m_table_name.empty())
{
- m_TreeView.set_model(m_refListStore); // clear old model from treeview
+ m_tree_view.set_model(m_list_store); // clear old model from treeview
}
else
show_hint_model();
return;
}
- m_refListStore = DbTreeModel::create(m_found_set, m_column_items, m_allow_view, m_find_mode,
m_FieldsShown);
+ m_list_store = DbTreeModel::create(m_found_set, m_column_items, m_allow_view, m_find_mode, m_FieldsShown);
//m_FieldsShown is needed by Base_DB_Table_Data::record_new().
- m_TreeView.set_model(m_refListStore); // clear old model from treeview
+ m_tree_view.set_model(m_list_store); // clear old model from treeview
//Remove all View columns:
treeview_delete_all_columns();
@@ -665,7 +665,7 @@ void DbAddDel::construct_specified_columns()
Gtk::Requisition requistion_min, requistion_natural; //TODO: Really support natural size.
- pCellButton->get_preferred_size(m_TreeView, requistion_min, requistion_natural);
+ pCellButton->get_preferred_size(m_tree_view, requistion_min, requistion_natural);
m_treeviewcolumn_button->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED); //Needed by fixed-height mode.
@@ -673,14 +673,14 @@ void DbAddDel::construct_specified_columns()
// have to take into account the xpad property of the cell renderer and
// the spacing property of the treeviewcolumn.
int horizontal_separator = 0;
- m_TreeView.get_style_property("horizontal-separator", horizontal_separator);
+ m_tree_view.get_style_property("horizontal-separator", horizontal_separator);
const int button_width = requistion_min.width + horizontal_separator*2;
if(button_width > 0) //Otherwise an assertion fails.
m_treeviewcolumn_button->set_fixed_width(button_width);
m_treeviewcolumn_button->set_visible(m_allow_view_details);
- m_TreeView.append_column(*m_treeviewcolumn_button);
+ m_tree_view.append_column(*m_treeviewcolumn_button);
++view_column_index;
}
@@ -746,10 +746,10 @@ void DbAddDel::construct_specified_columns()
else
{
//We must set this each time, because show_hint_model() might unset it:
- m_TreeView.set_fixed_height_mode(); //This allows some optimizations.
+ m_tree_view.set_fixed_height_mode(); //This allows some optimizations.
}
- m_TreeView.columns_autosize();
+ m_tree_view.columns_autosize();
//Make sure there's a blank row after the database rows that have just been added.
//add_blank();
@@ -759,7 +759,7 @@ void DbAddDel::construct_specified_columns()
//Show as many rows as needed, but not more than the maximum:
gulong total = 0; //ignored
gulong db_rows_count_found = 0;
- auto refModelDerived = Glib::RefPtr<DbTreeModel>::cast_dynamic(m_refListStore);
+ auto refModelDerived = Glib::RefPtr<DbTreeModel>::cast_dynamic(m_list_store);
if(refModelDerived)
refModelDerived->get_record_counts(total, db_rows_count_found);
@@ -776,15 +776,15 @@ bool DbAddDel::refresh_from_database()
return true;
/*
- if(m_refListStore)
+ if(m_list_store)
{
//Glib::RefPtr<Gtk::TreeModel> refNull;
- const auto result = m_refListStore->refresh_from_database(m_found_set);
- //m_TreeView.set_model(refNull); //TODO: This causes a g_warning(): gtk_tree_view_unref_tree_helper:
assertion `node != NULL' failed
- if(m_TreeView.get_model())
- gtk_tree_view_set_model(m_TreeView.gobj(), 0); //This gives the same warning.
+ const auto result = m_list_store->refresh_from_database(m_found_set);
+ //m_tree_view.set_model(refNull); //TODO: This causes a g_warning(): gtk_tree_view_unref_tree_helper:
assertion `node != NULL' failed
+ if(m_tree_view.get_model())
+ gtk_tree_view_set_model(m_tree_view.gobj(), 0); //This gives the same warning.
- m_TreeView.set_model(m_refListStore);
+ m_tree_view.set_model(m_list_store);
return result;
}
else
@@ -797,9 +797,9 @@ bool DbAddDel::refresh_from_database_blank()
if(m_find_mode)
return refresh_from_database();
- if(m_refListStore)
+ if(m_list_store)
{
- m_refListStore->clear(); //Remove all rows.
+ m_list_store->clear(); //Remove all rows.
}
return true;
@@ -816,7 +816,7 @@ void DbAddDel::set_value(const Gtk::TreeModel::iterator& iter, const std::shared
InnerIgnore innerIgnore(this);
- if(!m_refListStore)
+ if(!m_list_store)
{
std::cerr << G_STRFUNC << ": No model.\n";
return;
@@ -877,7 +877,7 @@ void DbAddDel::refresh_cell_choices_data_from_database_with_foreign_key(guint mo
}
auto cell =
- dynamic_cast<CellRendererDbList*>( m_TreeView.get_column_cell_renderer(view_column_index) );
+ dynamic_cast<CellRendererDbList*>( m_tree_view.get_column_cell_renderer(view_column_index) );
if(!cell)
{
std::cerr << G_STRFUNC << ": cell renderer not found for model_column=" << model_index << std::endl;
@@ -1070,7 +1070,7 @@ void DbAddDel::set_column_choices(guint col, const type_vec_strings& vecStrings)
if(test)
{
auto pCellRenderer =
- dynamic_cast<CellRendererDbList*>( m_TreeView.get_column_cell_renderer(view_column_index) );
+ dynamic_cast<CellRendererDbList*>( m_tree_view.get_column_cell_renderer(view_column_index) );
if(pCellRenderer)
{
//Add the choices:
@@ -1119,7 +1119,7 @@ void DbAddDel::set_find_mode(bool val)
//Recreate the model if necessary:
if( (current != m_find_mode) &&
- m_refListStore)
+ m_list_store)
{
construct_specified_columns();
}
@@ -1165,8 +1165,8 @@ void DbAddDel::reactivate()
void DbAddDel::remove_item(const Gtk::TreeModel::iterator& iter)
{
- if(iter && m_refListStore)
- m_refListStore->erase(iter);
+ if(iter && m_list_store)
+ m_list_store->erase(iter);
}
bool DbAddDel::get_ignore_treeview_signals() const
@@ -1211,9 +1211,9 @@ Gnome::Gda::Value DbAddDel::treeview_get_key(const Gtk::TreeModel::iterator& row
{
Gnome::Gda::Value value;
- if(m_refListStore)
+ if(m_list_store)
{
- return m_refListStore->get_key_value(row);
+ return m_list_store->get_key_value(row);
}
return value;
@@ -1254,10 +1254,10 @@ DbAddDel::type_signal_record_selection_changed DbAddDel::signal_record_selection
void DbAddDel::on_cell_layout_button_clicked(const Gtk::TreeModel::Path& path, int model_column_index)
{
- if(!m_refListStore)
+ if(!m_list_store)
return;
- auto iter = m_refListStore->get_iter(path);
+ auto iter = m_list_store->get_iter(path);
if(iter)
{
auto layout_item = m_column_items[model_column_index];
@@ -1276,13 +1276,13 @@ void DbAddDel::on_treeview_cell_edited_bool(const Glib::ustring& path_string, in
if(path_string.empty())
return;
- if(!m_refListStore)
+ if(!m_list_store)
return;
const Gtk::TreeModel::Path path(path_string);
//Get the row from the path:
- auto iter = m_refListStore->get_iter(path);
+ auto iter = m_list_store->get_iter(path);
if(iter)
{
Gtk::TreeModel::Row row = *iter;
@@ -1306,7 +1306,7 @@ void DbAddDel::on_treeview_cell_edited_bool(const Glib::ustring& path_string, in
bool bIsAdd = false;
bool bIsChange = false;
- const auto iCount = m_refListStore->children().size();
+ const auto iCount = m_list_store->children().size();
if(iCount)
{
if(get_allow_user_actions()) //If add is possible:
@@ -1355,7 +1355,7 @@ void DbAddDel::on_treeview_cell_edited_bool(const Glib::ustring& path_string, in
void DbAddDel::on_idle_treeview_cell_edited_revert(const Gtk::TreeModel::Row& row, guint model_column_index)
{
- auto refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_tree_view.get_selection();
if(!refTreeSelection)
return;
@@ -1363,7 +1363,7 @@ void DbAddDel::on_idle_treeview_cell_edited_revert(const Gtk::TreeModel::Row& ro
guint view_column_index = 0;
get_view_column_index(model_column_index, view_column_index);
- auto pColumn = m_TreeView.get_column(view_column_index);
+ auto pColumn = m_tree_view.get_column(view_column_index);
if(!pColumn)
{
std::cerr << G_STRFUNC << ": pColumn is null.\n";
@@ -1380,7 +1380,7 @@ void DbAddDel::on_idle_treeview_cell_edited_revert(const Gtk::TreeModel::Row& ro
const auto path = get_model()->get_path(row);
//Highlights the cell, and start the editing:
- m_TreeView.set_cursor(path, *pColumn, *pCell, true /* start_editing */);
+ m_tree_view.set_cursor(path, *pColumn, *pCell, true /* start_editing */);
}
void DbAddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const Glib::ustring& new_text, int
model_column_index, int data_model_column_index)
@@ -1389,7 +1389,7 @@ void DbAddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const G
if(path_string.empty())
return;
- if(!m_refListStore)
+ if(!m_list_store)
return;
const Gtk::TreeModel::Path path(path_string);
@@ -1401,7 +1401,7 @@ void DbAddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const G
}
//Get the row from the path:
- auto iter = m_refListStore->get_iter(path);
+ auto iter = m_list_store->get_iter(path);
if(iter != get_model()->children().end())
{
Gtk::TreeModel::Row row = *iter;
@@ -1432,7 +1432,7 @@ void DbAddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const G
return;
//Mark this row as no longer a placeholder, because it has data now. The client code must set an
actual key for this in the signal_user_added() or m_signal_user_changed signal handlers.
- m_refListStore->set_is_not_placeholder(iter);
+ m_list_store->set_is_not_placeholder(iter);
//Don't mark this as not a placeholder, because it's still a placeholder until it has a key value.
set_prevent_user_signals(bPreventUserSignals);
@@ -1552,9 +1552,9 @@ void DbAddDel::on_treeview_column_resized(int model_column_index, DbTreeViewColu
//We do not save the column width if this is the last column,
//because that must always be automatic,
//because it must resize when the whole column resizes.
- std::vector<Gtk::TreeView::Column*> columns = m_TreeView.get_columns();
+ std::vector<Gtk::TreeView::Column*> columns = m_tree_view.get_columns();
const auto n_view_columns = columns.size();
- if(n_view_columns && (view_column == m_TreeView.get_column(n_view_columns -1)))
+ if(n_view_columns && (view_column == m_tree_view.get_column(n_view_columns -1)))
return;
const std::shared_ptr<LayoutItem>& layout_item = m_column_items[model_column_index];
@@ -1609,7 +1609,7 @@ void DbAddDel::on_treeview_columns_changed()
//Get the new column order, and save it in m_column_ids:
m_column_ids.clear();
- for(const auto& vecViewColumn : m_TreeView.get_columns())
+ for(const auto& vecViewColumn : m_tree_view.get_columns())
{
const auto view_column = dynamic_cast<DbTreeViewColumnGlom*>(vecViewColumn);
if(!view_column)
@@ -1669,7 +1669,7 @@ guint DbAddDel::treeview_append_column(const Glib::ustring& title, Gtk::CellRend
//But we must call set_fixed_width() later or we will have a zero-width column.
pViewColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
- auto cols_count = m_TreeView.append_column(*pViewColumn);
+ auto cols_count = m_tree_view.append_column(*pViewColumn);
auto layout_item = m_column_items[model_column_index];
auto layout_item_field = std::dynamic_pointer_cast<const LayoutItem_Field>(layout_item);
@@ -1733,11 +1733,11 @@ guint DbAddDel::treeview_append_column(const Glib::ustring& title, Gtk::CellRend
Glib::RefPtr<Gtk::TreeModel> DbAddDel::get_model()
{
- return m_refListStore;
+ return m_list_store;
}
Glib::RefPtr<const Gtk::TreeModel> DbAddDel::get_model() const
{
- return m_refListStore;
+ return m_list_store;
}
bool DbAddDel::get_is_first_row(const Gtk::TreeModel::iterator& iter) const
@@ -1761,16 +1761,16 @@ bool DbAddDel::get_is_last_row(const Gtk::TreeModel::iterator& iter) const
Gtk::TreeModel::iterator DbAddDel::get_last_row() const
{
- if(m_refListStore)
- return m_refListStore->get_last_row();
+ if(m_list_store)
+ return m_list_store->get_last_row();
else
return Gtk::TreeModel::iterator();
}
Gtk::TreeModel::iterator DbAddDel::get_last_row()
{
- if(m_refListStore)
- return m_refListStore->get_last_row();
+ if(m_list_store)
+ return m_list_store->get_last_row();
else
return Gtk::TreeModel::iterator();
}
@@ -1783,16 +1783,16 @@ Gnome::Gda::Value DbAddDel::get_value_key(const Gtk::TreeModel::iterator& iter)
void DbAddDel::set_value_key(const Gtk::TreeModel::iterator& iter, const Gnome::Gda::Value& value)
{
- if(iter && m_refListStore)
+ if(iter && m_list_store)
{
if(!(Conversions::value_is_empty(value)))
{
//This is not a placeholder anymore, if it every was:
- m_refListStore->set_is_not_placeholder(iter);
+ m_list_store->set_is_not_placeholder(iter);
//row[*m_modelcolumn_placeholder] = false;
}
- m_refListStore->set_key_value(iter, value);
+ m_list_store->set_key_value(iter, value);
}
}
@@ -1803,15 +1803,15 @@ bool DbAddDel::get_is_placeholder_row(const Gtk::TreeModel::iterator& iter) cons
if(!iter)
return false;
- if(!m_refListStore)
+ if(!m_list_store)
return false;
- if(iter == m_refListStore->children().end())
+ if(iter == m_list_store->children().end())
{
return false;
}
- return m_refListStore->get_is_placeholder(iter);
+ return m_list_store->get_is_placeholder(iter);
//Gtk::TreeModel::Row row = *iter;
//return row[*m_modelcolumn_placeholder];
}
@@ -2031,9 +2031,9 @@ void DbAddDel::show_hint_model()
auto iter = m_model_hint->append();
(*iter)[m_columns_hint.m_col_hint] = _("Right-click to layout, to specify the related fields.");
- m_TreeView.set_model(m_model_hint);
- m_TreeView.set_fixed_height_mode(false); //fixed_height mode is incompatible with the default
append_column() helper method.
- m_TreeView.append_column("", m_columns_hint.m_col_hint);
+ m_tree_view.set_model(m_model_hint);
+ m_tree_view.set_fixed_height_mode(false); //fixed_height mode is incompatible with the default
append_column() helper method.
+ m_tree_view.append_column("", m_columns_hint.m_col_hint);
}
bool DbAddDel::start_new_record()
@@ -2393,7 +2393,7 @@ Gtk::TreeModel::iterator DbAddDel::get_row_selected()
void DbAddDel::on_treeview_selection_changed()
{
- auto refSelection = m_TreeView.get_selection();
+ auto refSelection = m_tree_view.get_selection();
if(!refSelection)
return;
@@ -2411,7 +2411,7 @@ void DbAddDel::on_selection_changed(bool selection)
void DbAddDel::treeview_delete_all_columns()
{
- UiUtils::treeview_delete_all_columns(&m_TreeView);
+ UiUtils::treeview_delete_all_columns(&m_tree_view);
//Reset this too, because we must have just deleted it:
m_treeviewcolumn_button = nullptr;
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index fcd433b..d886721 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -381,10 +381,10 @@ private:
typedef Gtk::Box type_base;
//Member widgets:
- Gtk::ScrolledWindow m_ScrolledWindow;
- Gtk::TreeView m_TreeView;
+ Gtk::ScrolledWindow m_scrolled_window;
+ Gtk::TreeView m_tree_view;
- Glib::RefPtr<DbTreeModel> m_refListStore;
+ Glib::RefPtr<DbTreeModel> m_list_store;
//Columns, not including the hidden internal columns:
typedef LayoutGroup::type_list_items type_column_items;
diff --git a/glom/mode_design/fields/combo_fieldtype.cc b/glom/mode_design/fields/combo_fieldtype.cc
index 7290479..e4433d2 100644
--- a/glom/mode_design/fields/combo_fieldtype.cc
+++ b/glom/mode_design/fields/combo_fieldtype.cc
@@ -38,24 +38,24 @@ Combo_FieldType::Combo_FieldType()
void Combo_FieldType::init()
{
- m_refTreeModel = Gtk::ListStore::create(m_Columns);
- set_model(m_refTreeModel);
+ m_tree_model = Gtk::ListStore::create(m_columns);
+ set_model(m_tree_model);
//Set Type choices:
for(const auto& the_pair : Field::get_usable_type_names())
{
- auto iterModel = m_refTreeModel->append();
+ auto iterModel = m_tree_model->append();
if(iterModel)
{
Gtk::TreeModel::Row row = *iterModel;
- row[m_Columns.m_col_name] = the_pair.second;
- row[m_Columns.m_col_type] = the_pair.first;
+ row[m_columns.m_col_name] = the_pair.second;
+ row[m_columns.m_col_type] = the_pair.first;
- //std::cout << "adding combo row: " << row[m_Columns.m_col_name] << ", " << row[m_Columns.m_col_type]
<< std::endl;
+ //std::cout << "adding combo row: " << row[m_columns.m_col_name] << ", " << row[m_columns.m_col_type]
<< std::endl;
}
}
- pack_start(m_Columns.m_col_name); //Show the name, but hide the ID.
+ pack_start(m_columns.m_col_name); //Show the name, but hide the ID.
//The value must be from the list, and it can't be empty:
@@ -64,14 +64,14 @@ void Combo_FieldType::init()
void Combo_FieldType::set_field_type(Field::glom_field_type fieldType)
{
- for(const auto& row : m_refTreeModel->children())
+ for(const auto& row : m_tree_model->children())
{
- if( row[m_Columns.m_col_type] == fieldType )
+ if( row[m_columns.m_col_type] == fieldType )
{
set_active(row);
//TODO: What was this?
- //Glib::ustring temp = row[m_Columns.m_col_name];
+ //Glib::ustring temp = row[m_columns.m_col_name];
//iter
}
}
@@ -86,9 +86,9 @@ Field::glom_field_type Combo_FieldType::get_field_type() const
if(active_row)
{
Gtk::TreeModel::Row row = *active_row;
- result = row[m_Columns.m_col_type];
+ result = row[m_columns.m_col_type];
- Glib::ustring temp = row[m_Columns.m_col_name];
+ Glib::ustring temp = row[m_columns.m_col_name];
}
return result;
diff --git a/glom/mode_design/fields/combo_fieldtype.h b/glom/mode_design/fields/combo_fieldtype.h
index 2a97faf..b158955 100644
--- a/glom/mode_design/fields/combo_fieldtype.h
+++ b/glom/mode_design/fields/combo_fieldtype.h
@@ -55,9 +55,9 @@ private:
Gtk::TreeModelColumn<Field::glom_field_type> m_col_type;
};
- ModelColumns m_Columns;
+ ModelColumns m_columns;
- Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
+ Glib::RefPtr<Gtk::ListStore> m_tree_model;
};
} //namespace Glom
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.cc
b/glom/mode_design/relationships_overview/window_relationships_overview.cc
index cd0fcaa..a89a7de 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.cc
@@ -52,8 +52,8 @@ Window_RelationshipsOverview::Window_RelationshipsOverview(BaseObjectType* cobje
if(button_close)
button_close->signal_clicked().connect( sigc::mem_fun(*this,
&Window_RelationshipsOverview::on_button_close) );
- m_refPageSetup = Gtk::PageSetup::create();
- m_refSettings = Gtk::PrintSettings::create();
+ m_page_setup = Gtk::PageSetup::create();
+ m_settings = Gtk::PrintSettings::create();
//Add a menu:
Gtk::Box* vbox = nullptr;
@@ -330,11 +330,11 @@ void Window_RelationshipsOverview::on_menu_file_page_setup()
{
//Show the page setup dialog, asking it to start with the existing settings:
auto new_page_setup =
- Gtk::run_page_setup_dialog(*this, m_refPageSetup, m_refSettings);
+ Gtk::run_page_setup_dialog(*this, m_page_setup, m_settings);
//Save the chosen page setup dialog for use when printing, previewing, or
//showing the page setup dialog again:
- m_refPageSetup = new_page_setup;
+ m_page_setup = new_page_setup;
}
void Window_RelationshipsOverview::on_menu_view_showgrid(const Glib::VariantBase& /* parameter */)
@@ -369,8 +369,8 @@ void Window_RelationshipsOverview::print_or_preview(Gtk::PrintOperationAction pr
print->set_canvas(&m_canvas);
print->set_track_print_status();
- print->set_default_page_setup(m_refPageSetup);
- print->set_print_settings(m_refSettings);
+ print->set_default_page_setup(m_page_setup);
+ print->set_print_settings(m_settings);
//print->signal_done().connect(sigc::bind(sigc::mem_fun(*this,
// &ExampleWindow::on_printoperation_done), print));
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.h
b/glom/mode_design/relationships_overview/window_relationships_overview.h
index 480b276..89f633e 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.h
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.h
@@ -101,8 +101,8 @@ private:
sigc::connection m_connection_edit_fields, m_connection_edit_relationships;
//Printing:
- Glib::RefPtr<Gtk::PrintSettings> m_refSettings;
- Glib::RefPtr<Gtk::PageSetup> m_refPageSetup;
+ Glib::RefPtr<Gtk::PrintSettings> m_settings;
+ Glib::RefPtr<Gtk::PageSetup> m_page_setup;
};
} //namespace Glom
diff --git a/glom/print_layout/print_layout_utils.cc b/glom/print_layout/print_layout_utils.cc
index 0227dd7..8dc65c1 100644
--- a/glom/print_layout/print_layout_utils.cc
+++ b/glom/print_layout/print_layout_utils.cc
@@ -417,7 +417,7 @@ void do_print_layout(const std::shared_ptr<const PrintLayout>& print_layout, con
print->set_default_page_setup(page_setup);
- //print->set_print_settings(m_refSettings);
+ //print->set_print_settings(m_settings);
//print->signal_done().connect(sigc::bind(sigc::mem_fun(*this,
// &ExampleWindow::on_printoperation_done), print));
diff --git a/glom/utility_widgets/adddel/adddel.cc b/glom/utility_widgets/adddel/adddel.cc
index f7477dc..3ded435 100644
--- a/glom/utility_widgets/adddel/adddel.cc
+++ b/glom/utility_widgets/adddel/adddel.cc
@@ -106,19 +106,19 @@ void AddDel::init()
//set_columns_count(1);
//construct_specified_columns();
- m_ScrolledWindow.add(m_TreeView);
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_IN);
- m_TreeView.show();
- pack_start(m_ScrolledWindow);
+ m_scrolled_window.add(m_tree_view);
+ m_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window.set_shadow_type(Gtk::SHADOW_IN);
+ m_tree_view.show();
+ pack_start(m_scrolled_window);
//Make sure that the TreeView doesn't start out only big enough for zero items.
- m_TreeView.set_size_request(-1, 150);
+ m_tree_view.set_size_request(-1, 150);
- //m_TreeView.add_events(Gdk::BUTTON_PRESS_MASK); //Allow us to catch button_press_event and
button_release_event
- m_TreeView.signal_button_press_event().connect_notify( sigc::mem_fun(*this,
&AddDel::on_treeview_button_press_event) );
+ //m_tree_view.add_events(Gdk::BUTTON_PRESS_MASK); //Allow us to catch button_press_event and
button_release_event
+ m_tree_view.signal_button_press_event().connect_notify( sigc::mem_fun(*this,
&AddDel::on_treeview_button_press_event) );
- m_TreeView.signal_columns_changed().connect( sigc::mem_fun(*this, &AddDel::on_treeview_columns_changed) );
+ m_tree_view.signal_columns_changed().connect( sigc::mem_fun(*this, &AddDel::on_treeview_columns_changed) );
//add_blank();
setup_menu(this);
@@ -135,7 +135,7 @@ void AddDel::init()
void AddDel::set_treeview_accessible_name(const Glib::ustring& name)
{
#ifdef GTKMM_ATKMM_ENABLED
- m_TreeView.get_accessible()->set_name(name);
+ m_tree_view.get_accessible()->set_name(name);
#endif
}
@@ -159,7 +159,7 @@ void AddDel::warn_about_duplicate()
void
AddDel::on_MenuPopup_activate_Edit()
{
- auto refSelection = m_TreeView.get_selection();
+ auto refSelection = m_tree_view.get_selection();
if(refSelection)
{
auto iter = refSelection->get_selected();
@@ -205,7 +205,7 @@ void AddDel::on_MenuPopup_activate_Delete()
{
finish_editing();
- auto refSelection = m_TreeView.get_selection();
+ auto refSelection = m_tree_view.get_selection();
if(refSelection)
{
auto iter = refSelection->get_selected();
@@ -280,7 +280,7 @@ Gtk::TreeModel::iterator AddDel::get_item_placeholder()
Gtk::TreeModel::iterator AddDel::add_item_placeholder()
{
- auto iter = m_refListStore->append();
+ auto iter = m_list_store->append();
if(iter)
{
iter->set_value(m_col_key, Glib::ustring("")); //Remove temporary key value.
@@ -313,13 +313,13 @@ void AddDel::remove_all()
{
InnerIgnore innerIgnore(this); //see comments for InnerIgnore class.
- if(m_refListStore)
+ if(m_list_store)
{
- auto iter = m_refListStore->children().begin();
+ auto iter = m_list_store->children().begin();
while(iter)
{
- m_refListStore->erase(iter);
- iter = m_refListStore->children().begin();
+ m_list_store->erase(iter);
+ iter = m_list_store->children().begin();
}
}
}
@@ -329,7 +329,7 @@ Glib::ustring AddDel::get_value(const Gtk::TreeModel::iterator& iter, guint col)
{
Glib::ustring value;
- if(m_refListStore)
+ if(m_list_store)
{
Gtk::TreeModel::Row treerow = *iter;
@@ -337,7 +337,7 @@ Glib::ustring AddDel::get_value(const Gtk::TreeModel::iterator& iter, guint col)
{
const guint col_real = col;
//Get different types of data, depending on the column:
- if(m_ColumnTypes[col_real].m_style == AddDelColumnInfo::enumStyles::Boolean)
+ if(m_column_types[col_real].m_style == AddDelColumnInfo::enumStyles::Boolean)
{
bool bool_value = false;
treerow.get_value(col_real, bool_value);
@@ -376,18 +376,18 @@ Glib::ustring AddDel::get_value_selected(guint col)
Gtk::TreeModel::iterator AddDel::get_item_selected()
{
- auto refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_tree_view.get_selection();
if(refTreeSelection)
{
return refTreeSelection->get_selected();
}
- return m_refListStore->children().end();
+ return m_list_store->children().end();
}
Gtk::TreeModel::iterator AddDel::get_row(const Glib::ustring& key)
{
- for(auto iter = m_refListStore->children().begin(); iter != m_refListStore->children().end(); ++iter)
+ for(auto iter = m_list_store->children().begin(); iter != m_list_store->children().end(); ++iter)
{
const auto strTemp = get_value(iter, m_col_key);
if(strTemp == key)
@@ -396,7 +396,7 @@ Gtk::TreeModel::iterator AddDel::get_row(const Glib::ustring& key)
}
}
- return m_refListStore->children().end();
+ return m_list_store->children().end();
}
bool AddDel::select_item(const Gtk::TreeModel::iterator& iter)
@@ -408,7 +408,7 @@ bool AddDel::select_item(const Gtk::TreeModel::iterator& iter)
bool AddDel::select_item(const Gtk::TreeModel::iterator& iter, guint column, bool start_editing)
{
- if(!m_refListStore)
+ if(!m_list_store)
return false;
InnerIgnore innerIgnore(this); //see comments for InnerIgnore class
@@ -417,20 +417,20 @@ bool AddDel::select_item(const Gtk::TreeModel::iterator& iter, guint column, boo
if(iter)
{
- auto refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_tree_view.get_selection();
if(refTreeSelection)
{
refTreeSelection->select(iter);
- Gtk::TreeModel::Path path = m_refListStore->get_path(iter);
+ Gtk::TreeModel::Path path = m_list_store->get_path(iter);
guint view_column_index = 0;
bool test = get_view_column_index(column, view_column_index);
if(test)
{
- auto pColumn = m_TreeView.get_column(view_column_index);
+ auto pColumn = m_tree_view.get_column(view_column_index);
if(pColumn)
- m_TreeView.set_cursor(path, *pColumn, start_editing);
+ m_tree_view.set_cursor(path, *pColumn, start_editing);
else
g_warning("AddDel::select_item:TreeViewColumn not found.");
}
@@ -457,10 +457,10 @@ bool AddDel::select_item(const Glib::ustring& strItemText, guint column, bool st
guint AddDel::get_count() const
{
- if(!m_refListStore)
+ if(!m_list_store)
return 0;
- guint iCount = m_refListStore->children().size();
+ guint iCount = m_list_store->children().size();
//Take account of the extra blank for new entries:
if(get_allow_user_actions()) //If it has the extra row.
@@ -501,13 +501,13 @@ void AddDel::add_blank()
guint AddDel::get_columns_count() const
{
- return m_TreeView.get_columns().size();
+ return m_tree_view.get_columns().size();
}
/*
void AddDel::set_columns_count(guint count)
{
- m_ColumnTypes.resize(count, enumStyles::Text);
+ m_column_types.resize(count, enumStyles::Text);
m_vecColumnNames.resize(count);
}
*/
@@ -518,7 +518,7 @@ void AddDel::set_column_title(guint col, const Glib::ustring& strText)
bool bPreventUserSignals = get_prevent_user_signals();
set_prevent_user_signals(true);
- auto pColumn = m_TreeView.get_column(col);
+ auto pColumn = m_tree_view.get_column(col);
if(pColumn)
pColumn->set_title(strText);
@@ -533,18 +533,18 @@ void AddDel::construct_specified_columns()
//Delay actual use of set_column_*() stuff until this method is called.
- if(m_ColumnTypes.empty())
+ if(m_column_types.empty())
return;
typedef std::vector< Gtk::TreeModelColumnBase* > type_vecModelColumns;
- type_vecModelColumns vecModelColumns(m_ColumnTypes.size(), 0);
+ type_vecModelColumns vecModelColumns(m_column_types.size(), 0);
//Create the Gtk ColumnRecord:
Gtk::TreeModel::ColumnRecord record;
{
type_vecModelColumns::size_type i = 0;
- for(const auto& column_info : m_ColumnTypes)
+ for(const auto& column_info : m_column_types)
{
Gtk::TreeModelColumnBase* pModelColumn = nullptr;
@@ -577,23 +577,23 @@ void AddDel::construct_specified_columns()
}
//Create the model from the ColumnRecord:
- m_refListStore = Gtk::ListStore::create(record);
- m_TreeView.set_model(m_refListStore);
+ m_list_store = Gtk::ListStore::create(record);
+ m_tree_view.set_model(m_list_store);
//Remove all View columns:
- UiUtils::treeview_delete_all_columns(&m_TreeView);
+ UiUtils::treeview_delete_all_columns(&m_tree_view);
//Add new View Colums:
int model_column_index = 0;
int view_column_index = 0;
for(const auto& pModelColumn : vecModelColumns)
{
- if(m_ColumnTypes[model_column_index].m_visible)
+ if(m_column_types[model_column_index].m_visible)
{
- const Glib::ustring column_name = m_ColumnTypes[model_column_index].m_name;
- const Glib::ustring column_id = m_ColumnTypes[model_column_index].m_id;
+ const Glib::ustring column_name = m_column_types[model_column_index].m_name;
+ const Glib::ustring column_id = m_column_types[model_column_index].m_id;
- switch(m_ColumnTypes[model_column_index].m_style)
+ switch(m_column_types[model_column_index].m_style)
{
case(AddDelColumnInfo::enumStyles::Choices):
{
@@ -601,7 +601,7 @@ void AddDel::construct_specified_columns()
auto pCellRendererList = Gtk::manage( new CellRendererList() );
//Add the choices:
- for(const auto& item : m_ColumnTypes[model_column_index].m_choices)
+ for(const auto& item : m_column_types[model_column_index].m_choices)
{
pCellRendererList->append_list_item(item);
}
@@ -640,9 +640,9 @@ void AddDel::construct_specified_columns()
}
} //switch
- if(m_ColumnTypes[model_column_index].m_editable)
+ if(m_column_types[model_column_index].m_editable)
{
- auto pCellRendererText =
dynamic_cast<Gtk::CellRendererText*>(m_TreeView.get_column_cell_renderer(view_column_index));
+ auto pCellRendererText =
dynamic_cast<Gtk::CellRendererText*>(m_tree_view.get_column_cell_renderer(view_column_index));
if(pCellRendererText)
{
//Connect a signal handler:
@@ -658,7 +658,7 @@ void AddDel::construct_specified_columns()
}
else
{
- auto pCellRendererToggle =
dynamic_cast<Gtk::CellRendererToggle*>(m_TreeView.get_column_cell_renderer(view_column_index));
+ auto pCellRendererToggle =
dynamic_cast<Gtk::CellRendererToggle*>(m_tree_view.get_column_cell_renderer(view_column_index));
if(pCellRendererToggle)
{
pCellRendererToggle->property_activatable() = true;
@@ -671,7 +671,7 @@ void AddDel::construct_specified_columns()
}
//Connect other signals:
- auto pCellRenderer = m_TreeView.get_column_cell_renderer(view_column_index);
+ auto pCellRenderer = m_tree_view.get_column_cell_renderer(view_column_index);
if(pCellRenderer)
pCellRenderer->signal_editing_started().connect(
sigc::bind( sigc::mem_fun(*this, &AddDel::on_treeview_cell_editing_started), model_column_index) );
@@ -686,9 +686,9 @@ void AddDel::construct_specified_columns()
model_column_index = 0;
for(auto& pModelColumn : vecModelColumns)
{
- if(model_column_index < (int)m_ColumnTypes.size())
+ if(model_column_index < (int)m_column_types.size())
{
- AddDelColumnInfo::enumStyles style = m_ColumnTypes[model_column_index].m_style;
+ AddDelColumnInfo::enumStyles style = m_column_types[model_column_index].m_style;
switch(style)
{
//Cast it to the derived type, so we can delete it properly.
@@ -723,14 +723,14 @@ void AddDel::construct_specified_columns()
++model_column_index;
}
- m_TreeView.columns_autosize();
+ m_tree_view.columns_autosize();
}
/*
void AddDel::set_value(const Gtk::TreeModel::iterator& iter, guint col, const Gnome::Gda::Value& value)
{
//Different model columns have different types of data:
- switch(m_ColumnTypes[col].m_style)
+ switch(m_column_types[col].m_style)
{
case(AddDelColumnInfo::enumStyles::Boolean):
{
@@ -740,7 +740,7 @@ void AddDel::set_value(const Gtk::TreeModel::iterator& iter, guint col, const Gn
}
default:
{
- set_value( iter, col, Conversions::get_text_for_gda_value(m_ColumnTypes[col].m_field_type, value) );
+ set_value( iter, col, Conversions::get_text_for_gda_value(m_column_types[col].m_field_type, value) );
break;
}
}
@@ -751,7 +751,7 @@ void AddDel::set_value(const Gtk::TreeModel::iterator& iter, guint col, const Gl
{
InnerIgnore innerIgnore(this);
- if(!m_refListStore)
+ if(!m_list_store)
std::cerr << G_STRFUNC << ": No model.\n";
else
{
@@ -759,7 +759,7 @@ void AddDel::set_value(const Gtk::TreeModel::iterator& iter, guint col, const Gl
if(treerow)
{
//Different model columns have different types of data:
- switch(m_ColumnTypes[col].m_style)
+ switch(m_column_types[col].m_style)
{
case(AddDelColumnInfo::enumStyles::Boolean):
{
@@ -801,7 +801,7 @@ void AddDel::set_value(const Gtk::TreeModel::iterator& iter, guint col, bool val
{
InnerIgnore innerIgnore(this);
- if(!m_refListStore)
+ if(!m_list_store)
std::cerr << G_STRFUNC << ": No model.\n";
else
{
@@ -809,7 +809,7 @@ void AddDel::set_value(const Gtk::TreeModel::iterator& iter, guint col, bool val
if(treerow)
{
//Different model columns have different types of data:
- switch(m_ColumnTypes[col].m_style)
+ switch(m_column_types[col].m_style)
{
case(AddDelColumnInfo::enumStyles::Boolean):
{
@@ -839,7 +839,7 @@ void AddDel::set_value_selected(guint col, const Gnome::Gda::Value& value)
void AddDel::remove_all_columns()
{
- m_ColumnTypes.clear();
+ m_column_types.clear();
//Add the hidden key.ID columns
//Make these visible (with true) if you want to debug problems.
@@ -849,15 +849,15 @@ void AddDel::remove_all_columns()
guint AddDel::add_column(const AddDelColumnInfo& column_info)
{
- m_ColumnTypes.emplace_back(column_info);
+ m_column_types.emplace_back(column_info);
//Generate appropriate model columns:
construct_specified_columns();
//Tell the View to use the model:
- //m_TreeView.set_model(m_refListStore);
+ //m_tree_view.set_model(m_list_store);
- return m_ColumnTypes.size()-1;
+ return m_column_types.size()-1;
}
guint AddDel::add_column(const Glib::ustring& strTitle, AddDelColumnInfo::enumStyles style, bool editable,
bool visible)
@@ -883,8 +883,8 @@ guint AddDel::add_column(const Glib::ustring& strTitle, const Glib::ustring& col
Glib::ustring AddDel::get_column_field(guint column_index) const
{
Glib::ustring result;
- if(column_index < m_ColumnTypes.size())
- result = m_ColumnTypes[column_index].m_id;
+ if(column_index < m_column_types.size())
+ result = m_column_types[column_index].m_id;
return result;
}
@@ -903,13 +903,13 @@ void AddDel::set_column_choices(guint col, const type_vec_strings& vecStrings)
{
InnerIgnore innerIgnore(this); //Stop on_treeview_columns_changed() from doing anything when it is called
just because we add new columns.
- m_ColumnTypes[col].m_choices = vecStrings;
+ m_column_types[col].m_choices = vecStrings;
guint view_column_index = 0;
bool test = get_view_column_index(col, view_column_index);
if(test)
{
- auto pCellRenderer = dynamic_cast<CellRendererList*>(
m_TreeView.get_column_cell_renderer(view_column_index) );
+ auto pCellRenderer = dynamic_cast<CellRendererList*>(
m_tree_view.get_column_cell_renderer(view_column_index) );
if(pCellRenderer)
{
//Add the choices:
@@ -1001,7 +1001,7 @@ void AddDel::reactivate()
void AddDel::remove_item(const Gtk::TreeModel::iterator& iter)
{
if(iter)
- m_refListStore->erase(iter);
+ m_list_store->erase(iter);
}
void AddDel::remove_item_by_key(const Glib::ustring& strKey)
@@ -1042,7 +1042,7 @@ Glib::ustring AddDel::treeview_get_key(const Gtk::TreeModel::iterator& row)
{
Glib::ustring value;
- if(m_refListStore)
+ if(m_list_store)
{
Gtk::TreeModel::Row treerow = *row;
@@ -1061,7 +1061,7 @@ void AddDel::on_treeview_cell_edited_bool(const Glib::ustring& path_string, int
Gtk::TreeModel::Path path(path_string);
//Get the row from the path:
- auto iter = m_refListStore->get_iter(path);
+ auto iter = m_list_store->get_iter(path);
if(iter)
{
Gtk::TreeModel::Row row = *iter;
@@ -1080,7 +1080,7 @@ void AddDel::on_treeview_cell_edited_bool(const Glib::ustring& path_string, int
bool bIsAdd = false;
bool bIsChange = false;
- int iCount = m_refListStore->children().size();
+ int iCount = m_list_store->children().size();
if(iCount)
{
if(get_allow_user_actions()) //If add is possible:
@@ -1136,7 +1136,7 @@ void AddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const Gli
Gtk::TreeModel::Path path(path_string);
//Get the row from the path:
- auto iter = m_refListStore->get_iter(path);
+ auto iter = m_list_store->get_iter(path);
if(iter != get_model()->children().end())
{
Gtk::TreeModel::Row row = *iter;
@@ -1197,7 +1197,7 @@ void AddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const Gli
{
bool do_signal = true;
- const Field::glom_field_type field_type = m_ColumnTypes[model_column_index].m_field_type;
+ const Field::glom_field_type field_type = m_column_types[model_column_index].m_field_type;
if(field_type != Field::glom_field_type::INVALID) //If a field type was specified for this column.
{
//Make sure that the entered data is suitable for this field type:
@@ -1217,14 +1217,14 @@ void AddDel::on_treeview_cell_edited(const Glib::ustring& path_string, const Gli
{
//Reactivate the cell so that the data can be corrected.
- auto refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_tree_view.get_selection();
if(refTreeSelection)
{
refTreeSelection->select(row); //TODO: This does not seem to work.
- Gtk::TreeModel::Path path_to_activate = m_refListStore->get_path(row);
- auto pColumn = m_TreeView.get_column(model_column_index); //TODO: This might the the view
column index, not the model column index.
- m_TreeView.set_cursor(path_to_activate, *pColumn, true /* start_editing */); //This
highlights the cell, but does not seem to actually start the editing.
+ Gtk::TreeModel::Path path_to_activate = m_list_store->get_path(row);
+ auto pColumn = m_tree_view.get_column(model_column_index); //TODO: This might the the view
column index, not the model column index.
+ m_tree_view.set_cursor(path_to_activate, *pColumn, true /* start_editing */); //This
highlights the cell, but does not seem to actually start the editing.
}
}
@@ -1250,10 +1250,10 @@ void AddDel::on_treeview_cell_editing_started(Gtk::CellEditable* /* editable */,
{
Gtk::TreeModel::Path path(path_string);
- if(!m_refListStore)
+ if(!m_list_store)
return;
- auto iterRow = m_refListStore->get_iter(path);
+ auto iterRow = m_list_store->get_iter(path);
if(iterRow)
signal_user_activated().emit(iterRow, model_column_index);
}
@@ -1302,7 +1302,7 @@ guint AddDel::treeview_append_column(const Glib::ustring& title, Gtk::CellRender
{
auto pViewColumn = Gtk::manage( new TreeViewColumnGlom(title, cellrenderer) );
pViewColumn->set_renderer(cellrenderer, model_column); //render it via the default "text" property.
- auto cols_count = m_TreeView.append_column(*pViewColumn);
+ auto cols_count = m_tree_view.append_column(*pViewColumn);
//Allow the column to be reordered by dragging and dropping the column header:
pViewColumn->set_reorderable();
@@ -1327,7 +1327,7 @@ void AddDel::on_treeview_columns_changed()
//Get the new column order, and save it in m_column_ids:
m_column_ids.clear();
- for(const auto& item : m_TreeView.get_columns())
+ for(const auto& item : m_tree_view.get_columns())
{
auto pViewColumn = dynamic_cast<TreeViewColumnGlom*>(item);
if(pViewColumn)
@@ -1350,11 +1350,11 @@ void AddDel::set_auto_add(bool value)
Glib::RefPtr<Gtk::TreeModel> AddDel::get_model()
{
- return m_refListStore;
+ return m_list_store;
}
Glib::RefPtr<const Gtk::TreeModel> AddDel::get_model() const
{
- return m_refListStore;
+ return m_list_store;
}
bool AddDel::get_is_first_row(const Gtk::TreeModel::iterator& iter) const
@@ -1371,7 +1371,7 @@ Gtk::TreeModel::iterator AddDel::get_next_available_row_with_add_if_necessary()
{
Gtk::TreeModel::iterator result;
- if(!m_refListStore)
+ if(!m_list_store)
return result;
bool bPreventUserSignals = get_prevent_user_signals();
@@ -1391,18 +1391,18 @@ Gtk::TreeModel::iterator AddDel::get_next_available_row_with_add_if_necessary()
else
{
// The last line isn't blank, so we cannot use it. Add another one.
- result = m_refListStore->append();
+ result = m_list_store->append();
}
}
else
{
// This is the first line.
- result = m_refListStore->append();
+ result = m_list_store->append();
}
}
else
{
- result = m_refListStore->append(); //Add a new blank line. There are no blank lines.
+ result = m_list_store->append(); //Add a new blank line. There are no blank lines.
}
set_prevent_user_signals(bPreventUserSignals);
@@ -1467,7 +1467,7 @@ bool AddDel::get_is_placeholder_row(const Gtk::TreeModel::iterator& iter) const
if(!get_is_last_row(iter))
return false;
- if(iter == m_refListStore->children().end())
+ if(iter == m_list_store->children().end())
return false;
bool val = false;
@@ -1482,7 +1482,7 @@ bool AddDel::get_model_column_index(guint view_column_index, guint& model_column
model_column_index = 0;
const auto hidden = get_count_hidden_system_columns();
- const auto count = m_ColumnTypes.size();
+ const auto count = m_column_types.size();
if(hidden > count)
return false; //This should never happen.
@@ -1499,10 +1499,10 @@ bool AddDel::get_view_column_index(guint model_column_index, guint& view_column_
//Initialize output parameter:
view_column_index = 0;
- if(model_column_index >= m_ColumnTypes.size())
+ if(model_column_index >= m_column_types.size())
return false;
- if( !(m_ColumnTypes[model_column_index].m_visible) )
+ if( !(m_column_types[model_column_index].m_visible) )
return false;
view_column_index = model_column_index - get_count_hidden_system_columns(); //There are 2 hidden columns
at the start.
@@ -1513,10 +1513,10 @@ bool AddDel::get_view_column_index(guint model_column_index, guint& view_column_
guint AddDel::get_count_hidden_system_columns()
{
guint hidden_count = 0;
- if(!(m_ColumnTypes[m_col_key].m_visible))
+ if(!(m_column_types[m_col_key].m_visible))
++hidden_count;
- if(!(m_ColumnTypes[m_col_placeholder].m_visible))
+ if(!(m_column_types[m_col_placeholder].m_visible))
++hidden_count;
return hidden_count;
@@ -1524,8 +1524,8 @@ guint AddDel::get_count_hidden_system_columns()
void AddDel::prevent_duplicates(guint column_number)
{
- if(column_number < m_ColumnTypes.size())
- m_ColumnTypes[column_number].m_prevent_duplicates = true;
+ if(column_number < m_column_types.size())
+ m_column_types[column_number].m_prevent_duplicates = true;
}
void AddDel::set_prevent_duplicates_warning(const Glib::ustring& warning_text)
@@ -1535,10 +1535,10 @@ void AddDel::set_prevent_duplicates_warning(const Glib::ustring& warning_text)
bool AddDel::row_has_duplicates(const Gtk::TreeModel::iterator& iter) const
{
- const auto cols_count = m_ColumnTypes.size();
+ const auto cols_count = m_column_types.size();
for(type_ColumnTypes::size_type col = 0; col < cols_count; ++col)
{
- if(m_ColumnTypes[col].m_prevent_duplicates)
+ if(m_column_types[col].m_prevent_duplicates)
{
Gtk::TreeModel::Row row = *iter;
@@ -1551,17 +1551,17 @@ bool AddDel::row_has_duplicates(const Gtk::TreeModel::iterator& iter) const
bool value_bool = false;
int value_int = 0;
- if(m_ColumnTypes[col].m_style == AddDelColumnInfo::enumStyles::Text)
+ if(m_column_types[col].m_style == AddDelColumnInfo::enumStyles::Text)
row.get_value(col, value_text);
- else if(m_ColumnTypes[col].m_style == AddDelColumnInfo::enumStyles::Boolean)
+ else if(m_column_types[col].m_style == AddDelColumnInfo::enumStyles::Boolean)
row.get_value(col, value_bool);
- else if(m_ColumnTypes[col].m_style == AddDelColumnInfo::enumStyles::Numerical)
+ else if(m_column_types[col].m_style == AddDelColumnInfo::enumStyles::Numerical)
row.get_value(col, value_int);
//std::cout << "value_text=" << value_text << std::endl;
//Look at each other row to see whether the value exists there already:
- for(auto iterCheck = m_refListStore->children().begin(); iterCheck !=
m_refListStore->children().end(); ++iterCheck)
+ for(auto iterCheck = m_list_store->children().begin(); iterCheck != m_list_store->children().end();
++iterCheck)
{
if(iterCheck != iter) //Don't compare the row with itself
{
@@ -1578,7 +1578,7 @@ bool AddDel::row_has_duplicates(const Gtk::TreeModel::iterator& iter) const
bool check_value_bool = false;
int check_value_int = 0;
- if(m_ColumnTypes[col].m_style == AddDelColumnInfo::enumStyles::Text)
+ if(m_column_types[col].m_style == AddDelColumnInfo::enumStyles::Text)
{
check_row.get_value(col, check_value_text);
@@ -1587,13 +1587,13 @@ bool AddDel::row_has_duplicates(const Gtk::TreeModel::iterator& iter) const
if(check_value_text == value_text)
return true;
}
- else if(m_ColumnTypes[col].m_style == AddDelColumnInfo::enumStyles::Boolean)
+ else if(m_column_types[col].m_style == AddDelColumnInfo::enumStyles::Boolean)
{
check_row.get_value(col, check_value_bool);
if(check_value_text == value_text)
return true;
}
- else if(m_ColumnTypes[col].m_style == AddDelColumnInfo::enumStyles::Numerical)
+ else if(m_column_types[col].m_style == AddDelColumnInfo::enumStyles::Numerical)
{
check_row.get_value(col, check_value_int);
if(check_value_text == value_text)
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index 739932c..5c6e550 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -277,19 +277,19 @@ private:
typedef Gtk::Box type_base;
//Member widgets:
- Gtk::ScrolledWindow m_ScrolledWindow;
+ Gtk::ScrolledWindow m_scrolled_window;
protected:
- Gtk::TreeView m_TreeView;
+ Gtk::TreeView m_tree_view;
private:
- Gtk::TreeModel::ColumnRecord m_ColumnRecord;
- Glib::RefPtr<Gtk::ListStore> m_refListStore;
+ Gtk::TreeModel::ColumnRecord m_column_record;
+ Glib::RefPtr<Gtk::ListStore> m_list_store;
guint m_col_key; //The index of the hidden model column.
guint m_col_placeholder; //The index of the placeholder-marker model column.
typedef std::vector<AddDelColumnInfo> type_ColumnTypes;
- type_ColumnTypes m_ColumnTypes;
+ type_ColumnTypes m_column_types;
bool m_allow_user_actions;
diff --git a/glom/utility_widgets/adddel/adddel_withbuttons.cc
b/glom/utility_widgets/adddel/adddel_withbuttons.cc
index e8dcd53..da9c3d4 100644
--- a/glom/utility_widgets/adddel/adddel_withbuttons.cc
+++ b/glom/utility_widgets/adddel/adddel_withbuttons.cc
@@ -97,7 +97,7 @@ void AddDel_WithButtons::on_button_edit()
void AddDel_WithButtons::on_button_extra()
{
- auto refSelection = m_TreeView.get_selection();
+ auto refSelection = m_tree_view.get_selection();
if(!refSelection)
return;
diff --git a/glom/utility_widgets/cellrendererlist.cc b/glom/utility_widgets/cellrendererlist.cc
index 3ea9729..b5fa836 100644
--- a/glom/utility_widgets/cellrendererlist.cc
+++ b/glom/utility_widgets/cellrendererlist.cc
@@ -28,21 +28,21 @@ CellRendererList::CellRendererList()
: Glib::ObjectBase(nullptr) //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
//TODO: This should not be necessary - our gtkmm callbacks are somehow preventing the popup from
appearing.
{
- m_refModel = Gtk::ListStore::create(m_model_columns);
- property_model() = m_refModel;
- property_text_column() = 0; //This must be a text column, in m_refModel.
+ m_model = Gtk::ListStore::create(m_model_columns);
+ property_model() = m_model;
+ property_text_column() = 0; //This must be a text column, in m_model.
property_editable() = true; //It would be useless if we couldn't edit it.
}
void CellRendererList::remove_all_list_items()
{
- if(m_refModel)
- m_refModel->clear();
+ if(m_model)
+ m_model->clear();
}
void CellRendererList::append_list_item(const Glib::ustring& text)
{
- Gtk::TreeModel::Row row = *(m_refModel->append());
+ Gtk::TreeModel::Row row = *(m_model->append());
row[m_model_columns.m_col_choice] = text;
}
diff --git a/glom/utility_widgets/cellrendererlist.h b/glom/utility_widgets/cellrendererlist.h
index d474ac2..3b83a5e 100644
--- a/glom/utility_widgets/cellrendererlist.h
+++ b/glom/utility_widgets/cellrendererlist.h
@@ -55,7 +55,7 @@ private:
ModelColumns m_model_columns;
- Glib::RefPtr<Gtk::ListStore> m_refModel;
+ Glib::RefPtr<Gtk::ListStore> m_model;
};
} //namespace Glom
diff --git a/glom/utility_widgets/flowtable.h b/glom/utility_widgets/flowtable.h
index 82a1f8a..115eee3 100644
--- a/glom/utility_widgets/flowtable.h
+++ b/glom/utility_widgets/flowtable.h
@@ -68,7 +68,7 @@ private:
bool m_design_mode;
//For drawing:
- Glib::RefPtr<Gdk::Window> m_refGdkWindow;
+ Glib::RefPtr<Gdk::Window> m_gdk_window;
//We remember the Boxes so we can delete them when the are no longer used.
typedef std::list<Gtk::Box*> type_list_hboxes;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
