[glom] Remove virtual keywords from overrides.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Remove virtual keywords from overrides.
- Date: Fri, 30 Oct 2015 08:43:56 +0000 (UTC)
commit 09263ddbf12020b4603a3111f0de9f143b584aac
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Oct 29 10:53:31 2015 +0100
Remove virtual keywords from overrides.
glom/application.h | 6 ++--
glom/appwindow.h | 16 ++++++------
glom/bakery/appwindow_withdoc.h | 2 +-
glom/base_db.h | 2 +-
glom/frame_glom.h | 2 +-
glom/import_csv/dialog_import_csv_progress.h | 2 +-
glom/libglom/connectionpool_backends/backend.h | 2 +-
glom/libglom/data_structure/choicevalue.h | 2 +-
glom/libglom/document/document.h | 2 +-
glom/mode_data/box_data.h | 2 +-
glom/mode_data/box_data_calendar_related.h | 2 +-
glom/mode_data/box_data_details.h | 6 ++--
glom/mode_data/box_data_list.h | 6 ++--
glom/mode_data/box_data_list_related.h | 6 ++--
glom/mode_data/box_data_portal.h | 4 +-
.../datawidget/cellrenderer_buttonimage.h | 2 +-
.../mode_data/datawidget/cellrenderer_buttontext.h | 2 +-
glom/mode_data/datawidget/checkbutton.h | 2 +-
glom/mode_data/datawidget/combo_as_radio_buttons.h | 4 +-
glom/mode_data/datawidget/datawidget.h | 8 +++---
glom/mode_data/datawidget/entry.h | 18 +++++++-------
glom/mode_data/datawidget/textview.h | 4 +-
glom/mode_data/datawidget/treemodel_db.h | 26 ++++++++++----------
.../datawidget/treemodel_db_withextratext.h | 6 ++--
glom/mode_data/notebook_data.h | 4 +-
glom/mode_design/dialog_database_preferences.h | 4 +-
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 +-
glom/mode_design/layout/treestore_layout.h | 4 +-
.../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 | 2 +-
glom/mode_find/box_data_list_find.h | 2 +-
glom/utility_widgets/adddel/adddel_withbuttons.h | 2 +-
glom/utility_widgets/flowtable.h | 2 +-
41 files changed, 91 insertions(+), 91 deletions(-)
---
diff --git a/glom/application.h b/glom/application.h
index 3a3d965..0dae484 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -37,11 +37,11 @@ public:
protected:
//Overrides of default signal handlers:
- virtual void on_activate() override;
- virtual void on_startup() override;
+ void on_activate() override;
+ void on_startup() override;
virtual void on_open(const Gio::Application::type_vec_files& files,
const Glib::ustring& hint) override;
- virtual int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line) override;
+ 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 1d17947..4e74f04 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -175,11 +175,11 @@ public:
protected:
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
+ void init_menus() override; //Override this to add more or different menus.
+ void init_menus_file() override; //Call this from init_menus() to add the standard file menu.
+ void init_menus_edit() override; //Call this from init_menus() to add the standard edit menu
- virtual void on_hide() override;
+ void on_hide() override;
//Overrides from AppWindow_WithDoc:
void document_history_add(const Glib::ustring& file_uri) override;
@@ -227,9 +227,9 @@ protected:
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;
+ void init_create_document() override;
+ bool on_document_load() override;
+ 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;
+ 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 1aa1fe9..15ee15f 100644
--- a/glom/bakery/appwindow_withdoc.h
+++ b/glom/bakery/appwindow_withdoc.h
@@ -60,7 +60,7 @@ public:
virtual ~AppWindow_WithDoc();
- virtual void init() override; //overridden to create document.
+ void init() override; //overridden to create document.
enum class enumSaveChanges
{
diff --git a/glom/base_db.h b/glom/base_db.h
index 2abc7b5..56642d5 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -66,7 +66,7 @@ public:
static std::shared_ptr<SharedConnection> connect_to_server(Gtk::Window* parent_window = 0);
- virtual void set_document(Document* pDocument) override; //View override
+ void set_document(Document* pDocument) override; //View override
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/frame_glom.h b/glom/frame_glom.h
index b1d3f63..a180ef2 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -189,7 +189,7 @@ public:
private:
- //virtual void set_document(Document* pDocument) override;
+ //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 79867da..f87b273 100644
--- a/glom/import_csv/dialog_import_csv_progress.h
+++ b/glom/import_csv/dialog_import_csv_progress.h
@@ -55,7 +55,7 @@ private:
void on_data_source_state_changed();
bool on_idle_import();
- virtual void on_response(int response_id) override; // From Gtk::Dialog
+ void on_response(int response_id) override; // From Gtk::Dialog
Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field) const
override; // from Base_DB_Table_Data
void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const Gnome::Gda::Value&
value) override; // from Base_DB
diff --git a/glom/libglom/connectionpool_backends/backend.h b/glom/libglom/connectionpool_backends/backend.h
index 7acaaf4..1b07729 100644
--- a/glom/libglom/connectionpool_backends/backend.h
+++ b/glom/libglom/connectionpool_backends/backend.h
@@ -47,7 +47,7 @@ public:
ExceptionConnection(failure_type failure);
virtual ~ExceptionConnection() noexcept;
- virtual const char* what() const noexcept override;
+ const char* what() const noexcept override;
failure_type get_failure_type() const;
diff --git a/glom/libglom/data_structure/choicevalue.h b/glom/libglom/data_structure/choicevalue.h
index a63ecd5..56d17b1 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 noexcept override;
+ Glib::ustring get_title_original() const noexcept 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/document.h b/glom/libglom/document/document.h
index f768239..dfc6c17 100644
--- a/glom/libglom/document/document.h
+++ b/glom/libglom/document/document.h
@@ -326,7 +326,7 @@ public:
type_example_rows get_table_example_data(const Glib::ustring& table_name) const;
- virtual Glib::ustring get_name() const override;
+ Glib::ustring get_name() const override;
Glib::ustring get_default_table() const;
Glib::ustring get_first_table() const;
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index 3358d2b..d31c38d 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;
+ 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 bd6f163..0e697fd 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -62,7 +62,7 @@ private:
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;
+ void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
void enable_buttons();
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index cd7e135..d7c4b7e 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -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;
+ Dialog_Layout* create_layout_dialog() const override;
+ 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;
+ 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 f941aaf..b0921fe 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;
+ void on_dialog_layout_hide() override;
#endif //GLOM_ENABLE_CLIENT_ONLY
@@ -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;
+ Dialog_Layout* create_layout_dialog() const override;
+ 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 3476bfa..6664218 100644
--- a/glom/mode_data/box_data_list_related.h
+++ b/glom/mode_data/box_data_list_related.h
@@ -63,7 +63,7 @@ protected:
#endif // !GLOM_ENABLE_CLIENT_ONLY
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_dialog_layout_hide() override;
+ void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
//Implementations of pure virtual methods from Base_DB_Table_Data:
@@ -79,8 +79,8 @@ protected:
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;
+ Dialog_Layout* create_layout_dialog() const override;
+ void prepare_layout_dialog(Dialog_Layout* dialog) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index f5069b1..8396c5a 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -93,7 +93,7 @@ public:
virtual void set_find_mode(bool val = true);
protected:
- virtual type_vecConstLayoutFields get_fields_to_show() const override;
+ type_vecConstLayoutFields get_fields_to_show() const override;
//Implementations of pure virtual methods from Base_DB_Table_Data:
std::shared_ptr<Field> get_field_primary_key() const override;
@@ -103,7 +103,7 @@ protected:
void on_record_deleted(const Gnome::Gda::Value& primary_key_value) override;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_dialog_layout_hide() override;
+ void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
protected:
diff --git a/glom/mode_data/datawidget/cellrenderer_buttonimage.h
b/glom/mode_data/datawidget/cellrenderer_buttonimage.h
index a059571..ef69110 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) override;
+ 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 078e90e..df2f9a2 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) override;
+ 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 d316913..5496e1c 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;
+ bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
AppWindow* get_appwindow() const override;
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.h
b/glom/mode_data/datawidget/combo_as_radio_buttons.h
index f2c91e9..b608665 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.h
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.h
@@ -83,12 +83,12 @@ private:
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event) override;
+ 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 override;
+ 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 47cc469..1b9c6ac 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;
+ //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* button_event) override;
+ bool on_button_press_event(GdkEventButton* button_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;
+ void on_menupopup_activate_layout() override;
+ 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 fab06a0..c2dd6c4 100644
--- a/glom/mode_data/datawidget/entry.h
+++ b/glom/mode_data/datawidget/entry.h
@@ -46,7 +46,7 @@ public:
explicit Entry(Field::glom_field_type glom_type = Field::glom_field_type::TEXT);
virtual ~Entry();
- virtual void set_layout_item(const std::shared_ptr<LayoutItem>& layout_item, const Glib::ustring&
table_name) override;
+ 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);
@@ -56,27 +56,27 @@ public:
/** Set the text from a Gnome::Gda::Value.
*/
- virtual void set_value(const Gnome::Gda::Value& value) override;
+ void set_value(const Gnome::Gda::Value& value) override;
- virtual Gnome::Gda::Value get_value() const override;
+ Gnome::Gda::Value get_value() const override;
- virtual void set_read_only(bool read_only = true) override;
+ void set_read_only(bool read_only = true) override;
private:
void init();
//Overrides of default signal handlers:
- virtual void on_changed() override; //From Gtk::Entry.
- virtual void on_activate() override; //From Gtk::Entry.
- virtual bool on_focus_out_event(GdkEventFocus* focus_event) override; //From Gtk::Widget
+ void on_changed() override; //From Gtk::Entry.
+ void on_activate() override; //From Gtk::Entry.
+ bool on_focus_out_event(GdkEventFocus* focus_event) override; //From Gtk::Widget
void check_for_change();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event) override;
+ bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual AppWindow* get_appwindow() const override;
+ 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/textview.h b/glom/mode_data/datawidget/textview.h
index df1dedc..9dc553f 100644
--- a/glom/mode_data/datawidget/textview.h
+++ b/glom/mode_data/datawidget/textview.h
@@ -69,14 +69,14 @@ private:
//Overrides of default signal handlers:
void on_buffer_changed();
- //virtual void on_activate() override; //From Gtk::Entry.
+ //void on_activate() override; //From Gtk::Entry.
bool on_textview_focus_out_event(GdkEventFocus* focus_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;
+ bool on_button_press_event(GdkEventButton *event) override;
#endif
AppWindow* get_appwindow() const override;
diff --git a/glom/mode_data/datawidget/treemodel_db.h b/glom/mode_data/datawidget/treemodel_db.h
index 8b97a1e..d42d721 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 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;
+ Gtk::TreeModelFlags get_flags_vfunc() const override;
+ int get_n_columns_vfunc() const override;
+ GType get_column_type_vfunc(int index) const override;
+ 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 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 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;
+ bool iter_children_vfunc(const iterator& parent, iterator& iter) const override;
+ bool iter_has_child_vfunc(const iterator& iter) const override;
+ int iter_n_children_vfunc(const iterator& iter) const override;
+ int iter_n_root_children_vfunc() const override;
+ bool iter_nth_child_vfunc(const iterator& parent, int n, iterator& iter) const override;
+ bool iter_nth_root_child_vfunc(int n, iterator& iter) const override;
+ bool iter_parent_vfunc(const iterator& child, iterator& iter) const override;
+ Path get_path_vfunc(const iterator& iter) const override;
+ 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 4034674..71b9232 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 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 get_n_columns_vfunc() const override;
+ GType get_column_type_vfunc(int index) const override;
+ 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/notebook_data.h b/glom/mode_data/notebook_data.h
index 3ffb1a5..841ea4b 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;
+ 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;
+ void do_menu_file_print() override;
void do_menu_file_add_record();
diff --git a/glom/mode_design/dialog_database_preferences.h b/glom/mode_design/dialog_database_preferences.h
index e2fbc8b..e9d91c1 100644
--- a/glom/mode_design/dialog_database_preferences.h
+++ b/glom/mode_design/dialog_database_preferences.h
@@ -50,8 +50,8 @@ public:
std::shared_ptr<SharedConnection> connect_to_server_with_connection_settings() const;
- virtual void load_from_document() override;
- virtual void save_to_document() override;
+ void load_from_document() override;
+ void save_to_document() override;
private:
void on_response(int response_id) override;
diff --git a/glom/mode_design/dialog_initial_password.h b/glom/mode_design/dialog_initial_password.h
index e42ea80..5cee9da 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;
+ void load_from_document() override;
private:
diff --git a/glom/mode_design/dialog_relationships.h b/glom/mode_design/dialog_relationships.h
index 559d5ab..b5ec140 100644
--- a/glom/mode_design/dialog_relationships.h
+++ b/glom/mode_design/dialog_relationships.h
@@ -38,7 +38,7 @@ public:
bool init_db_details(const Glib::ustring& table_name) override;
- virtual void on_hide() override;
+ void on_hide() override;
private:
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h
b/glom/mode_design/fields/dialog_fielddefinition.h
index 4b5eea0..e199711 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;
+ 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 375ec5f..764c354 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:
void save_to_document() override;
//signal handlers:
- virtual void on_button_add_field() override;
- virtual void on_button_edit() override;
+ void on_button_add_field() override;
+ 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 3c831b7..b72bed8 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 override;
- virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData&
selection_data) const override;
+ bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const override;
+ 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/window_print_layout_edit.h
b/glom/mode_design/print_layouts/window_print_layout_edit.h
index e79f8ae..e96a527 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* button_event);
//override:
- virtual bool on_configure_event(GdkEventConfigure* configure_event) override;
+ bool on_configure_event(GdkEventConfigure* configure_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 e05ec94..4034c29 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 override;
- virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData&
selection_data) const override;
+ bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const override;
+ 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 d512ded..4080d5f 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() override;
- virtual void save_to_document() override;
+ void load_from_document() override;
+ 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 1fb169b..4651923 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;
+ 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 c386801..7bf980f 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;
+ void load_from_document() override;
+ 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 500ce95..e5615ab 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() override;
+ 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 6b9f00e..4b96d47 100644
--- a/glom/mode_find/box_data_details_find.h
+++ b/glom/mode_find/box_data_details_find.h
@@ -34,7 +34,7 @@ public:
bool init_db_details(const Glib::ustring& table_name, const Glib::ustring& layout_platform);
- virtual Gtk::Widget* get_default_button() override;
+ Gtk::Widget* get_default_button() override;
private:
diff --git a/glom/mode_find/box_data_list_find.h b/glom/mode_find/box_data_list_find.h
index c73b753..76caff3 100644
--- a/glom/mode_find/box_data_list_find.h
+++ b/glom/mode_find/box_data_list_find.h
@@ -34,7 +34,7 @@ public:
virtual bool init_db_details(const Glib::ustring& table_name, const Glib::ustring& layout_platform);
- virtual Gtk::Widget* get_default_button() override;
+ Gtk::Widget* get_default_button() override;
private:
diff --git a/glom/utility_widgets/adddel/adddel_withbuttons.h
b/glom/utility_widgets/adddel/adddel_withbuttons.h
index 2b8a0fc..23b7ef0 100644
--- a/glom/utility_widgets/adddel/adddel_withbuttons.h
+++ b/glom/utility_widgets/adddel/adddel_withbuttons.h
@@ -59,7 +59,7 @@ private:
void on_button_edit();
void on_button_extra();
- virtual void show_all_vfunc() override;
+ 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 3a3d872..86bc826 100644
--- a/glom/utility_widgets/flowtable.h
+++ b/glom/utility_widgets/flowtable.h
@@ -63,7 +63,7 @@ protected:
*/
type_const_list_widgets get_first_child_widgets() const;
- virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
+ bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
private:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]