[glom] Remove more unnecessary virtual methods.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] Remove more unnecessary virtual methods.
Date: Fri, 30 Oct 2015 08:44:11 +0000 (UTC)
commit 9705f7cfbfc897e9e9aa1ffb82cb7326f58d1432
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Oct 30 09:07:35 2015 +0100

    Remove more unnecessary virtual methods.

 glom/mode_design/layout/dialog_choose_field.h      |   12 +++++-----
 .../layout/dialog_choose_relationship.h            |    2 +-
 glom/mode_design/layout/dialog_layout.h            |    6 ++--
 .../layout/dialog_layout_calendar_related.h        |    2 +-
 glom/mode_design/layout/dialog_layout_details.h    |    4 +-
 glom/mode_design/layout/dialog_layout_export.h     |   16 +++++++-------
 .../layout/dialog_layout_list_related.h            |    2 +-
 .../layout/layout_item_dialogs/dialog_sortfields.h |   14 ++++++------
 glom/mode_design/layout/treestore_layout.h         |    4 +-
 glom/mode_design/print_layouts/box_print_layouts.h |    2 +-
 .../print_layouts/dialog_text_formatting.h         |    2 +-
 .../report_layout/dialog_layout_report.h           |   18 ++++++++--------
 glom/mode_design/translation/window_translations.h |    2 +-
 glom/mode_design/users/dialog_groups_list.h        |   22 ++++++++++----------
 glom/mode_design/users/dialog_users_list.h         |   22 ++++++++++----------
 glom/utility_widgets/adddel/treeviewcolumn_glom.h  |    4 +-
 .../canvas/canvas_group_resizable.h                |    6 ++--
 glom/utility_widgets/dialog_properties.h           |    2 +-
 glom/utility_widgets/layoutwidgetmenu.h            |    4 +-
 19 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/glom/mode_design/layout/dialog_choose_field.h b/glom/mode_design/layout/dialog_choose_field.h
index 78d479e..361e74d 100644
--- a/glom/mode_design/layout/dialog_choose_field.h
+++ b/glom/mode_design/layout/dialog_choose_field.h
@@ -46,8 +46,8 @@ public:
    * @param table_name The table name.
    * @param field The starting field information.
    */
-  virtual void set_document(Document* document, const Glib::ustring& table_name, const std::shared_ptr<const 
LayoutItem_Field>& field);
-  virtual void set_document(Document* document, const Glib::ustring& table_name);
+  void set_document(Document* document, const Glib::ustring& table_name, const std::shared_ptr<const 
LayoutItem_Field>& field);
+  void set_document(Document* document, const Glib::ustring& table_name);
 
 
   //void select_item(const std::shared_ptr<const Field>& field);
@@ -59,10 +59,10 @@ public:
 
 private:
 
-  virtual void on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* view_column);
-  virtual void on_treeview_selection_changed();
-  virtual void on_combo_relationship_changed();
-  virtual void on_checkbutton_related_relationships_toggled();
+  void on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* view_column);
+  void on_treeview_selection_changed();
+  void on_combo_relationship_changed();
+  void on_checkbutton_related_relationships_toggled();
 
   //Tree model columns:
   class ModelColumns_Fields : public Gtk::TreeModel::ColumnRecord
diff --git a/glom/mode_design/layout/dialog_choose_relationship.h 
b/glom/mode_design/layout/dialog_choose_relationship.h
index 1de489d..ccbba8a 100644
--- a/glom/mode_design/layout/dialog_choose_relationship.h
+++ b/glom/mode_design/layout/dialog_choose_relationship.h
@@ -43,7 +43,7 @@ public:
    * @param document The document, so that the dialog can load the previous layout, and save changes.
    * @param table_name The table name.
    */
-  virtual void set_document(Document* document, const Glib::ustring& table_name);
+  void set_document(Document* document, const Glib::ustring& table_name);
 
   void select_item(const std::shared_ptr<const Relationship>& relationship);
 
diff --git a/glom/mode_design/layout/dialog_layout.h b/glom/mode_design/layout/dialog_layout.h
index 1802b4f..9a551da 100644
--- a/glom/mode_design/layout/dialog_layout.h
+++ b/glom/mode_design/layout/dialog_layout.h
@@ -61,9 +61,9 @@ protected:
 
   //signal handlers:
   //TODO: Do these need to be virtual?
