[glom] Remove more unnecessary virtual keywords.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Remove more unnecessary virtual keywords.
- Date: Fri, 30 Oct 2015 08:44:06 +0000 (UTC)
commit 6e69ce1a69e06b7926cbc69ed3b9efc00052a276
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Oct 29 12:50:00 2015 +0100
Remove more unnecessary virtual keywords.
glom/mode_data/box_data.h | 8 ++++----
glom/mode_data/box_data_manyrecords.h | 2 +-
glom/mode_data/box_data_portal.h | 4 ++--
glom/mode_data/flowtablewithfields.h | 6 +++---
glom/mode_data/notebook_data.h | 4 ++--
glom/mode_design/fields/combo_fieldtype.h | 4 ++--
glom/mode_design/fields/dialog_defaultformatting.h | 4 ++--
glom/mode_design/fields/dialog_fielddefinition.h | 4 ++--
.../layout/layout_item_dialogs/combo_summarytype.h | 4 ++--
.../layout_item_dialogs/dialog_field_layout.h | 2 +-
.../layout_item_dialogs/dialog_field_summary.h | 2 +-
.../layout/layout_item_dialogs/dialog_group_by.h | 2 +-
.../layout/layout_item_dialogs/dialog_notebook.h | 10 +++++-----
13 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index d31c38d..2657557 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -58,12 +58,12 @@ public:
///Get the existing where clause, previously supplied to init_db_details().
FoundSet get_found_set() const;
- virtual Gnome::Gda::SqlExpr get_find_where_clause() const;
+ Gnome::Gda::SqlExpr get_find_where_clause() const;
- virtual void set_unstored_data(bool bVal);
- virtual bool get_unstored_data() const;
+ void set_unstored_data(bool bVal);
+ bool get_unstored_data() const;
- virtual bool confirm_discard_unstored_data() const;
+ bool confirm_discard_unstored_data() const;
#ifndef GLOM_ENABLE_CLIENT_ONLY
void show_layout_dialog();
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index 1f21999..80b7bf6 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -61,7 +61,7 @@ protected:
void create_layout_add_group(const std::shared_ptr<LayoutGroup>& layout_group);
void print_layout() override;
- virtual void print_layout_group(xmlpp::Element* node_parent, const std::shared_ptr<const LayoutGroup>&
group);
+ void print_layout_group(xmlpp::Element* node_parent, const std::shared_ptr<const LayoutGroup>& group);
bool m_read_only;
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index 8396c5a..19ee4fd 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -59,8 +59,8 @@ public:
*/
bool refresh_data_from_database_with_foreign_key(const Gnome::Gda::Value& foreign_key_value);
- virtual std::shared_ptr<LayoutItem_Portal> get_portal() const;
- virtual std::shared_ptr<const Field> get_key_field() const;
+ std::shared_ptr<LayoutItem_Portal> get_portal() const;
+ std::shared_ptr<const Field> get_key_field() const;
sigc::signal<void, Gnome::Gda::Value> signal_record_added;
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 10b2ffd..dde3c7c 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -65,7 +65,7 @@ public:
virtual ~FlowTableWithFields();
///The table name is needed to discover details of relationships.
- virtual void set_table(const Glib::ustring& table_name);
+ void set_table(const Glib::ustring& table_name);
/** Prevent any attempts to change actual records,
* if the widget is just being used to enter find critera,
@@ -111,11 +111,11 @@ public:
typedef std::list<Gtk::Widget*> type_list_widgets;
typedef std::list<const Gtk::Widget*> type_list_const_widgets;
- virtual void change_group(const Glib::ustring& id, const Glib::ustring& new_group);
+ void change_group(const Glib::ustring& id, const Glib::ustring& new_group);
void set_design_mode(bool value = true) override;
- virtual void remove_all();
+ void remove_all();
typedef std::vector< Glib::RefPtr<Gtk::SizeGroup> > type_vec_sizegroups;
diff --git a/glom/mode_data/notebook_data.h b/glom/mode_data/notebook_data.h
index 841ea4b..a7b714e 100644
--- a/glom/mode_data/notebook_data.h
+++ b/glom/mode_data/notebook_data.h
@@ -91,9 +91,9 @@ protected:
void update_records_count();
//Signal handlers:
- virtual void on_list_user_requested_details(const Gnome::Gda::Value& primary_key_value);
+ void on_list_user_requested_details(const Gnome::Gda::Value& primary_key_value);
- void on_switch_page_handler(Gtk::Widget* pPage) override;
+ void on_switch_page_handler(Gtk::Widget* pPage) override;
private:
diff --git a/glom/mode_design/fields/combo_fieldtype.h b/glom/mode_design/fields/combo_fieldtype.h
index 7227316..0b26c86 100644
--- a/glom/mode_design/fields/combo_fieldtype.h
+++ b/glom/mode_design/fields/combo_fieldtype.h
@@ -37,8 +37,8 @@ public:
virtual ~Combo_FieldType();
//set/get the text in terms of enumerated type:
- virtual void set_field_type(Field::glom_field_type fieldType);
- virtual Field::glom_field_type get_field_type() const;
+ void set_field_type(Field::glom_field_type fieldType);
+ Field::glom_field_type get_field_type() const;
private:
diff --git a/glom/mode_design/fields/dialog_defaultformatting.h
b/glom/mode_design/fields/dialog_defaultformatting.h
index 7a28ed1..5b34726 100644
--- a/glom/mode_design/fields/dialog_defaultformatting.h
+++ b/glom/mode_design/fields/dialog_defaultformatting.h
@@ -48,8 +48,8 @@ public:
Dialog_DefaultFormatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_DefaultFormatting();
- virtual void set_field(const std::shared_ptr<const Field>& field, const Glib::ustring& table_name);
- virtual std::shared_ptr<Field> get_field() const; //TODO_FieldShared
+ void set_field(const std::shared_ptr<const Field>& field, const Glib::ustring& table_name);
+ std::shared_ptr<Field> get_field() const; //TODO_FieldShared
private:
Gtk::Box* m_box_formatting_placeholder;
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h
b/glom/mode_design/fields/dialog_fielddefinition.h
index e199711..928953a 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -50,8 +50,8 @@ public:
Dialog_FieldDefinition(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_FieldDefinition();
- virtual void set_field(const std::shared_ptr<const Field>& field, const Glib::ustring& table_name);
- virtual std::shared_ptr<Field> get_field() const; //TODO_FieldShared
+ void set_field(const std::shared_ptr<const Field>& field, const Glib::ustring& table_name);
+ std::shared_ptr<Field> get_field() const; //TODO_FieldShared
private:
diff --git a/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
index becc934..f75573e 100644
--- a/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
+++ b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
@@ -36,8 +36,8 @@ public:
Combo_SummaryType(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Combo_SummaryType();
- virtual void set_summary_type(LayoutItem_FieldSummary::summaryType summary_type);
- virtual LayoutItem_FieldSummary::summaryType get_summary_type() const;
+ void set_summary_type(LayoutItem_FieldSummary::summaryType summary_type);
+ LayoutItem_FieldSummary::summaryType get_summary_type() const;
private:
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
index 6d681aa..140b4ac 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
@@ -49,7 +49,7 @@ public:
* @param field The starting field information.
* @param table_name The field's table.
*/
- virtual void set_field(const std::shared_ptr<const LayoutItem_Field>& field, const Glib::ustring&
table_name, bool show_editable_options = true);
+ void set_field(const std::shared_ptr<const LayoutItem_Field>& field, const Glib::ustring& table_name, bool
show_editable_options = true);
std::shared_ptr<LayoutItem_Field> get_field_chosen() const;
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
index 9adb79c..aaa5978 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
@@ -48,7 +48,7 @@ public:
* @param item The starting information.
* @param table_name The item's table.
*/
- virtual void set_item(const std::shared_ptr<const LayoutItem_FieldSummary>& item, const Glib::ustring&
table_name);
+ void set_item(const std::shared_ptr<const LayoutItem_FieldSummary>& item, const Glib::ustring& table_name);
std::shared_ptr<LayoutItem_FieldSummary> get_item() const;
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
index bf74fb9..897f3d0 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
@@ -50,7 +50,7 @@ public:
* @param item The starting information.
* @param table_name The item's table.
*/
- virtual void set_item(const std::shared_ptr<const LayoutItem_GroupBy>& item, const Glib::ustring&
table_name);
+ void set_item(const std::shared_ptr<const LayoutItem_GroupBy>& item, const Glib::ustring& table_name);
std::shared_ptr<LayoutItem_GroupBy> get_item() const;
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
index 5b8d9e2..a6f4b12 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
@@ -49,11 +49,11 @@ private:
void enable_buttons() override;
//signal handlers:
- virtual void on_button_up();
- virtual void on_button_down();
- virtual void on_button_add();
- virtual void on_button_delete();
- virtual void on_treeview_selection_changed();
+ void on_button_up();
+ void on_button_down();
+ void on_button_add();
+ void on_button_delete();
+ void on_treeview_selection_changed();
//Tree model columns:
class ModelColumns_Tabs : public Gtk::TreeModel::ColumnRecord
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]