GNOME.org
 

[glom] C++11: More use of override keyword.

commit f18a80777775bf1d061d17b1587cc78966880e05
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 27 08:50:33 2015 +0100

    C++11: More use of override keyword.

 glom/appwindow.h                                   |    6 +++---
 glom/box_reports.h                                 |    4 ++--
 glom/frame_glom.h                                  |    2 +-
 glom/mode_data/box_data_calendar_related.h         |    8 ++++----
 glom/mode_data/box_data_details.h                  |    4 ++--
 glom/mode_data/box_data_list.h                     |    6 +++---
 glom/mode_data/box_data_list_related.h             |    8 ++++----
 glom/mode_data/notebook_data.h                     |    2 +-
 glom/mode_design/box_db_table_relationships.h      |    4 ++--
 glom/mode_design/dialog_fields.h                   |    2 +-
 glom/mode_design/dialog_relationships.h            |    2 +-
 glom/mode_design/fields/box_db_table_definition.h  |    2 +-
 glom/mode_design/layout/dialog_layout_details.h    |    2 +-
 glom/mode_design/layout/dialog_layout_export.h     |    2 +-
 .../layout/layout_item_dialogs/dialog_fieldslist.h |    2 +-
 .../layout/layout_item_dialogs/dialog_sortfields.h |    2 +-
 glom/mode_design/print_layouts/box_print_layouts.h |    4 ++--
 glom/mode_design/users/dialog_groups_list.h        |    2 +-
 glom/mode_design/users/dialog_users_list.h         |    2 +-
 glom/mode_find/box_data_details_find.h             |    2 +-
 glom/mode_find/box_data_list_find.h                |    2 +-
 glom/navigation/box_tables.h                       |    2 +-
 22 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/glom/appwindow.h b/glom/appwindow.h
index 46469df..1d17947 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -68,7 +68,7 @@ public:
   AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
   virtual ~AppWindow();
 