-  virtual void on_treemodel_row_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& 
iter);
-  virtual void on_entry_table_title_changed();
-  virtual void on_button_close();
+  void on_treemodel_row_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter);
+  void on_entry_table_title_changed();
+  void on_button_close();
 
   void make_sensitivity_depend_on_toggle_button(Gtk::ToggleButton& toggle_button, Gtk::Widget& widget);
   void on_sensitivity_toggle_button(Gtk::ToggleButton* toggle_button, Gtk::Widget* widget);
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.h 
b/glom/mode_design/layout/dialog_layout_calendar_related.h
index 764c354..b95ade5 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -50,7 +50,7 @@ public:
 
   void init_with_tablename(const Glib::ustring& layout, const Glib::ustring& layout_platform, Document* 
document, const Glib::ustring& parent_table);
 
-  virtual void update_ui(bool including_relationships_list = true);
+  void update_ui(bool including_relationships_list = true);
 
   std::shared_ptr<Relationship> get_relationship() const;
   std::shared_ptr<LayoutItem_CalendarPortal>  get_portal_layout();
diff --git a/glom/mode_design/layout/dialog_layout_details.h b/glom/mode_design/layout/dialog_layout_details.h
index fea0428..b48b4fc 100644
--- a/glom/mode_design/layout/dialog_layout_details.h
+++ b/glom/mode_design/layout/dialog_layout_details.h
@@ -49,8 +49,8 @@ public:
 
 protected:
 
-  virtual void add_group(const Gtk::TreeModel::iterator& parent, const std::shared_ptr<const LayoutGroup>& 
group);
-  virtual void fill_group(const Gtk::TreeModel::iterator& iter, std::shared_ptr<LayoutGroup>& group);
+  void add_group(const Gtk::TreeModel::iterator& parent, const std::shared_ptr<const LayoutGroup>& group);
+  void fill_group(const Gtk::TreeModel::iterator& iter, std::shared_ptr<LayoutGroup>& group);
 
   //Enable/disable buttons, depending on treeview selection:
   void enable_buttons() override;
diff --git a/glom/mode_design/layout/dialog_layout_export.h b/glom/mode_design/layout/dialog_layout_export.h
index ec844e0..d3f6866 100644
--- a/glom/mode_design/layout/dialog_layout_export.h
+++ b/glom/mode_design/layout/dialog_layout_export.h
@@ -41,7 +41,7 @@ public:
    * @param table_name The table name.
    * @param table_fields: The actual fields in the table, in case the document does not yet know about them 
all.
    */
-  virtual void set_layout_groups(Document::type_list_layout_groups& mapGroups, Document* document, const 
Glib::ustring& table_name);
+  void set_layout_groups(Document::type_list_layout_groups& mapGroups, Document* document, const 
Glib::ustring& table_name);
 
   void get_layout_groups(Document::type_list_layout_groups& layout_groups) const;
 
@@ -51,13 +51,13 @@ private:
   void enable_buttons() override;
 
   //signal handlers:
