[glom/gtkmm4v4: 25/37] gtkmm4: Base_DB_Table_Data_ReadOnly: get_primary_key_value(): Use const_iterator.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/gtkmm4v4: 25/37] gtkmm4: Base_DB_Table_Data_ReadOnly: get_primary_key_value(): Use const_iterator.
- Date: Wed, 15 Mar 2017 14:56:04 +0000 (UTC)
commit 5f8cefbee0680ffe00273f082f627fd4cc5b4a83
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Mar 15 10:08:07 2017 +0100
gtkmm4: Base_DB_Table_Data_ReadOnly: get_primary_key_value(): Use const_iterator.
glom/base_db_table_data_readonly.h | 2 +-
glom/import_csv/dialog_import_csv_progress.cc | 2 +-
glom/import_csv/dialog_import_csv_progress.h | 2 +-
glom/mode_data/box_data_calendar_related.cc | 2 +-
glom/mode_data/box_data_calendar_related.h | 2 +-
glom/mode_data/box_data_details.cc | 2 +-
glom/mode_data/box_data_details.h | 2 +-
glom/mode_data/box_data_list.cc | 2 +-
glom/mode_data/box_data_list.h | 2 +-
glom/mode_data/box_data_list_related.cc | 2 +-
glom/mode_data/box_data_list_related.h | 2 +-
glom/mode_data/db_adddel/db_adddel.cc | 2 +-
glom/mode_data/db_adddel/db_adddel.h | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/glom/base_db_table_data_readonly.h b/glom/base_db_table_data_readonly.h
index 7485280..fde941e 100644
--- a/glom/base_db_table_data_readonly.h
+++ b/glom/base_db_table_data_readonly.h
@@ -48,7 +48,7 @@ protected:
//or the primary key value as it is entered in the UI, even before a record exists,
//or both.
virtual Gnome::Gda::Value get_primary_key_value_selected() const = 0;
- virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const = 0;
+ virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const = 0;
FoundSet m_found_set;
diff --git a/glom/import_csv/dialog_import_csv_progress.cc b/glom/import_csv/dialog_import_csv_progress.cc
index 54ca591..69fa1c5 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -295,7 +295,7 @@ void Dialog_Import_CSV_Progress::set_primary_key_value(const Gtk::TreeModel::ite
//throw std::logic_error("Dialog_Import_CSV_Progress::set_primary_key_value() called");
}
-Gnome::Gda::Value Dialog_Import_CSV_Progress::get_primary_key_value(const Gtk::TreeModel::iterator& /* row
*/) const
+Gnome::Gda::Value Dialog_Import_CSV_Progress::get_primary_key_value(const Gtk::TreeModel::const_iterator& /*
row */) const
{
throw std::logic_error("Dialog_Import_CSV_Progress::get_primary_key_value() called");
}
diff --git a/glom/import_csv/dialog_import_csv_progress.h b/glom/import_csv/dialog_import_csv_progress.h
index 660a440..d145632 100644
--- a/glom/import_csv/dialog_import_csv_progress.h
+++ b/glom/import_csv/dialog_import_csv_progress.h
@@ -63,7 +63,7 @@ private:
std::shared_ptr<Field> get_field_primary_key() const override; // from Base_DB_Table_Data
Gnome::Gda::Value get_primary_key_value_selected() const override; // from Base_DB_Table_Data
void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
// from Base_DB_Table_Data
- Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override; // from
Base_DB_Table_Data
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const override; // from
Base_DB_Table_Data
std::shared_ptr<Field> m_field_primary_key;
Dialog_Import_CSV* m_data_source;
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index 54d80f0..a5ff820 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -555,7 +555,7 @@ void Box_Data_Calendar_Related::on_MenuPopup_activate_layout()
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-Gnome::Gda::Value Box_Data_Calendar_Related::get_primary_key_value(const Gtk::TreeModel::iterator& /* row
*/) const
+Gnome::Gda::Value Box_Data_Calendar_Related::get_primary_key_value(const Gtk::TreeModel::const_iterator& /*
row */) const
{
return Gnome::Gda::Value(); //TODO: m_AddDel.get_value_key(row);
}
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index 3a1e740..339c26f 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -61,7 +61,7 @@ private:
//Implementations of pure virtual methods from Base_DB_Table_Data:
Gnome::Gda::Value get_primary_key_value_selected() const override;
- Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const override;
#ifndef GLOM_ENABLE_CLIENT_ONLY
Dialog_Layout* create_layout_dialog() const override;
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index c03cd19..3a5ddf1 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -152,7 +152,7 @@ Box_Data_Details::~Box_Data_Details()
remove_view(&m_FlowTable);
}
-Gnome::Gda::Value Box_Data_Details::get_primary_key_value(const Gtk::TreeModel::iterator& /* row */) const
+Gnome::Gda::Value Box_Data_Details::get_primary_key_value(const Gtk::TreeModel::const_iterator& /* row */)
const
{
return get_primary_key_value_selected();
}
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index 41c0f5c..d4cdf8c 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -80,7 +80,7 @@ public:
protected:
void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
- Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override; //Actual
primary key value of this record.
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const override;
//Actual primary key value of this record.
Gnome::Gda::Value get_entered_field_data(const LayoutItem_Field& field) const override;
void set_entered_field_data(const LayoutItem_Field& field, const Gnome::Gda::Value& value) override;
diff --git a/glom/mode_data/box_data_list.cc b/glom/mode_data/box_data_list.cc
index 60cba49..ef7ad7d 100644
--- a/glom/mode_data/box_data_list.cc
+++ b/glom/mode_data/box_data_list.cc
@@ -305,7 +305,7 @@ void Box_Data_List::on_details_record_deleted(const Gnome::Gda::Value& primary_k
}
}
-Gnome::Gda::Value Box_Data_List::get_primary_key_value(const Gtk::TreeModel::iterator& row) const
+Gnome::Gda::Value Box_Data_List::get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const
{
return m_AddDel.get_value_key(row);
}
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index c4fb7b6..949f1bf 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -77,7 +77,7 @@ public:
protected:
//Implementations of pure virtual methods from Base_DB_Table_Data:
- Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const override;
//Overrides of functions from Box_Data:
void create_layout() override;
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index 0315b5b..697e0c6 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -177,7 +177,7 @@ bool Box_Data_List_Related::fill_from_database()
return result;
}
-Gnome::Gda::Value Box_Data_List_Related::get_primary_key_value(const Gtk::TreeModel::iterator& row) const
+Gnome::Gda::Value Box_Data_List_Related::get_primary_key_value(const Gtk::TreeModel::const_iterator& row)
const
{
return m_AddDel.get_value_key(row);
}
diff --git a/glom/mode_data/box_data_list_related.h b/glom/mode_data/box_data_list_related.h
index b46fa7f..588f6a2 100644
--- a/glom/mode_data/box_data_list_related.h
+++ b/glom/mode_data/box_data_list_related.h
@@ -67,7 +67,7 @@ protected:
std::shared_ptr<Field> get_field_primary_key() const override; //TODO: Already in base class?
Gnome::Gda::Value get_primary_key_value_selected() const override;
void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
- Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const override;
//Overrides of functions from Box_Data:
Document::type_list_layout_groups create_layout_get_layout() override;
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index c67cdf9..58a0602 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -2350,7 +2350,7 @@ void DbAddDel::set_primary_key_value(const Gtk::TreeModel::iterator& row, const
set_value_key(row, value);
}
-Gnome::Gda::Value DbAddDel::get_primary_key_value(const Gtk::TreeModel::iterator& row) const
+Gnome::Gda::Value DbAddDel::get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const
{
return get_value_key(row);
}
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index af54b5b..f6f3f52 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -279,7 +279,7 @@ private:
std::shared_ptr<Field> get_field_primary_key() const override;
Gnome::Gda::Value get_primary_key_value_selected() const override;
void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
- Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::const_iterator& row) const override;
Gtk::CellRenderer* construct_specified_columns_cellrenderer(const std::shared_ptr<LayoutItem>&
layout_item, int model_column_index, int data_model_column_index);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]