-  virtual void init(); //Unique final overrider.
+  void init() override; //Unique final overrider.
 
   /**
    * @param restore Whether @a document_uri is a .tar.gz backup file to restore.
@@ -168,7 +168,7 @@ public:
   static AppWindow* get_appwindow();
 
   /// Overidden to add a widget in the middle, under the menu, instead of replacing the whole contents.
-  virtual void add(Gtk::Widget& child);
+  void add(Gtk::Widget& child) override;
 
   /// For instance, to create bold primary text for a dialog box, without marking the markup for translation.
   static Glib::ustring util_bold_message(const Glib::ustring& message);
@@ -255,7 +255,7 @@ private:
 
   void on_window_translations_hide();
 
-  void on_userlevel_changed(AppState::userlevels userlevel);
+  virtual void on_userlevel_changed(AppState::userlevels userlevel);
 
   Document* on_connection_pool_get_document();
 
diff --git a/glom/box_reports.h b/glom/box_reports.h
index f6e1f18..94b0b77 100644
--- a/glom/box_reports.h
+++ b/glom/box_reports.h
@@ -37,7 +37,7 @@ public:
   virtual ~Box_Reports();
 
 private:
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
 
   virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Report>& report);
 
@@ -51,7 +51,7 @@ private:
   virtual void on_adddel_Edit(const Gtk::TreeModel::iterator& row);
   virtual void on_adddel_changed(const Gtk::TreeModel::iterator& row, guint column);
 
-  virtual void on_userlevel_changed(AppState::userlevels userlevel);
+  void on_userlevel_changed(AppState::userlevels userlevel) override;
 
   guint m_colReportName;
   guint m_colTitle;
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index 756327f..b1d3f63 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -232,7 +232,7 @@ private:
   void on_button_find_all();
   void on_notebook_data_switch_page(Gtk::Widget* page);
   void on_notebook_data_record_details_requested(const Glib::ustring& table_name, Gnome::Gda::Value 
primary_key_value);
-  void on_userlevel_changed(AppState::userlevels userlevel);
+  void on_userlevel_changed(AppState::userlevels userlevel) override;
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   void on_dialog_add_related_table_response(int response);
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index a8556f2..2ad0194 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -50,9 +50,9 @@ public:
   virtual bool init_db_details(const Glib::ustring& parent_table, bool show_title = true);
 
 private:
-  virtual bool fill_from_database() override;
-  virtual type_vecConstLayoutFields get_fields_to_show() const override;
-  virtual void create_layout() override;
+  bool fill_from_database() override;
+  type_vecConstLayoutFields get_fields_to_show() const override;
+  void create_layout() override;
     
     
   //Implementations of pure virtual methods from Base_DB_Table_Data:
@@ -65,7 +65,7 @@ private:
   virtual void on_dialog_layout_hide() override;
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  virtual void enable_buttons();
+  void enable_buttons() override;
     
   //Implementations of pure virtual methods from Base_DB_Table_Data:
   virtual Gnome::Gda::Value get_primary_key_value_selected() const;
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index 5187b25..8bd816f 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -87,7 +87,7 @@ protected:
   virtual void set_entered_field_data(const Gtk::TreeModel::iterator& row, const std::shared_ptr<const 
LayoutItem_Field>& field, const Gnome::Gda::Value& value);
 
 
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
   virtual void create_layout();
   //virtual void fill_related();
 
@@ -107,7 +107,7 @@ private:
 
 protected:
 
-  virtual void on_userlevel_changed(AppState::userlevels user_level) override;
+  void on_userlevel_changed(AppState::userlevels user_level) override;
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   virtual void on_flowtable_layout_changed();
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index ee7c290..7077f59 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -80,10 +80,10 @@ protected:
   virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const;
 
   //Overrides of functions from Box_Data:
-  virtual void create_layout() override;
-  virtual Document::type_list_layout_groups create_layout_get_layout();
+  void create_layout() override;
+  Document::type_list_layout_groups create_layout_get_layout();
 
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
   virtual void enable_buttons();
 
   virtual std::shared_ptr<Field> get_field_primary_key() const;
diff --git a/glom/mode_data/box_data_list_related.h b/glom/mode_data/box_data_list_related.h
index 8bda5e2..793d346 100644
--- a/glom/mode_data/box_data_list_related.h
+++ b/glom/mode_data/box_data_list_related.h
@@ -45,7 +45,7 @@ public:
   virtual void set_find_mode(bool val = true);
 
 protected:
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
 
   //Signal handlers:
   void on_adddel_record_changed();
@@ -73,10 +73,10 @@ protected:
   virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const;
 
   //Overrides of functions from Box_Data:
-  virtual Document::type_list_layout_groups create_layout_get_layout() override;
-  virtual void create_layout() override;
+  Document::type_list_layout_groups create_layout_get_layout() override;
+  void create_layout() override;
 
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   virtual Dialog_Layout* create_layout_dialog() const override;
diff --git a/glom/mode_data/notebook_data.h b/glom/mode_data/notebook_data.h
index 4c80ff2..3ffb1a5 100644
--- a/glom/mode_data/notebook_data.h
+++ b/glom/mode_data/notebook_data.h
@@ -93,7 +93,7 @@ protected:
   //Signal handlers:
   virtual void on_list_user_requested_details(const Gnome::Gda::Value& primary_key_value);
 
-  virtual void on_switch_page_handler(Gtk::Widget* pPage);
+   void on_switch_page_handler(Gtk::Widget* pPage) override;
 
 private:
 
diff --git a/glom/mode_design/box_db_table_relationships.h b/glom/mode_design/box_db_table_relationships.h
index 23e2fed..711b8d3 100644
--- a/glom/mode_design/box_db_table_relationships.h
+++ b/glom/mode_design/box_db_table_relationships.h
@@ -36,10 +36,10 @@ public:
 
   void init(); //avoid duplication in constructors.
 
-  virtual void save_to_document() override;
+  void save_to_document() override;
 
 private:
-  virtual bool fill_from_database();
+  bool fill_from_database() override;
 
   //Signal handlers:
   void on_adddel_user_activated(const Gtk::TreeModel::iterator& row, guint col);
diff --git a/glom/mode_design/dialog_fields.h b/glom/mode_design/dialog_fields.h
index 7e2dd61..dc4ce68 100644
--- a/glom/mode_design/dialog_fields.h
+++ b/glom/mode_design/dialog_fields.h
@@ -36,7 +36,7 @@ public:
   Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
   virtual ~Dialog_Fields();
 
-  virtual bool init_db_details(const Glib::ustring& table_name);
+  bool init_db_details(const Glib::ustring& table_name) override;
 
 private:
 
diff --git a/glom/mode_design/dialog_relationships.h b/glom/mode_design/dialog_relationships.h
index 0ba1112..559d5ab 100644
--- a/glom/mode_design/dialog_relationships.h
+++ b/glom/mode_design/dialog_relationships.h
@@ -36,7 +36,7 @@ public:
   Dialog_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
   virtual ~Dialog_Relationships();
 
-  virtual bool init_db_details(const Glib::ustring& table_name);
+  bool init_db_details(const Glib::ustring& table_name) override;
 
   virtual void on_hide() override;
 
diff --git a/glom/mode_design/fields/box_db_table_definition.h 
b/glom/mode_design/fields/box_db_table_definition.h
index d41e198..62b8e88 100644
--- a/glom/mode_design/fields/box_db_table_definition.h
+++ b/glom/mode_design/fields/box_db_table_definition.h
@@ -37,7 +37,7 @@ public:
 
 private:
   void init(); //Avoid duplicating code in constructors.
-  virtual bool fill_from_database();
+  bool fill_from_database() override;
   virtual void fill_fields();
 
   void fill_field_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Field>& field);
diff --git a/glom/mode_design/layout/dialog_layout_details.h b/glom/mode_design/layout/dialog_layout_details.h
index 1fa0ee9..3e2b84e 100644
--- a/glom/mode_design/layout/dialog_layout_details.h
+++ b/glom/mode_design/layout/dialog_layout_details.h
@@ -53,7 +53,7 @@ protected:
   virtual void fill_group(const Gtk::TreeModel::iterator& iter, std::shared_ptr<LayoutGroup>& group);
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
   void save_to_document() override;
 
diff --git a/glom/mode_design/layout/dialog_layout_export.h b/glom/mode_design/layout/dialog_layout_export.h
index 9aa0a34..ec844e0 100644
--- a/glom/mode_design/layout/dialog_layout_export.h
+++ b/glom/mode_design/layout/dialog_layout_export.h
@@ -48,7 +48,7 @@ public:
 private:
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
   //signal handlers:
   virtual void on_button_up();
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_fieldslist.h 
b/glom/mode_design/layout/layout_item_dialogs/dialog_fieldslist.h
index 69b6d67..0b389b7 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_fieldslist.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_fieldslist.h
@@ -49,7 +49,7 @@ public:
 private:
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
   //signal handlers:
   void on_button_field_up();
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 295b398..9cf9d18 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.h
@@ -45,7 +45,7 @@ public:
 private:
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
   //signal handlers:
   virtual void on_button_field_up();
diff --git a/glom/mode_design/print_layouts/box_print_layouts.h 
b/glom/mode_design/print_layouts/box_print_layouts.h
index e495e93..396be84 100644
--- a/glom/mode_design/print_layouts/box_print_layouts.h
+++ b/glom/mode_design/print_layouts/box_print_layouts.h
@@ -38,7 +38,7 @@ public:
   virtual ~Box_Print_Layouts();
 
 private:
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
 
   virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const PrintLayout>& 
print_layout);
 
@@ -50,7 +50,7 @@ private:
   void on_adddel_user_requested_edit(const Gtk::TreeModel::iterator& row);
   void on_adddel_user_changed(const Gtk::TreeModel::iterator& row, guint column);
 
-  virtual void on_userlevel_changed(AppState::userlevels userlevel);
+  void on_userlevel_changed(AppState::userlevels userlevel) override;
 
   guint m_colName;
   guint m_colTitle;
diff --git a/glom/mode_design/users/dialog_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index 59cab2b..18f63f1 100644
--- a/glom/mode_design/users/dialog_groups_list.h
+++ b/glom/mode_design/users/dialog_groups_list.h
@@ -61,7 +61,7 @@ private:
   void treeview_append_bool_column(Gtk::TreeView& treeview, const Glib::ustring& title, 
Gtk::TreeModelColumn<bool>& model_column, const sigc::slot<void, const Glib::ustring&>& slot_toggled);
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
   void save_to_document() override;
 
diff --git a/glom/mode_design/users/dialog_users_list.h b/glom/mode_design/users/dialog_users_list.h
index a48ffb1..55a1823 100644
--- a/glom/mode_design/users/dialog_users_list.h
+++ b/glom/mode_design/users/dialog_users_list.h
@@ -56,7 +56,7 @@ public:
 private:
 
   //Enable/disable buttons, depending on treeview selection:
-  virtual void enable_buttons();
+  void enable_buttons() override;
 
   void save_to_document() override;
 
diff --git a/glom/mode_find/box_data_details_find.h b/glom/mode_find/box_data_details_find.h
index 0944a55..7341776 100644
--- a/glom/mode_find/box_data_details_find.h
+++ b/glom/mode_find/box_data_details_find.h
@@ -38,7 +38,7 @@ public:
 
 private:
 
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
   void fill_related();
 
   virtual void on_flowtable_field_edited(const std::shared_ptr<const LayoutItem_Field>& id, const 
Gnome::Gda::Value& value);
diff --git a/glom/mode_find/box_data_list_find.h b/glom/mode_find/box_data_list_find.h
index 7a4b61c..c3c76ad 100644
--- a/glom/mode_find/box_data_list_find.h
+++ b/glom/mode_find/box_data_list_find.h
@@ -38,7 +38,7 @@ public:
 
 private:
 
-  virtual bool fill_from_database() override;
+  bool fill_from_database() override;
   virtual void create_layout();
 
   //Member widgets:
diff --git a/glom/navigation/box_tables.h b/glom/navigation/box_tables.h
index 8f06d5a..c3ae1f2 100644
--- a/glom/navigation/box_tables.h
+++ b/glom/navigation/box_tables.h
@@ -62,7 +62,7 @@ private:
 
   void on_show_hidden_toggled();
 
-  virtual void on_userlevel_changed(AppState::userlevels userlevel);
+  void on_userlevel_changed(AppState::userlevels userlevel) override;
       
   Gtk::CheckButton* m_pCheckButtonShowHidden;
   guint m_colTableName;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]