-  virtual void on_button_up();
-  virtual void on_button_down();
-  virtual void on_button_add_field();
-  virtual void on_button_delete();
-  virtual void on_button_edit_field();
-  virtual void on_treeview_fields_selection_changed();
-  virtual void on_cell_data_name(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
+  void on_button_up();
+  void on_button_down();
+  void on_button_add_field();
+  void on_button_delete();
+  void on_button_edit_field();
+  void on_treeview_fields_selection_changed();
+  void on_cell_data_name(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
 
   //Tree model columns:
   class ModelColumns_Fields : public Gtk::TreeModel::ColumnRecord
diff --git a/glom/mode_design/layout/dialog_layout_list_related.h 
b/glom/mode_design/layout/dialog_layout_list_related.h
index 6b71a20..0346eb9 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -48,7 +48,7 @@ public:
    */
   void init_with_portal(const Glib::ustring& layout_name, const Glib::ustring& layout_platform, Document* 
document, const std::shared_ptr<const LayoutItem_Portal>& portal, const Glib::ustring& from_table, bool 
for_print_layout = false);
 
-  virtual void update_ui(bool including_relationships_list = true);
+  void update_ui(bool including_relationships_list = true);
 
   std::shared_ptr<Relationship> get_relationship() const;
   std::shared_ptr<LayoutItem_Portal>  get_portal_layout();
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.h 
b/glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.h
index 9cf9d18..0e503ff 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.h
@@ -48,13 +48,13 @@ private:
   void enable_buttons() override;
 
   //signal handlers:
-  virtual void on_button_field_up();
-  virtual void on_button_field_down();
-  virtual void on_button_add_field();
-  virtual void on_button_delete();
-  virtual void on_button_edit_field();
-  virtual void on_treeview_fields_selection_changed();
-  virtual void on_cell_data_name(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
+  void on_button_field_up();
+  void on_button_field_down();
+  void on_button_add_field();
+  void on_button_delete();
+  void on_button_edit_field();
+  void on_treeview_fields_selection_changed();
+  void on_cell_data_name(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
 
   //Tree model columns:
   class ModelColumns_Fields : public Gtk::TreeModel::ColumnRecord
diff --git a/glom/mode_design/layout/treestore_layout.h b/glom/mode_design/layout/treestore_layout.h
index b72bed8..23b8edb 100644
--- a/glom/mode_design/layout/treestore_layout.h
+++ b/glom/mode_design/layout/treestore_layout.h
@@ -51,8 +51,8 @@ public:
 
   static Glib::RefPtr<TreeStore_Layout> create();
 
-  virtual void fill_sequences();
-  virtual void fill_sequences(const iterator& iter);
+  void fill_sequences();
+  void fill_sequences(const iterator& iter);
 
 private:
   //Overridden virtual functions:
diff --git a/glom/mode_design/print_layouts/box_print_layouts.h 
b/glom/mode_design/print_layouts/box_print_layouts.h
index 396be84..0ca8bc8 100644
--- a/glom/mode_design/print_layouts/box_print_layouts.h
+++ b/glom/mode_design/print_layouts/box_print_layouts.h
@@ -40,7 +40,7 @@ public:
 private:
   bool fill_from_database() override;
 
-  virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const PrintLayout>& 
print_layout);
+  void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const PrintLayout>& 
print_layout);
 
   void save_to_document() override;
 
diff --git a/glom/mode_design/print_layouts/dialog_text_formatting.h 
b/glom/mode_design/print_layouts/dialog_text_formatting.h
index 6f9a400..ca5bf28 100644
--- a/glom/mode_design/print_layouts/dialog_text_formatting.h
+++ b/glom/mode_design/print_layouts/dialog_text_formatting.h
@@ -48,7 +48,7 @@ public:
   Box_Formatting* m_box_formatting;
 
 private:
-  virtual void on_button_close();
+  void on_button_close();
 };
 
 } //namespace Glom
diff --git a/glom/mode_design/report_layout/dialog_layout_report.h 
b/glom/mode_design/report_layout/dialog_layout_report.h
index b972823..5dc8c0c 100644
--- a/glom/mode_design/report_layout/dialog_layout_report.h
+++ b/glom/mode_design/report_layout/dialog_layout_report.h
@@ -52,7 +52,7 @@ private:
 
   typedef TreeStore_ReportLayout type_model;
 
-  virtual void add_group(const Glib::RefPtr<type_model>& model_parts, const Gtk::TreeModel::iterator& 
parent, const std::shared_ptr<const LayoutGroup>& group);
+  void add_group(const Glib::RefPtr<type_model>& model_parts, const Gtk::TreeModel::iterator& parent, const 
std::shared_ptr<const LayoutGroup>& group);
 
   void add_group_children(const Glib::RefPtr<type_model>& model_parts, const Gtk::TreeModel::iterator& 
parent, const std::shared_ptr<const LayoutGroup>& group);
 
@@ -79,17 +79,17 @@ private:
   void setup_model(Gtk::TreeView& treeview, Glib::RefPtr<type_model>& model);
 
   //signal handlers:
-  virtual void on_button_add();
+  void on_button_add();
 
-  virtual void on_button_up();
-  virtual void on_button_down();
-  virtual void on_button_delete();
+  void on_button_up();
+  void on_button_down();
+  void on_button_delete();
 
-  virtual void on_button_edit();
-  virtual void on_button_formatting();
+  void on_button_edit();
+  void on_button_formatting();
 
