[glom] C++11: Add some uses of the override keyword.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] C++11: Add some uses of the override keyword.
- Date: Fri, 3 Jul 2015 06:36:53 +0000 (UTC)
commit 899d88f4f44779628f40065feae0b0f87879de00
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Jul 2 23:09:36 2015 +0200
C++11: Add some uses of the override keyword.
But we need the -Wsuggest-override warning to catch them all.
glom/application.h | 8 +++---
glom/appwindow.h | 22 ++++++++--------
glom/bakery/appwindow_withdoc.h | 2 +-
glom/base_db.h | 4 +-
glom/box_reports.h | 2 +-
glom/dialog_connection.h | 2 +-
glom/frame_glom.h | 6 ++--
glom/import_csv/dialog_import_csv_progress.h | 14 +++++-----
glom/libglom/data_structure/choicevalue.h | 2 +-
glom/libglom/document/bakery/document_xml.h | 4 +-
glom/libglom/document/document.h | 4 +-
glom/mode_data/box_data.h | 2 +-
glom/mode_data/box_data_calendar_related.h | 16 +++++-----
glom/mode_data/box_data_details.h | 10 +++---
glom/mode_data/box_data_list.h | 10 +++---
glom/mode_data/box_data_list_related.h | 14 +++++-----
glom/mode_data/box_data_manyrecords.h | 2 +-
glom/mode_data/box_data_portal.h | 10 +++---
glom/mode_data/buttonglom.h | 2 +-
.../datawidget/cellrenderer_buttonimage.h | 2 +-
.../mode_data/datawidget/cellrenderer_buttontext.h | 2 +-
glom/mode_data/datawidget/checkbutton.h | 2 +-
glom/mode_data/datawidget/combo.h | 14 +++++-----
glom/mode_data/datawidget/combo_as_radio_buttons.h | 8 +++---
glom/mode_data/datawidget/datawidget.h | 8 +++---
glom/mode_data/datawidget/entry.h | 22 ++++++++--------
glom/mode_data/datawidget/label.h | 2 +-
glom/mode_data/datawidget/textview.cc | 1 +
glom/mode_data/datawidget/textview.h | 10 +++---
glom/mode_data/datawidget/treemodel_db.h | 28 ++++++++++----------
.../datawidget/treemodel_db_withextratext.h | 6 ++--
glom/mode_data/db_adddel/db_adddel.h | 6 ++--
glom/mode_data/db_adddel/db_adddel_withbuttons.h | 8 +++---
glom/mode_data/flowtablewithfields.h | 2 +-
glom/mode_data/notebook_data.h | 4 +-
glom/mode_design/box_db_table_relationships.h | 2 +-
glom/mode_design/dialog_database_preferences.h | 6 ++--
glom/mode_design/dialog_initial_password.h | 2 +-
glom/mode_design/dialog_relationships.h | 2 +-
glom/mode_design/fields/dialog_fielddefinition.h | 2 +-
.../layout/dialog_layout_calendar_related.h | 4 +-
.../layout/dialog_layout_list_related.h | 4 +-
glom/mode_design/layout/treestore_layout.h | 4 +-
glom/mode_design/print_layouts/box_print_layouts.h | 2 +-
.../print_layouts/window_print_layout_edit.h | 2 +-
.../report_layout/treestore_report_layout.h | 4 +-
.../script_library/dialog_script_library.h | 4 +-
.../translation/dialog_identify_original.h | 2 +-
glom/mode_design/translation/window_translations.h | 4 +-
glom/mode_design/users/dialog_groups_list.h | 2 +-
glom/mode_find/box_data_details_find.h | 6 ++--
glom/mode_find/box_data_list_find.h | 4 +-
glom/navigation/box_tables.h | 2 +-
glom/notebook_glom.h | 2 +-
glom/utility_widgets/adddel/adddel.h | 6 ++--
glom/utility_widgets/adddel/adddel_withbuttons.h | 8 +++---
glom/utility_widgets/flowtable.h | 4 +-
glom/utility_widgets/imageglom.h | 2 +-
glom/utility_widgets/notebooklabelglom.h | 2 +-
59 files changed, 172 insertions(+), 171 deletions(-)
---
diff --git a/glom/application.h b/glom/application.h
index 3da9536..3a3d965 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -37,11 +37,11 @@ public:
protected:
//Overrides of default signal handlers:
- virtual void on_activate();
- virtual void on_startup();
+ virtual void on_activate() override;
+ virtual void on_startup() override;
virtual void on_open(const Gio::Application::type_vec_files& files,
- const Glib::ustring& hint);
- virtual int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line);
+ const Glib::ustring& hint) override;
+ virtual int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line) override;
private:
void create_window(const Glib::RefPtr<Gio::File>& file = Glib::RefPtr<Gio::File>());
diff --git a/glom/appwindow.h b/glom/appwindow.h
index 29b30a9..ab0b0e6 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -73,7 +73,7 @@ public:
/**
* @param restore Whether @a document_uri is a .tar.gz backup file to restore.
*/
- bool init_with_document(const Glib::ustring& document_uri = Glib::ustring(), bool restore = false);
//override
+ bool init_with_document(const Glib::ustring& document_uri = Glib::ustring(), bool restore = false);
/** Changes the mode to Data mode, as if the user had selected the Data Mode menu item.
*/
@@ -174,12 +174,12 @@ public:
static Glib::ustring util_bold_message(const Glib::ustring& message);
protected:
- virtual void init_layout(); //Arranges the menu, toolbar, etc.
- virtual void init_menus(); //Override this to add more or different menus.
- virtual void init_menus_file(); //Call this from init_menus() to add the standard file menu.
- virtual void init_menus_edit(); //Call this from init_menus() to add the standard edit menu
+ void init_layout(); //Arranges the menu, toolbar, etc.
+ virtual void init_menus() override; //Override this to add more or different menus.
+ virtual void init_menus_file() override; //Call this from init_menus() to add the standard file menu.
+ virtual void init_menus_edit() override; //Call this from init_menus() to add the standard edit menu
- virtual void on_hide(); //override.
+ virtual void on_hide() override;
//Overrides from AppWindow_WithDoc:
virtual void document_history_add(const Glib::ustring& file_uri); //overridden.
@@ -200,7 +200,7 @@ protected:
virtual void ui_hide();
virtual void ui_bring_to_front();
- virtual bool on_delete_event(GdkEventAny* event); //override
+ virtual bool on_delete_event(GdkEventAny* event) override;
void on_menu_edit_copy_activate();
void on_menu_edit_cut_activate();
@@ -227,9 +227,9 @@ protected:
virtual void ui_warning_load_failed(int failure_code = 0); //Override.
private:
- virtual void init_create_document(); //override
- virtual bool on_document_load(); //override.
- virtual void on_document_close(); //override.
+ virtual void init_create_document() override;
+ virtual bool on_document_load() override;
+ virtual void on_document_close() override;
bool offer_new_or_existing();
@@ -281,7 +281,7 @@ private:
Glib::ustring ui_file_select_open_with_browse(bool& browsed, EpcServiceInfo*& browsed_server,
Glib::ustring& browsed_service_name, const Glib::ustring& starting_folder_uri = Glib::ustring());
#endif // !G_OS_WIN32
- virtual void new_instance(const Glib::ustring& uri = Glib::ustring()); //Override
+ virtual void new_instance(const Glib::ustring& uri = Glib::ustring()) override;
void on_connection_create_database_progress();
void on_connection_close_progress();
diff --git a/glom/bakery/appwindow_withdoc.h b/glom/bakery/appwindow_withdoc.h
index e45d244..ee71627 100644
--- a/glom/bakery/appwindow_withdoc.h
+++ b/glom/bakery/appwindow_withdoc.h
@@ -60,7 +60,7 @@ public:
virtual ~AppWindow_WithDoc();
- virtual void init(); //overridden to create document.
+ virtual void init() override; //overridden to create document.
enum enumSaveChanges
{
diff --git a/glom/base_db.h b/glom/base_db.h
index c85aca7..7643eca 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -66,8 +66,8 @@ public:
static std::shared_ptr<SharedConnection> connect_to_server(Gtk::Window* parent_window = 0);
- virtual void set_document(Document* pDocument); //View override
- virtual void load_from_document(); //View override
+ virtual void set_document(Document* pDocument) override; //View override
+ virtual void load_from_document() override; //View override
std::shared_ptr<Field> change_column(const Glib::ustring& table_name, const std::shared_ptr<const Field>&
field_old, const std::shared_ptr<const Field>& field, Gtk::Window* parent_window) const;
diff --git a/glom/box_reports.h b/glom/box_reports.h
index 07d2cf5..b1607a7 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
+ virtual bool fill_from_database() override;
virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Report>& report);
diff --git a/glom/dialog_connection.h b/glom/dialog_connection.h
index cfcc192..c5c03dc 100644
--- a/glom/dialog_connection.h
+++ b/glom/dialog_connection.h
@@ -57,7 +57,7 @@ public:
void set_password(const Glib::ustring& password);
void get_username_and_password(Glib::ustring& user, Glib::ustring& password) const;
- virtual void load_from_document(); //override
+ virtual void load_from_document() override;
void set_self_hosted_user_and_password(const Glib::ustring& username, const Glib::ustring& password);
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index d862636..131017c 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -137,8 +137,8 @@ public:
void on_dialog_tables_hide();
- virtual void set_document(Document* pDocument); //View override
- virtual void load_from_document(); //View override
+ virtual void set_document(Document* pDocument) override; //View override
+ virtual void load_from_document() override; //View override
enum enumModes
{
@@ -189,7 +189,7 @@ public:
private:
- //virtual void set_document(Document* pDocument); //override
+ //virtual void set_document(Document* pDocument) override;
/** Show the table, possibly selecting a particular record, possibly showing that in the details tab. This
allows table_name to be empty in which case no
* table will be shown.
diff --git a/glom/import_csv/dialog_import_csv_progress.h b/glom/import_csv/dialog_import_csv_progress.h
index 17beaa0..41afffb 100644
--- a/glom/import_csv/dialog_import_csv_progress.h
+++ b/glom/import_csv/dialog_import_csv_progress.h
@@ -55,15 +55,15 @@ private:
void on_data_source_state_changed();
bool on_idle_import();
- virtual void on_response(int response_id); // Override from Gtk::Dialog
+ virtual void on_response(int response_id) override; // From Gtk::Dialog
- virtual Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field)
const; // Override from Base_DB_Table_Data
- virtual void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const
Gnome::Gda::Value& value); // Override from Base_DB
+ virtual Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field)
const override; // from Base_DB_Table_Data
+ virtual void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const
Gnome::Gda::Value& value) override; // from Base_DB
- virtual std::shared_ptr<Field> get_field_primary_key() const; // Override from Base_DB_Table_Data
- virtual Gnome::Gda::Value get_primary_key_value_selected() const; // Override from Base_DB_Table_Data
- virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value);
// Override from Base_DB_Table_Data
- virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const; // Override
from Base_DB_Table_Data
+ virtual std::shared_ptr<Field> get_field_primary_key() const override; // from Base_DB_Table_Data
+ virtual Gnome::Gda::Value get_primary_key_value_selected() const override; // from Base_DB_Table_Data
+ virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value)
override; // from Base_DB_Table_Data
+ virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::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/libglom/data_structure/choicevalue.h b/glom/libglom/data_structure/choicevalue.h
index f1de8d2..3df6792 100644
--- a/glom/libglom/data_structure/choicevalue.h
+++ b/glom/libglom/data_structure/choicevalue.h
@@ -58,7 +58,7 @@ public:
* assuming that the value is a title,
* if it is a text value.
*/
- virtual Glib::ustring get_title_original() const;
+ virtual Glib::ustring get_title_original() const override;
/** Whether the value is of a type that can be translated.
* This means that it must be a text type.
diff --git a/glom/libglom/document/bakery/document_xml.h b/glom/libglom/document/bakery/document_xml.h
index a958bff..373448f 100644
--- a/glom/libglom/document/bakery/document_xml.h
+++ b/glom/libglom/document/bakery/document_xml.h
@@ -38,8 +38,8 @@ public:
virtual ~Document_XML();
//overrides:
- virtual bool load_after(int& failure_code);
- virtual bool save_before();
+ virtual bool load_after(int& failure_code) override;
+ virtual bool save_before() override;
void set_dtd_name(const std::string& strVal); //e.g. "glom.dtd"
std::string get_dtd_name() const;
diff --git a/glom/libglom/document/document.h b/glom/libglom/document/document.h
index 42ca909..2e9c2e1 100644
--- a/glom/libglom/document/document.h
+++ b/glom/libglom/document/document.h
@@ -322,7 +322,7 @@ public:
type_example_rows get_table_example_data(const Glib::ustring& table_name) const;
- virtual Glib::ustring get_name() const; //override.
+ virtual Glib::ustring get_name() const override;
Glib::ustring get_default_table() const;
Glib::ustring get_first_table() const;
@@ -497,7 +497,7 @@ public:
private:
//Overrides:
- virtual bool save_before();
+ virtual bool save_before() override;
void save_before_layout_group(xmlpp::Element* node, const std::shared_ptr<const LayoutGroup>& group, bool
with_print_layout_positions = false);
void save_before_sort_by(xmlpp::Element* node, const LayoutItem_GroupBy::type_list_sort_fields&
list_fields);
void save_before_layout_item_usesrelationship(xmlpp::Element* nodeItem, const std::shared_ptr<const
UsesRelationship>& item);
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index 23adc19..3358d2b 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -95,7 +95,7 @@ protected:
virtual void create_layout();
///Fill the existing layout with data from the database.
- virtual bool fill_from_database(); //override.
+ virtual bool fill_from_database() override;
virtual type_vecConstLayoutFields get_fields_to_show() const;
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index 466101c..a8556f2 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -50,30 +50,30 @@ 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
+ virtual bool fill_from_database() override;
+ virtual type_vecConstLayoutFields get_fields_to_show() const override;
+ virtual void create_layout() override;
//Implementations of pure virtual methods from Base_DB_Table_Data:
virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value);
- void on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator& row);
//Override. Not a signal handler.
+ void on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator& row)
override; //Not a signal handler.
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_dialog_layout_hide(); //override.
+ virtual void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual void enable_buttons(); //override
+ virtual void enable_buttons();
//Implementations of pure virtual methods from Base_DB_Table_Data:
virtual Gnome::Gda::Value get_primary_key_value_selected() const;
virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual Dialog_Layout* create_layout_dialog() const; // override.
- virtual void prepare_layout_dialog(Dialog_Layout* dialog); // override.
+ virtual Dialog_Layout* create_layout_dialog() const override;
+ virtual void prepare_layout_dialog(Dialog_Layout* dialog) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
Glib::ustring on_calendar_details(guint year, guint month, guint day);
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index 0c7e6b0..03460cd 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.
+ virtual 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
+ virtual void on_userlevel_changed(AppState::userlevels user_level) override;
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual void on_flowtable_layout_changed();
@@ -132,12 +132,12 @@ protected:
virtual void recalculate_fields_for_related_records(const Glib::ustring& relationship_name);
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual Dialog_Layout* create_layout_dialog() const; // override.
- virtual void prepare_layout_dialog(Dialog_Layout* dialog); // override.
+ virtual Dialog_Layout* create_layout_dialog() const override;
+ virtual void prepare_layout_dialog(Dialog_Layout* dialog) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
std::shared_ptr<Field> m_field_primary_key;
- virtual void show_all_vfunc(); //override.
+ virtual void show_all_vfunc() override;
Gnome::Gda::Value m_primary_key_value;
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index d084393..ee7c290 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -70,7 +70,7 @@ public:
void get_record_counts(gulong& total, gulong& found) const;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_dialog_layout_hide(); //override
+ virtual void on_dialog_layout_hide() override;
#endif //GLOM_ENABLE_CLIENT_ONLY
@@ -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 void create_layout() override;
virtual Document::type_list_layout_groups create_layout_get_layout();
- virtual bool fill_from_database(); //override.
+ virtual bool fill_from_database() override;
virtual void enable_buttons();
virtual std::shared_ptr<Field> get_field_primary_key() const;
@@ -102,8 +102,8 @@ protected:
bool on_script_button_idle(const std::shared_ptr<const LayoutItem_Button>& layout_item, const
Gnome::Gda::Value& primary_key);
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual Dialog_Layout* create_layout_dialog() const; // override.
- virtual void prepare_layout_dialog(Dialog_Layout* dialog); // override.
+ virtual Dialog_Layout* create_layout_dialog() const override;
+ virtual void prepare_layout_dialog(Dialog_Layout* dialog) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
//Member widgets:
diff --git a/glom/mode_data/box_data_list_related.h b/glom/mode_data/box_data_list_related.h
index 8b94c59..8bda5e2 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.
+ virtual bool fill_from_database() override;
//Signal handlers:
void on_adddel_record_changed();
@@ -63,7 +63,7 @@ protected:
#endif // !GLOM_ENABLE_CLIENT_ONLY
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_dialog_layout_hide(); //override.
+ virtual void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
//Implementations of pure virtual methods from Base_DB_Table_Data:
@@ -73,14 +73,14 @@ 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();
- virtual void create_layout();
+ virtual Document::type_list_layout_groups create_layout_get_layout() override;
+ virtual void create_layout() override;
- virtual void enable_buttons(); //override
+ virtual void enable_buttons();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual Dialog_Layout* create_layout_dialog() const; // override.
- virtual void prepare_layout_dialog(Dialog_Layout* dialog); // override.
+ virtual Dialog_Layout* create_layout_dialog() const override;
+ virtual void prepare_layout_dialog(Dialog_Layout* dialog) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index 22ce274..c868498 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -57,7 +57,7 @@ public:
void get_record_counts(gulong& total, gulong& found) const;
protected:
- //virtual Document::type_list_layout_groups create_layout_get_layout(); //overriden in
Box_Data_ManyRecords_Related.
+ //virtual Document::type_list_layout_groups create_layout_get_layout() ; //overriden in
Box_Data_ManyRecords_Related.
void create_layout_add_group(const std::shared_ptr<LayoutGroup>& layout_group);
virtual void print_layout();
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index c658fbd..485c61a 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -93,21 +93,21 @@ public:
virtual void set_find_mode(bool val = true);
protected:
- virtual type_vecConstLayoutFields get_fields_to_show() const; //override
+ virtual type_vecConstLayoutFields get_fields_to_show() const override;
//Implementations of pure virtual methods from Base_DB_Table_Data:
virtual std::shared_ptr<Field> get_field_primary_key() const;
//Overrides of virtual methods from Base_Db_Table_Data:
- virtual void on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator&
row); //Override. Not a signal handler.
- virtual void on_record_deleted(const Gnome::Gda::Value& primary_key_value); //override.
+ virtual void on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator&
row) override; // Not a signal handler.
+ virtual void on_record_deleted(const Gnome::Gda::Value& primary_key_value) override;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_dialog_layout_hide(); //override.
+ virtual void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
protected:
- virtual Document::type_list_layout_groups create_layout_get_layout(); //override.
+ virtual Document::type_list_layout_groups create_layout_get_layout();
void make_record_related(const Gnome::Gda::Value& related_record_primary_key_value);
diff --git a/glom/mode_data/buttonglom.h b/glom/mode_data/buttonglom.h
index cb0b567..2852a53 100644
--- a/glom/mode_data/buttonglom.h
+++ b/glom/mode_data/buttonglom.h
@@ -47,7 +47,7 @@ private:
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual void on_menu_properties_activate();
- virtual bool on_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
};
diff --git a/glom/mode_data/datawidget/cellrenderer_buttonimage.h
b/glom/mode_data/datawidget/cellrenderer_buttonimage.h
index 6147e33..a059571 100644
--- a/glom/mode_data/datawidget/cellrenderer_buttonimage.h
+++ b/glom/mode_data/datawidget/cellrenderer_buttonimage.h
@@ -39,7 +39,7 @@ public:
private:
- virtual bool activate_vfunc(GdkEvent* event, Gtk::Widget& widget, const Glib::ustring& path, const
Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, Gtk::CellRendererState flags);
+ virtual bool activate_vfunc(GdkEvent* event, Gtk::Widget& widget, const Glib::ustring& path, const
Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, Gtk::CellRendererState flags) override;
type_signal_clicked m_signal_clicked;
};
diff --git a/glom/mode_data/datawidget/cellrenderer_buttontext.h
b/glom/mode_data/datawidget/cellrenderer_buttontext.h
index 2aadeb2..078e90e 100644
--- a/glom/mode_data/datawidget/cellrenderer_buttontext.h
+++ b/glom/mode_data/datawidget/cellrenderer_buttontext.h
@@ -39,7 +39,7 @@ public:
private:
- virtual bool activate_vfunc(GdkEvent* event, Gtk::Widget& widget, const Glib::ustring& path, const
Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, Gtk::CellRendererState flags);
+ virtual bool activate_vfunc(GdkEvent* event, Gtk::Widget& widget, const Glib::ustring& path, const
Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, Gtk::CellRendererState flags) override;
type_signal_clicked m_signal_clicked;
};
diff --git a/glom/mode_data/datawidget/checkbutton.h b/glom/mode_data/datawidget/checkbutton.h
index 53ee203..d5ddc5c 100644
--- a/glom/mode_data/datawidget/checkbutton.h
+++ b/glom/mode_data/datawidget/checkbutton.h
@@ -51,7 +51,7 @@ private:
void init();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event); //override
+ virtual bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
virtual AppWindow* get_appwindow() const;
diff --git a/glom/mode_data/datawidget/combo.h b/glom/mode_data/datawidget/combo.h
index 1b4d78f..599ee65 100644
--- a/glom/mode_data/datawidget/combo.h
+++ b/glom/mode_data/datawidget/combo.h
@@ -55,13 +55,13 @@ public:
//This creates a db-based tree model, with appropriate cell renderers:
virtual void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>&
layout_field, const Gnome::Gda::Value& foreign_key_value);
- virtual void set_read_only(bool read_only = true);
+ virtual void set_read_only(bool read_only = true) override;
/** Set the text from a Gnome::Gda::Value.
*/
- virtual void set_value(const Gnome::Gda::Value& value);
+ virtual void set_value(const Gnome::Gda::Value& value) override;
- virtual Gnome::Gda::Value get_value() const;
+ virtual Gnome::Gda::Value get_value() const override;
private:
@@ -69,15 +69,15 @@ private:
// Note that this is a normal signal handler when glibmm was complied
// without default signal handlers
- virtual void on_changed(); //From Gtk::ComboBox
+ virtual void on_changed() override; //From Gtk::ComboBox
- virtual void check_for_change();
+ void check_for_change();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual AppWindow* get_appwindow() const;
+ virtual AppWindow* get_appwindow() const override;
Gnome::Gda::Value m_old_value; //TODO: Only useful for navigation, which currently has no implementation.
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.h
b/glom/mode_data/datawidget/combo_as_radio_buttons.h
index f1b437a..a77bbd2 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.h
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.h
@@ -58,7 +58,7 @@ public:
//Override this so we can store the text to compare later.
//This is not virtual, so you must not use it via Gtk::Entry.
- void set_text(const Glib::ustring& text); //override
+ void set_text(const Glib::ustring& text);
Glib::ustring get_text() const;
@@ -83,12 +83,12 @@ private:
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event);
- virtual bool on_radiobutton_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
+ bool on_radiobutton_button_press_event(GdkEventButton *event);
void show_context_menu(GdkEventButton *event);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual AppWindow* get_appwindow() const;
+ virtual AppWindow* get_appwindow() const override;
Glib::ustring m_old_text;
diff --git a/glom/mode_data/datawidget/datawidget.h b/glom/mode_data/datawidget/datawidget.h
index d38076f..25d449f 100644
--- a/glom/mode_data/datawidget/datawidget.h
+++ b/glom/mode_data/datawidget/datawidget.h
@@ -52,7 +52,7 @@ public:
//Override this so we can store the text to compare later.
//This is not virtual, so you must not use it via Gtk::Entry.
- //virtual void set_text(const Glib::ustring& text); //override
+ //virtual void set_text(const Glib::ustring& text) override;
virtual void set_value(const Gnome::Gda::Value& value);
@@ -95,7 +95,7 @@ private:
//Overrides of default signal handlers:
void on_widget_edited(); //From Gtk::Entry, or Gtk::CheckButton.
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton* event); //override.
+ virtual bool on_button_press_event(GdkEventButton* event) override;
virtual void on_child_user_requested_layout();
virtual void on_child_user_requested_layout_properties();
virtual void on_child_layout_item_added(LayoutWidgetBase::enumType item_type);
@@ -112,8 +112,8 @@ private:
void on_self_style_changed(const Glib::RefPtr<Gtk::Style>& style);
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_menupopup_activate_layout(); //override
- virtual void on_menupopup_activate_layout_properties(); //override
+ virtual void on_menupopup_activate_layout() override;
+ virtual void on_menupopup_activate_layout_properties() override;
//virtual void on_menupopup_add_item(LayoutWidgetBase::enumType item);
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/mode_data/datawidget/entry.h b/glom/mode_data/datawidget/entry.h
index 454e9a2..0696aff 100644
--- a/glom/mode_data/datawidget/entry.h
+++ b/glom/mode_data/datawidget/entry.h
@@ -46,37 +46,37 @@ public:
explicit Entry(Field::glom_field_type glom_type = Field::TYPE_TEXT);
virtual ~Entry();
- virtual void set_layout_item(const std::shared_ptr<LayoutItem>& layout_item, const Glib::ustring&
table_name);
+ virtual void set_layout_item(const std::shared_ptr<LayoutItem>& layout_item, const Glib::ustring&
table_name) override;
void set_glom_type(Field::glom_field_type glom_type);
//Override this so we can store the text to compare later.
//This is not virtual, so you must not use it via Gtk::Entry.
- void set_text(const Glib::ustring& text); //override
+ void set_text(const Glib::ustring& text);
/** Set the text from a Gnome::Gda::Value.
*/
- virtual void set_value(const Gnome::Gda::Value& value);
+ virtual void set_value(const Gnome::Gda::Value& value) override;
- virtual Gnome::Gda::Value get_value() const;
+ virtual Gnome::Gda::Value get_value() const override;
- virtual void set_read_only(bool read_only = true);
+ virtual void set_read_only(bool read_only = true) override;
private:
void init();
//Overrides of default signal handlers:
- virtual void on_changed(); //From Gtk::Entry.
- virtual void on_activate(); //From Gtk::Entry.
- virtual bool on_focus_out_event(GdkEventFocus* event); //From Gtk::Widget
+ virtual void on_changed() override; //From Gtk::Entry.
+ virtual void on_activate() override; //From Gtk::Entry.
+ virtual bool on_focus_out_event(GdkEventFocus* event) override; //From Gtk::Widget
- virtual void check_for_change();
+ void check_for_change();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event); //override
+ virtual bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual AppWindow* get_appwindow() const;
+ virtual AppWindow* get_appwindow() const override;
Glib::ustring m_old_text;
Field::glom_field_type m_glom_type; //Store the type so we can validate the text accordingly.
diff --git a/glom/mode_data/datawidget/label.h b/glom/mode_data/datawidget/label.h
index c90f53e..8858c37 100644
--- a/glom/mode_data/datawidget/label.h
+++ b/glom/mode_data/datawidget/label.h
@@ -55,7 +55,7 @@ private:
Gtk::Label m_label;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
virtual void on_menu_properties_activate();
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/mode_data/datawidget/textview.cc b/glom/mode_data/datawidget/textview.cc
index a3ea074..267346b 100644
--- a/glom/mode_data/datawidget/textview.cc
+++ b/glom/mode_data/datawidget/textview.cc
@@ -135,6 +135,7 @@ void TextView::on_activate()
}
*/
+//TODO: Remove this? It doesn't seem to be used.
void TextView::on_buffer_changed()
{
check_for_change();
diff --git a/glom/mode_data/datawidget/textview.h b/glom/mode_data/datawidget/textview.h
index c267327..c66ae11 100644
--- a/glom/mode_data/datawidget/textview.h
+++ b/glom/mode_data/datawidget/textview.h
@@ -50,7 +50,7 @@ public:
//Override this so we can store the text to compare later.
//This is not virtual, so you must not use it via Gtk::Entry.
- void set_text(const Glib::ustring& text); //override
+ void set_text(const Glib::ustring& text);
/** Set the text from a Gnome::Gda::Value.
*/
@@ -68,15 +68,15 @@ private:
void init();
//Overrides of default signal handlers:
- virtual void on_buffer_changed();
- //virtual void on_activate(); //From Gtk::Entry.
- virtual bool on_textview_focus_out_event(GdkEventFocus* event); //From Gtk::Widget
+ void on_buffer_changed();
+ //virtual void on_activate() override; //From Gtk::Entry.
+ bool on_textview_focus_out_event(GdkEventFocus* event);
//virtual void on_insert_text(const Glib::ustring& text, int* position); //From Gtk::Editable
virtual void check_for_change();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event); //override
+ virtual bool on_button_press_event(GdkEventButton *event) override;
#endif
virtual AppWindow* get_appwindow() const;
diff --git a/glom/mode_data/datawidget/treemodel_db.h b/glom/mode_data/datawidget/treemodel_db.h
index 7d922de..195d843 100644
--- a/glom/mode_data/datawidget/treemodel_db.h
+++ b/glom/mode_data/datawidget/treemodel_db.h
@@ -153,23 +153,23 @@ private:
protected:
// Overrides:
- virtual Gtk::TreeModelFlags get_flags_vfunc() const;
- virtual int get_n_columns_vfunc() const;
- virtual GType get_column_type_vfunc(int index) const;
- virtual void get_value_vfunc(const TreeModel::iterator& iter, int column, Glib::ValueBase& value) const;
+ virtual Gtk::TreeModelFlags get_flags_vfunc() const override;
+ virtual int get_n_columns_vfunc() const override;
+ virtual GType get_column_type_vfunc(int index) const override;
+ virtual void get_value_vfunc(const TreeModel::iterator& iter, int column, Glib::ValueBase& value) const
override;
- bool iter_next_vfunc(const iterator& iter, iterator& iter_next) const;
+ bool iter_next_vfunc(const iterator& iter, iterator& iter_next) const override;
//TODO: Make sure that we make all of these const when we have made them all const in the TreeModel:
- virtual bool iter_children_vfunc(const iterator& parent, iterator& iter) const;
- virtual bool iter_has_child_vfunc(const iterator& iter) const;
- virtual int iter_n_children_vfunc(const iterator& iter) const;
- virtual int iter_n_root_children_vfunc() const;
- virtual bool iter_nth_child_vfunc(const iterator& parent, int n, iterator& iter) const;
- virtual bool iter_nth_root_child_vfunc(int n, iterator& iter) const;
- virtual bool iter_parent_vfunc(const iterator& child, iterator& iter) const;
- virtual Path get_path_vfunc(const iterator& iter) const;
- virtual bool get_iter_vfunc(const Path& path, iterator& iter) const;
+ virtual bool iter_children_vfunc(const iterator& parent, iterator& iter) const override;
+ virtual bool iter_has_child_vfunc(const iterator& iter) const override;
+ virtual int iter_n_children_vfunc(const iterator& iter) const override;
+ virtual int iter_n_root_children_vfunc() const override;
+ virtual bool iter_nth_child_vfunc(const iterator& parent, int n, iterator& iter) const override;
+ virtual bool iter_nth_root_child_vfunc(int n, iterator& iter) const override;
+ virtual bool iter_parent_vfunc(const iterator& child, iterator& iter) const override;
+ virtual Path get_path_vfunc(const iterator& iter) const override;
+ virtual bool get_iter_vfunc(const Path& path, iterator& iter) const override;
private:
bool iter_is_valid(const iterator& iter) const;
diff --git a/glom/mode_data/datawidget/treemodel_db_withextratext.h
b/glom/mode_data/datawidget/treemodel_db_withextratext.h
index 7e610e3..4034674 100644
--- a/glom/mode_data/datawidget/treemodel_db_withextratext.h
+++ b/glom/mode_data/datawidget/treemodel_db_withextratext.h
@@ -57,9 +57,9 @@ public:
int get_text_column() const;
private:
- virtual int get_n_columns_vfunc() const;
- virtual GType get_column_type_vfunc(int index) const;
- virtual void get_value_vfunc(const TreeModel::iterator& iter, int column, Glib::ValueBase& value) const;
+ virtual int get_n_columns_vfunc() const override;
+ virtual GType get_column_type_vfunc(int index) const override;
+ virtual void get_value_vfunc(const TreeModel::iterator& iter, int column, Glib::ValueBase& value) const
override;
int m_column_index_first; //The index of the first field in the TreeModel.
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index 658dfa0..82cddc7 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -277,9 +277,9 @@ private:
void set_value(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const LayoutItem_Field>&
layout_item, const Gnome::Gda::Value& value, bool set_specified_field_layout);
//Overrides of Base_DB/Base_DB_Table methods:
- virtual void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const
Gnome::Gda::Value& value);
- 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 Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field)
const;
+ virtual void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const
Gnome::Gda::Value& value) override;
+ virtual void set_entered_field_data(const Gtk::TreeModel::iterator& row, const std::shared_ptr<const
LayoutItem_Field>& field, const Gnome::Gda::Value& value) override;
+ virtual Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field)
const override;
virtual Gtk::TreeModel::iterator get_row_selected();
//Implementations of pure virtual methods from Base_DB_Table_Data:
diff --git a/glom/mode_data/db_adddel/db_adddel_withbuttons.h
b/glom/mode_data/db_adddel/db_adddel_withbuttons.h
index 1f4a465..40e48a4 100644
--- a/glom/mode_data/db_adddel/db_adddel_withbuttons.h
+++ b/glom/mode_data/db_adddel/db_adddel_withbuttons.h
@@ -33,9 +33,9 @@ public:
DbAddDel_WithButtons();
virtual ~DbAddDel_WithButtons();
- virtual void set_allow_add(bool val = true); //override
- virtual void set_allow_delete(bool val = true); //override
- virtual void set_allow_user_actions(bool bVal = true); //override
+ virtual void set_allow_add(bool val = true) override;
+ virtual void set_allow_delete(bool val = true) override;
+ virtual void set_allow_user_actions(bool bVal = true) override;
///Whether each row should have a button, to request edit.
virtual void set_allow_view_details(bool val = true);
@@ -48,7 +48,7 @@ private:
void on_button_edit();
virtual void on_selection_changed(bool selection);
- virtual void show_all_vfunc();
+ virtual void show_all_vfunc() override;
//member widgets:
Gtk::ButtonBox m_ButtonBox;
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 374cba7..57025c1 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -286,7 +286,7 @@ private:
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual void on_menu_properties_activate();
virtual void on_menu_delete_activate(); // override this to add a dialog box
- virtual bool on_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
};
diff --git a/glom/mode_data/notebook_data.h b/glom/mode_data/notebook_data.h
index 88b0629..41a960d 100644
--- a/glom/mode_data/notebook_data.h
+++ b/glom/mode_data/notebook_data.h
@@ -55,12 +55,12 @@ public:
void select_page_for_find_results(); //Details for 1, List for > 1.
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void do_menu_developer_layout(); //override
+ virtual void do_menu_developer_layout() override;
void set_enable_layout_drag_and_drop(bool enable = true);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual void do_menu_file_print(); //override
+ virtual void do_menu_file_print() override;
void do_menu_file_add_record();
diff --git a/glom/mode_design/box_db_table_relationships.h b/glom/mode_design/box_db_table_relationships.h
index dbf15c1..23e2fed 100644
--- a/glom/mode_design/box_db_table_relationships.h
+++ b/glom/mode_design/box_db_table_relationships.h
@@ -36,7 +36,7 @@ public:
void init(); //avoid duplication in constructors.
- virtual void save_to_document(); //override.
+ virtual void save_to_document() override;
private:
virtual bool fill_from_database();
diff --git a/glom/mode_design/dialog_database_preferences.h b/glom/mode_design/dialog_database_preferences.h
index f349943..e2fbc8b 100644
--- a/glom/mode_design/dialog_database_preferences.h
+++ b/glom/mode_design/dialog_database_preferences.h
@@ -50,11 +50,11 @@ public:
std::shared_ptr<SharedConnection> connect_to_server_with_connection_settings() const;
- virtual void load_from_document(); //override
- virtual void save_to_document(); //override
+ virtual void load_from_document() override;
+ virtual void save_to_document() override;
private:
- void on_response(int response_id);
+ void on_response(int response_id) override;
void on_button_choose_image();
void on_button_test_script();
diff --git a/glom/mode_design/dialog_initial_password.h b/glom/mode_design/dialog_initial_password.h
index f33f4cd..e42ea80 100644
--- a/glom/mode_design/dialog_initial_password.h
+++ b/glom/mode_design/dialog_initial_password.h
@@ -47,7 +47,7 @@ public:
Glib::ustring get_user() const;
Glib::ustring get_password() const;
- virtual void load_from_document(); //override
+ virtual void load_from_document() override;
private:
diff --git a/glom/mode_design/dialog_relationships.h b/glom/mode_design/dialog_relationships.h
index f443d2d..0ba1112 100644
--- a/glom/mode_design/dialog_relationships.h
+++ b/glom/mode_design/dialog_relationships.h
@@ -38,7 +38,7 @@ public:
virtual bool init_db_details(const Glib::ustring& table_name);
- virtual void on_hide();
+ virtual void on_hide() override;
private:
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h
b/glom/mode_design/fields/dialog_fielddefinition.h
index 7eae7a3..4b5eea0 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -66,7 +66,7 @@ private:
//void on_foreach(Gtk::Widget& widget);
//Disable/enable other controls when a control is selected.
- virtual void enforce_constraints(); //override.
+ virtual void enforce_constraints() override;
Gtk::Entry* m_pEntry_Name;
Combo_FieldType* m_pCombo_Type;
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.h
b/glom/mode_design/layout/dialog_layout_calendar_related.h
index adcef53..85298bb 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -60,8 +60,8 @@ private:
virtual void save_to_document();
//signal handlers:
- virtual void on_button_add_field(); //override
- virtual void on_button_edit(); //override
+ virtual void on_button_add_field() override;
+ virtual void on_button_edit() override;
void on_combo_relationship_changed();
diff --git a/glom/mode_design/layout/dialog_layout_list_related.h
b/glom/mode_design/layout/dialog_layout_list_related.h
index 66f47ba..e081a22 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -61,8 +61,8 @@ protected:
virtual Glib::ustring get_fields_table() const;
//signal handlers:
- virtual void on_button_add_field(); //override
- virtual void on_button_edit(); //override
+ virtual void on_button_add_field() override;
+ virtual void on_button_edit() override;
void on_combo_relationship_changed();
diff --git a/glom/mode_design/layout/treestore_layout.h b/glom/mode_design/layout/treestore_layout.h
index 4bff534..3c831b7 100644
--- a/glom/mode_design/layout/treestore_layout.h
+++ b/glom/mode_design/layout/treestore_layout.h
@@ -56,8 +56,8 @@ public:
private:
//Overridden virtual functions:
- virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const;
- virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData&
selection_data) const;
+ virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const override;
+ virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData&
selection_data) const override;
};
diff --git a/glom/mode_design/print_layouts/box_print_layouts.h
b/glom/mode_design/print_layouts/box_print_layouts.h
index eccaa3c..3482cf3 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
+ virtual bool fill_from_database() override;
virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const PrintLayout>&
print_layout);
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.h
b/glom/mode_design/print_layouts/window_print_layout_edit.h
index e06cc76..12a844b 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -119,7 +119,7 @@ private:
bool on_vruler_button_press_event(GdkEventButton* event);
//override:
- virtual bool on_configure_event(GdkEventConfigure* event);
+ virtual bool on_configure_event(GdkEventConfigure* event) override;
void do_menu_view_show_grid(bool active);
void do_menu_view_show_rules(bool active);
diff --git a/glom/mode_design/report_layout/treestore_report_layout.h
b/glom/mode_design/report_layout/treestore_report_layout.h
index 26fe28a..e05ec94 100644
--- a/glom/mode_design/report_layout/treestore_report_layout.h
+++ b/glom/mode_design/report_layout/treestore_report_layout.h
@@ -57,8 +57,8 @@ public:
private:
//Overridden virtual functions:
- virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const;
- virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData&
selection_data) const;
+ virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const override;
+ virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData&
selection_data) const override;
};
diff --git a/glom/mode_design/script_library/dialog_script_library.h
b/glom/mode_design/script_library/dialog_script_library.h
index d435844..d512ded 100644
--- a/glom/mode_design/script_library/dialog_script_library.h
+++ b/glom/mode_design/script_library/dialog_script_library.h
@@ -43,8 +43,8 @@ public:
Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ScriptLibrary();
- virtual void load_from_document();
- virtual void save_to_document();
+ virtual void load_from_document() override;
+ virtual void save_to_document() override;
private:
void on_button_add();
diff --git a/glom/mode_design/translation/dialog_identify_original.h
b/glom/mode_design/translation/dialog_identify_original.h
index c2ed61e..1fb169b 100644
--- a/glom/mode_design/translation/dialog_identify_original.h
+++ b/glom/mode_design/translation/dialog_identify_original.h
@@ -44,7 +44,7 @@ public:
Glib::ustring get_locale() const;
- virtual void load_from_document(); //override
+ virtual void load_from_document() override;
private:
Gtk::Label* m_label_original;
diff --git a/glom/mode_design/translation/window_translations.h
b/glom/mode_design/translation/window_translations.h
index 6b801b3..c386801 100644
--- a/glom/mode_design/translation/window_translations.h
+++ b/glom/mode_design/translation/window_translations.h
@@ -46,8 +46,8 @@ public:
Window_Translations(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Window_Translations();
- virtual void load_from_document(); //override
- virtual void save_to_document(); //override
+ virtual void load_from_document() override;
+ virtual void save_to_document() override;
private:
diff --git a/glom/mode_design/users/dialog_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index 74dee62..09814a4 100644
--- a/glom/mode_design/users/dialog_groups_list.h
+++ b/glom/mode_design/users/dialog_groups_list.h
@@ -42,7 +42,7 @@ public:
virtual ~Dialog_GroupsList();
//Refresh the UI when we get the document, from add_view:
- virtual void load_from_document();
+ virtual void load_from_document() override;
/**
* @param layout "list" or "details"
diff --git a/glom/mode_find/box_data_details_find.h b/glom/mode_find/box_data_details_find.h
index 8bb7253..0944a55 100644
--- a/glom/mode_find/box_data_details_find.h
+++ b/glom/mode_find/box_data_details_find.h
@@ -34,12 +34,12 @@ public:
bool init_db_details(const Glib::ustring& table_name, const Glib::ustring& layout_platform);
- virtual Gtk::Widget* get_default_button(); //override
+ virtual Gtk::Widget* get_default_button() override;
private:
- virtual bool fill_from_database(); //override.
- virtual void fill_related(); //override.
+ virtual 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 f78b20f..7a4b61c 100644
--- a/glom/mode_find/box_data_list_find.h
+++ b/glom/mode_find/box_data_list_find.h
@@ -34,11 +34,11 @@ public:
virtual bool init_db_details(const Glib::ustring& table_name, const Glib::ustring& layout_platform);
- virtual Gtk::Widget* get_default_button(); //override
+ virtual Gtk::Widget* get_default_button() override;
private:
- virtual bool fill_from_database(); //override.
+ virtual 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 93b798c..faae731 100644
--- a/glom/navigation/box_tables.h
+++ b/glom/navigation/box_tables.h
@@ -46,7 +46,7 @@ public:
virtual ~Box_Tables();
private:
- bool fill_from_database(); //override
+ bool fill_from_database() override;
void fill_table_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const TableInfo>&
table_info);
diff --git a/glom/notebook_glom.h b/glom/notebook_glom.h
index b484244..e508aed 100644
--- a/glom/notebook_glom.h
+++ b/glom/notebook_glom.h
@@ -51,7 +51,7 @@ public:
protected:
- void on_show();
+ void on_show() override;
Gtk::Window* get_app_window();
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index fd5d2ea..07c1924 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -82,11 +82,11 @@ public:
// Set the accessible name for the TreeView widget
void set_treeview_accessible_name(const Glib::ustring& name);
- void set_allow_user_actions(bool bVal = true);
+ virtual void set_allow_user_actions(bool bVal = true);
bool get_allow_user_actions() const;
- void set_allow_add(bool val = true);
- void set_allow_delete(bool val = true);
+ virtual void set_allow_add(bool val = true);
+ virtual void set_allow_delete(bool val = true);
Gtk::TreeModel::iterator add_item(const Glib::ustring& strKey); //Return index of new row.
diff --git a/glom/utility_widgets/adddel/adddel_withbuttons.h
b/glom/utility_widgets/adddel/adddel_withbuttons.h
index 490bd73..2b8a0fc 100644
--- a/glom/utility_widgets/adddel/adddel_withbuttons.h
+++ b/glom/utility_widgets/adddel/adddel_withbuttons.h
@@ -34,9 +34,9 @@ public:
AddDel_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~AddDel_WithButtons();
- virtual void set_allow_add(bool val = true); //override
- virtual void set_allow_delete(bool val = true); //override
- virtual void set_allow_user_actions(bool bVal = true); //override
+ void set_allow_add(bool val = true) override;
+ void set_allow_delete(bool val = true) override;
+ void set_allow_user_actions(bool bVal = true) override;
/**
* @param label The button label text, including the mnemonic underline.
@@ -59,7 +59,7 @@ private:
void on_button_edit();
void on_button_extra();
- virtual void show_all_vfunc();
+ virtual void show_all_vfunc() override;
//member widgets:
Gtk::ButtonBox m_ButtonBox;
diff --git a/glom/utility_widgets/flowtable.h b/glom/utility_widgets/flowtable.h
index c8e3909..3a3d872 100644
--- a/glom/utility_widgets/flowtable.h
+++ b/glom/utility_widgets/flowtable.h
@@ -37,7 +37,7 @@ public:
typedef Gtk::Container type_base;
void add_widgets(Gtk::Widget& first, Gtk::Widget& second, bool expand_second = false);
- void add_widgets(Gtk::Widget& first, bool expand = false); //override
+ void add_widgets(Gtk::Widget& first, bool expand = false);
/** Show extra UI that is useful in RAD tools:
*/
@@ -63,7 +63,7 @@ protected:
*/
type_const_list_widgets get_first_child_widgets() const;
- virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+ virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
private:
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index c827167..1caa671 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -68,7 +68,7 @@ private:
virtual void on_size_allocate(Gtk::Allocation& allocation);
- virtual bool on_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
void on_menupopup_activate_open_file();
void on_menupopup_activate_open_file_with();
diff --git a/glom/utility_widgets/notebooklabelglom.h b/glom/utility_widgets/notebooklabelglom.h
index 6dc0092..efb537d 100644
--- a/glom/utility_widgets/notebooklabelglom.h
+++ b/glom/utility_widgets/notebooklabelglom.h
@@ -56,7 +56,7 @@ private:
void on_menu_new_group_activate();
void on_menu_delete_activate();
- virtual bool on_button_press_event(GdkEventButton *event);
+ virtual bool on_button_press_event(GdkEventButton *event) override;
Glib::RefPtr<Gio::SimpleAction> m_refNewGroup;
Glib::RefPtr<Gio::SimpleAction> m_refDelete;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]