-  virtual void on_treeview_parts_selection_changed();
-  virtual void on_treeview_available_parts_selection_changed();
+  void on_treeview_parts_selection_changed();
+  void on_treeview_available_parts_selection_changed();
 
   void on_cell_data_part(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter, const 
Glib::RefPtr<type_model>& model);
   void on_cell_data_details(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter, const 
Glib::RefPtr<type_model>& model);
diff --git a/glom/mode_design/translation/window_translations.h 
b/glom/mode_design/translation/window_translations.h
index 7bf980f..39d55c7 100644
--- a/glom/mode_design/translation/window_translations.h
+++ b/glom/mode_design/translation/window_translations.h
@@ -52,7 +52,7 @@ public:
 private:
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons();
 
   //signal handlers:
   void on_button_identify();
diff --git a/glom/mode_design/users/dialog_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index e5615ab..b79749b 100644
--- a/glom/mode_design/users/dialog_groups_list.h
+++ b/glom/mode_design/users/dialog_groups_list.h
@@ -67,16 +67,16 @@ private:
 
   //signal handlers:
 
-  virtual void on_button_group_delete();
-  virtual void on_button_group_new();
-  virtual void on_button_group_users();
-  virtual void on_treeview_groups_selection_changed();
-  virtual void on_treeview_tables_selection_changed();
+  void on_button_group_delete();
+  void on_button_group_new();
+  void on_button_group_users();
+  void on_treeview_groups_selection_changed();
+  void on_treeview_tables_selection_changed();
 
-  virtual void on_treeview_tables_toggled_view(const Glib::ustring& path_string);
-  virtual void on_treeview_tables_toggled_edit(const Glib::ustring& path_string);
-  virtual void on_treeview_tables_toggled_create(const Glib::ustring& path_string);
-  virtual void on_treeview_tables_toggled_delete(const Glib::ustring& path_string);
+  void on_treeview_tables_toggled_view(const Glib::ustring& path_string);
+  void on_treeview_tables_toggled_edit(const Glib::ustring& path_string);
+  void on_treeview_tables_toggled_create(const Glib::ustring& path_string);
+  void on_treeview_tables_toggled_delete(const Glib::ustring& path_string);
 
   enum class enumPriv
   {
@@ -90,8 +90,8 @@ private:
 
   void on_cell_data_group_name(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
 
- // virtual void on_treeview_cell_edited_text(const Glib::ustring& path_string, const Glib::ustring& 
new_text, const Gtk::TreeModelColumn<Glib::ustring>& model_column);
- // virtual void on_treeview_cell_edited_numeric(const Glib::ustring& path_string, const Glib::ustring& 
new_text, const Gtk::TreeModelColumn<guint>& model_column);
+ // void on_treeview_cell_edited_text(const Glib::ustring& path_string, const Glib::ustring& new_text, const 
Gtk::TreeModelColumn<Glib::ustring>& model_column);
+ // void on_treeview_cell_edited_numeric(const Glib::ustring& path_string, const Glib::ustring& new_text, 
const Gtk::TreeModelColumn<guint>& model_column);
 
   class ModelColumnsTables : public Gtk::TreeModel::ColumnRecord
   {
diff --git a/glom/mode_design/users/dialog_users_list.h b/glom/mode_design/users/dialog_users_list.h
index c3fda95..53cdf97 100644
--- a/glom/mode_design/users/dialog_users_list.h
+++ b/glom/mode_design/users/dialog_users_list.h
@@ -51,7 +51,7 @@ public:
    */
   void fill_list();
 
-  virtual void set_group(const Glib::ustring& group_name);
+  void set_group(const Glib::ustring& group_name);
 
 private:
 
@@ -61,21 +61,21 @@ private:
   void save_to_document() override;
 
   //signal handlers:
-  virtual void on_button_user_delete();
-  virtual void on_button_user_add();
-  virtual void on_button_user_remove();
-  virtual void on_button_user_new();
-  virtual void on_button_user_edit();
-  virtual void on_treeview_users_selection_changed();
-  virtual void on_combo_group_changed();
+  void on_button_user_delete();
+  void on_button_user_add();
+  void on_button_user_remove();
+  void on_button_user_new();
+  void on_button_user_edit();
+  void on_treeview_users_selection_changed();
+  void on_combo_group_changed();
 
   /** Warn if the group is the developer group, and there is only one user remaining.
    * @result Whether the warning was necessary.
    */
-  virtual bool warn_about_empty_standard_group();
+  bool warn_about_empty_standard_group();
 
- // virtual void on_treeview_cell_edited_text(const Glib::ustring& path_string, const Glib::ustring& 
new_text, const Gtk::TreeModelColumn<Glib::ustring>& model_column);
- // virtual void on_treeview_cell_edited_numeric(const Glib::ustring& path_string, const Glib::ustring& 
new_text, const Gtk::TreeModelColumn<guint>& model_column);
+ // void on_treeview_cell_edited_text(const Glib::ustring& path_string, const Glib::ustring& new_text, const 
Gtk::TreeModelColumn<Glib::ustring>& model_column);
+ // void on_treeview_cell_edited_numeric(const Glib::ustring& path_string, const Glib::ustring& new_text, 
const Gtk::TreeModelColumn<guint>& model_column);
 
   class ModelColumnsUsers : public Gtk::TreeModel::ColumnRecord
   {
diff --git a/glom/utility_widgets/adddel/treeviewcolumn_glom.h 
b/glom/utility_widgets/adddel/treeviewcolumn_glom.h
index 685f5ae..b9b0542 100644
--- a/glom/utility_widgets/adddel/treeviewcolumn_glom.h
+++ b/glom/utility_widgets/adddel/treeviewcolumn_glom.h
@@ -32,8 +32,8 @@ public:
   TreeViewColumnGlom(const Glib::ustring& title, Gtk::CellRenderer& cell);
   virtual ~TreeViewColumnGlom();
 
-  virtual Glib::ustring get_column_id() const;
-  virtual void set_column_id(const Glib::ustring& value);
+  Glib::ustring get_column_id() const;
+  void set_column_id(const Glib::ustring& value);
 
 private:
   Glib::ustring m_column_id; 
diff --git a/glom/utility_widgets/canvas/canvas_group_resizable.h 
b/glom/utility_widgets/canvas/canvas_group_resizable.h
index c02b457..823dd67 100644
--- a/glom/utility_widgets/canvas/canvas_group_resizable.h
+++ b/glom/utility_widgets/canvas/canvas_group_resizable.h
@@ -99,9 +99,9 @@ private:
   bool on_resizer_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event);
 
 
-  virtual bool on_child_button_press_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventButton* 
event);
-  virtual bool on_child_button_release_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventButton* 
event);
-  virtual bool on_child_motion_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventMotion* 
event);
+  bool on_child_button_press_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventButton* event);
+  bool on_child_button_release_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventButton* event);
+  bool on_child_motion_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventMotion* event);
 
   enum class Manipulators
   {
diff --git a/glom/utility_widgets/dialog_properties.h b/glom/utility_widgets/dialog_properties.h
index fe92524..9f3ebaf 100644
--- a/glom/utility_widgets/dialog_properties.h
+++ b/glom/utility_widgets/dialog_properties.h
@@ -51,7 +51,7 @@ protected:
   void on_button_cancel();
 
   void on_anything_changed();
-  virtual void on_adddel_user_changed(const Gtk::TreeModel::iterator& /* iter */, guint /* col */);
+  void on_adddel_user_changed(const Gtk::TreeModel::iterator& /* iter */, guint /* col */);
 
   /// Disable/enable other controls when a control is selected.
   virtual void enforce_constraints();
diff --git a/glom/utility_widgets/layoutwidgetmenu.h b/glom/utility_widgets/layoutwidgetmenu.h
index 768d7a7..16583a7 100644
--- a/glom/utility_widgets/layoutwidgetmenu.h
+++ b/glom/utility_widgets/layoutwidgetmenu.h
@@ -44,8 +44,8 @@ public:
 
   virtual void on_menupopup_activate_layout();
   virtual void on_menupopup_activate_layout_properties();
-  virtual void on_menupopup_add_item(enumType item);
-  virtual void on_menupopup_activate_delete();
+  void on_menupopup_add_item(enumType item);
+  void on_menupopup_activate_delete();
 #endif // !GLOM_ENABLE_CLIENT_ONLY  
     
 protected:
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]