[glom] C++11: Yet more use of override keyword.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] C++11: Yet more use of override keyword.
- Date: Wed, 28 Oct 2015 10:11:05 +0000 (UTC)
commit 3d0bdf048cb168cb6e783926029f5971ba115835
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Oct 27 09:35:31 2015 +0100
C++11: Yet more use of override keyword.
glom/base_db_table_data.h | 2 +-
glom/import_csv/dialog_import_csv_progress.h | 12 ++++++------
glom/mode_data/box_data_calendar_related.h | 16 ++++++++--------
glom/mode_data/box_data_details.h | 18 +++++++++---------
glom/mode_data/box_data_list.h | 18 +++++++++---------
glom/mode_data/box_data_list_related.h | 16 ++++++++--------
glom/mode_data/box_data_manyrecords.h | 2 +-
glom/mode_data/box_data_portal.h | 6 +++---
glom/mode_data/buttonglom.h | 6 +++---
glom/mode_data/datawidget/checkbutton.h | 2 +-
glom/mode_data/datawidget/datawidget.h | 2 +-
glom/mode_data/datawidget/label.h | 6 +++---
glom/mode_data/datawidget/textview.h | 2 +-
glom/mode_data/datawidget/treemodel_db.h | 2 +-
glom/mode_data/db_adddel/db_adddel.h | 16 ++++++++--------
glom/mode_data/db_adddel/db_adddel_withbuttons.h | 12 ++++++------
glom/mode_data/flowtablewithfields.h | 8 ++++----
.../layout/layout_item_dialogs/dialog_notebook.h | 2 +-
.../print_layouts/print_layout_toolbar_button.h | 4 ++--
.../report_layout/dialog_layout_report.h | 2 +-
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 | 3 +--
glom/mode_find/box_data_list_find.h | 2 +-
glom/utility_widgets/dialog_properties.h | 2 +-
.../eggspreadtablemm/eggspreadtabledndmm.h | 2 +-
glom/utility_widgets/imageglom.h | 2 +-
glom/utility_widgets/layouttoolbarbutton.h | 4 ++--
glom/utility_widgets/notebookglom.h | 2 +-
glom/utility_widgets/notebooklabelglom.h | 2 +-
glom/utility_widgets/placeholder.h | 2 +-
31 files changed, 89 insertions(+), 90 deletions(-)
---
diff --git a/glom/base_db_table_data.h b/glom/base_db_table_data.h
index 351cc4f..742aca1 100644
--- a/glom/base_db_table_data.h
+++ b/glom/base_db_table_data.h
@@ -60,7 +60,7 @@ protected:
virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) =
0;
- virtual void refresh_related_fields(const LayoutFieldInRecord& field_in_record_changed, const
Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& field_value);
+ void refresh_related_fields(const LayoutFieldInRecord& field_in_record_changed, const
Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& field_value) override;
/** Get the fields that are in related tables, via a relationship using @a field_name changes.
*/
diff --git a/glom/import_csv/dialog_import_csv_progress.h b/glom/import_csv/dialog_import_csv_progress.h
index 41afffb..79867da 100644
--- a/glom/import_csv/dialog_import_csv_progress.h
+++ b/glom/import_csv/dialog_import_csv_progress.h
@@ -57,13 +57,13 @@ private:
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
+ 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
- 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> get_field_primary_key() const override; // from Base_DB_Table_Data
+ Gnome::Gda::Value get_primary_key_value_selected() const override; // from Base_DB_Table_Data
+ void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
// from Base_DB_Table_Data
+ 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/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index 2ad0194..bd6f163 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -43,11 +43,11 @@ public:
/**
* @param portal: The full portal details
*/
- virtual bool init_db_details(const std::shared_ptr<const LayoutItem_Portal>& portal, bool show_title =
true);
+ bool init_db_details(const std::shared_ptr<const LayoutItem_Portal>& portal, bool show_title = true)
override;
/** Use this if no portal is yet defined, so the user can use the context menu to define a portal.
*/
- virtual bool init_db_details(const Glib::ustring& parent_table, bool show_title = true);
+ bool init_db_details(const Glib::ustring& parent_table, bool show_title = true) override;
private:
bool fill_from_database() override;
@@ -56,7 +56,7 @@ private:
//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 set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
void on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator& row)
override; //Not a signal handler.
@@ -65,15 +65,15 @@ private:
virtual void on_dialog_layout_hide() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
- void enable_buttons() override;
+ 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;
+ Gnome::Gda::Value get_primary_key_value_selected() const override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
#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
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 8bd816f..cd7e135 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -44,7 +44,7 @@ public:
virtual bool refresh_data_from_database_with_primary_key(const Gnome::Gda::Value& primary_key_value);
virtual bool refresh_data_from_database_blank();
- virtual void print_layout();
+ void print_layout() override;
//Signals:
@@ -76,22 +76,22 @@ protected:
//Implementations of pure virtual methods from Base_DB_Table_Data:
public:
- virtual Gnome::Gda::Value get_primary_key_value_selected() const; //Value in the primary key's cell.
+ Gnome::Gda::Value get_primary_key_value_selected() const override; //Value in the primary key's cell.
protected:
- virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value);
- virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const; //Actual
primary key value of this record.
+ void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override; //Actual
primary key value of this record.
- 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);
- virtual void set_entered_field_data(const Gtk::TreeModel::iterator& row, const std::shared_ptr<const
LayoutItem_Field>& field, const Gnome::Gda::Value& value);
+ Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field) const
override;
+ void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const Gnome::Gda::Value&
value) override;
+ void set_entered_field_data(const Gtk::TreeModel::iterator& row, const std::shared_ptr<const
LayoutItem_Field>& field, const Gnome::Gda::Value& value) override;
bool fill_from_database() override;
- virtual void create_layout();
+ void create_layout() override;
//virtual void fill_related();
- virtual std::shared_ptr<Field> get_field_primary_key() const;
+ std::shared_ptr<Field> get_field_primary_key() const override;
void set_found_set_from_primary_key_value();
private:
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index 7077f59..f941aaf 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -40,14 +40,14 @@ public:
Gnome::Gda::Value get_primary_key_value_first() const;
//Implementations of pure virtual methods from Base_DB_Table_Data:
- virtual Gnome::Gda::Value get_primary_key_value_selected() const;
- virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value);
+ Gnome::Gda::Value get_primary_key_value_selected() const override;
+ void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
- 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);
- virtual void set_entered_field_data(const Gtk::TreeModel::iterator& row, const std::shared_ptr<const
LayoutItem_Field>& field, const Gnome::Gda::Value& value);
+ Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field) const
override;
+ void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const Gnome::Gda::Value&
value) override;
+ 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 Gtk::TreeModel::iterator get_row_selected();
+ Gtk::TreeModel::iterator get_row_selected() override;
bool get_showing_multiple_records() const;
@@ -57,7 +57,7 @@ public:
void set_open_button_title(const Glib::ustring& title);
///Highlight and scroll to the specified record, with primary key value @primary_key_value.
- void set_primary_key_value_selected(const Gnome::Gda::Value& primary_key_value);
+ void set_primary_key_value_selected(const Gnome::Gda::Value& primary_key_value) override;
//Signal Handlers:
@@ -77,7 +77,7 @@ public:
protected:
//Implementations of pure virtual methods from Base_DB_Table_Data:
- virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
//Overrides of functions from Box_Data:
void create_layout() override;
@@ -86,7 +86,7 @@ protected:
bool fill_from_database() override;
virtual void enable_buttons();
- virtual std::shared_ptr<Field> get_field_primary_key() const;
+ std::shared_ptr<Field> get_field_primary_key() const override;
//Signal handlers:
void on_adddel_user_requested_edit(const Gtk::TreeModel::iterator& row);
diff --git a/glom/mode_data/box_data_list_related.h b/glom/mode_data/box_data_list_related.h
index 793d346..3476bfa 100644
--- a/glom/mode_data/box_data_list_related.h
+++ b/glom/mode_data/box_data_list_related.h
@@ -36,13 +36,13 @@ public:
/**
* @param portal: The full portal details
*/
- virtual bool init_db_details(const std::shared_ptr<const LayoutItem_Portal>& portal, bool show_title =
true);
+ bool init_db_details(const std::shared_ptr<const LayoutItem_Portal>& portal, bool show_title = true)
override;
/** Use this if no portal is yet defined, so the user can use the context menu to define a portal.
*/
- virtual bool init_db_details(const Glib::ustring& parent_table, bool show_title = true);
+ bool init_db_details(const Glib::ustring& parent_table, bool show_title = true) override;
- virtual void set_find_mode(bool val = true);
+ void set_find_mode(bool val = true) override;
protected:
bool fill_from_database() override;
@@ -67,16 +67,16 @@ protected:
#endif // !GLOM_ENABLE_CLIENT_ONLY
//Implementations of pure virtual methods from Base_DB_Table_Data:
- virtual std::shared_ptr<Field> get_field_primary_key() const; //TODO: Already in base class?
- virtual Gnome::Gda::Value get_primary_key_value_selected() const;
- virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value);
- virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const;
+ std::shared_ptr<Field> get_field_primary_key() const override; //TODO: Already in base class?
+ Gnome::Gda::Value get_primary_key_value_selected() const override;
+ void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
//Overrides of functions from Box_Data:
Document::type_list_layout_groups create_layout_get_layout() override;
void create_layout() override;
- void enable_buttons() override;
+ void enable_buttons();
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual Dialog_Layout* create_layout_dialog() const override;
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index c868498..1f21999 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -60,7 +60,7 @@ protected:
//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();
+ void print_layout() override;
virtual void print_layout_group(xmlpp::Element* node_parent, const std::shared_ptr<const LayoutGroup>&
group);
bool m_read_only;
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index 485c61a..f5069b1 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -96,11 +96,11 @@ protected:
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;
+ std::shared_ptr<Field> get_field_primary_key() const override;
//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;
+ void on_record_added(const Gnome::Gda::Value& primary_key_value, const Gtk::TreeModel::iterator& row)
override; // Not a signal handler.
+ void on_record_deleted(const Gnome::Gda::Value& primary_key_value) override;
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual void on_dialog_layout_hide() override;
diff --git a/glom/mode_data/buttonglom.h b/glom/mode_data/buttonglom.h
index 2852a53..a111075 100644
--- a/glom/mode_data/buttonglom.h
+++ b/glom/mode_data/buttonglom.h
@@ -43,11 +43,11 @@ public:
private:
void init();
- virtual AppWindow* get_appwindow() const;
+ AppWindow* get_appwindow() const override;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void on_menu_properties_activate();
- virtual bool on_button_press_event(GdkEventButton *event) override;
+ void on_menu_properties_activate() override;
+ bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
};
diff --git a/glom/mode_data/datawidget/checkbutton.h b/glom/mode_data/datawidget/checkbutton.h
index d5ddc5c..740e5ae 100644
--- a/glom/mode_data/datawidget/checkbutton.h
+++ b/glom/mode_data/datawidget/checkbutton.h
@@ -54,7 +54,7 @@ private:
virtual bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual AppWindow* get_appwindow() const;
+ AppWindow* get_appwindow() const override;
};
} //namespace DataWidetChildren
diff --git a/glom/mode_data/datawidget/datawidget.h b/glom/mode_data/datawidget/datawidget.h
index f45322e..47cc469 100644
--- a/glom/mode_data/datawidget/datawidget.h
+++ b/glom/mode_data/datawidget/datawidget.h
@@ -117,7 +117,7 @@ private:
//virtual void on_menupopup_add_item(LayoutWidgetBase::enumType item);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual AppWindow* get_appwindow() const;
+ AppWindow* get_appwindow() const override;
void set_child_size_by_field(const std::shared_ptr<const LayoutItem_Field>& field);
int get_suitable_width(const std::shared_ptr<const LayoutItem_Field>& field_layout);
diff --git a/glom/mode_data/datawidget/label.h b/glom/mode_data/datawidget/label.h
index 8858c37..c2fc4ef 100644
--- a/glom/mode_data/datawidget/label.h
+++ b/glom/mode_data/datawidget/label.h
@@ -51,12 +51,12 @@ public:
private:
void init();
- virtual AppWindow* get_appwindow() const;
+ AppWindow* get_appwindow() const override;
Gtk::Label m_label;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual bool on_button_press_event(GdkEventButton *event) override;
- virtual void on_menu_properties_activate();
+ bool on_button_press_event(GdkEventButton *event) override;
+ void on_menu_properties_activate() override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
};
diff --git a/glom/mode_data/datawidget/textview.h b/glom/mode_data/datawidget/textview.h
index aab6e75..bd2745d 100644
--- a/glom/mode_data/datawidget/textview.h
+++ b/glom/mode_data/datawidget/textview.h
@@ -79,7 +79,7 @@ private:
virtual bool on_button_press_event(GdkEventButton *event) override;
#endif
- virtual AppWindow* get_appwindow() const;
+ 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/treemodel_db.h b/glom/mode_data/datawidget/treemodel_db.h
index 195d843..8b97a1e 100644
--- a/glom/mode_data/datawidget/treemodel_db.h
+++ b/glom/mode_data/datawidget/treemodel_db.h
@@ -174,7 +174,7 @@ private:
bool iter_is_valid(const iterator& iter) const;
- virtual void set_value_impl(const iterator& row, int column, const Glib::ValueBase& value);
+ void set_value_impl(const iterator& row, int column, const Glib::ValueBase& value) override;
typedef DbTreeModelRow typeRow; //X columns, all of type Value.
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index 0edcb2e..61113ee 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -277,16 +277,16 @@ 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) 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();
+ void set_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field, const Gnome::Gda::Value&
value) override;
+ void set_entered_field_data(const Gtk::TreeModel::iterator& row, const std::shared_ptr<const
LayoutItem_Field>& field, const Gnome::Gda::Value& value) override;
+ Gnome::Gda::Value get_entered_field_data(const std::shared_ptr<const LayoutItem_Field>& field) const
override;
+ Gtk::TreeModel::iterator get_row_selected() override;
//Implementations of pure virtual methods from Base_DB_Table_Data:
- virtual std::shared_ptr<Field> get_field_primary_key() const;
- virtual Gnome::Gda::Value get_primary_key_value_selected() const;
- virtual void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value);
- virtual Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const;
+ std::shared_ptr<Field> get_field_primary_key() const override;
+ Gnome::Gda::Value get_primary_key_value_selected() const override;
+ void set_primary_key_value(const Gtk::TreeModel::iterator& row, const Gnome::Gda::Value& value) override;
+ Gnome::Gda::Value get_primary_key_value(const Gtk::TreeModel::iterator& row) const override;
Gtk::CellRenderer* construct_specified_columns_cellrenderer(const std::shared_ptr<LayoutItem>&
layout_item, int model_column_index, int data_model_column_index);
diff --git a/glom/mode_data/db_adddel/db_adddel_withbuttons.h
b/glom/mode_data/db_adddel/db_adddel_withbuttons.h
index 40e48a4..506615b 100644
--- a/glom/mode_data/db_adddel/db_adddel_withbuttons.h
+++ b/glom/mode_data/db_adddel/db_adddel_withbuttons.h
@@ -33,12 +33,12 @@ 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;
+ 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;
///Whether each row should have a button, to request edit.
- virtual void set_allow_view_details(bool val = true);
+ void set_allow_view_details(bool val = true) override;
private:
void setup_buttons();
@@ -46,9 +46,9 @@ private:
void on_button_add();
void on_button_del();
void on_button_edit();
- virtual void on_selection_changed(bool selection);
+ void on_selection_changed(bool selection) override;
- virtual void show_all_vfunc() override;
+ 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 ba479a2..10b2ffd 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -113,7 +113,7 @@ public:
virtual void change_group(const Glib::ustring& id, const Glib::ustring& new_group);
- virtual void set_design_mode(bool value = true);
+ void set_design_mode(bool value = true) override;
virtual void remove_all();
@@ -281,9 +281,9 @@ private:
//menu
#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) override;
+ void on_menu_properties_activate() override;
+ void on_menu_delete_activate() override; // override this to add a dialog box
+ bool on_button_press_event(GdkEventButton *event) override;
#endif // !GLOM_ENABLE_CLIENT_ONLY
};
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
index e636b0a..5b8d9e2 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
@@ -46,7 +46,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/print_layouts/print_layout_toolbar_button.h
b/glom/mode_design/print_layouts/print_layout_toolbar_button.h
index 97fbc9f..a1770e5 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar_button.h
+++ b/glom/mode_design/print_layouts/print_layout_toolbar_button.h
@@ -61,8 +61,8 @@ private:
return "flowtable";
};
- virtual void on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context);
- virtual void on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data,
guint, guint);
+ void on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context) override;
+ void on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint,
guint) override;
private:
enumItems m_type;
diff --git a/glom/mode_design/report_layout/dialog_layout_report.h
b/glom/mode_design/report_layout/dialog_layout_report.h
index 7864a29..b972823 100644
--- a/glom/mode_design/report_layout/dialog_layout_report.h
+++ b/glom/mode_design/report_layout/dialog_layout_report.h
@@ -60,7 +60,7 @@ private:
std::shared_ptr<LayoutGroup> fill_group(const Gtk::TreeModel::iterator& iter, const Glib::RefPtr<const
type_model> model);
//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_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index 18f63f1..500ce95 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:
- void enable_buttons() override;
+ void enable_buttons();
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 55a1823..c3fda95 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:
- void enable_buttons() override;
+ void enable_buttons();
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 7341776..6b9f00e 100644
--- a/glom/mode_find/box_data_details_find.h
+++ b/glom/mode_find/box_data_details_find.h
@@ -41,8 +41,7 @@ private:
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);
-
+ void on_flowtable_field_edited(const std::shared_ptr<const LayoutItem_Field>& id, const Gnome::Gda::Value&
value) override;
};
} //namespace Glom
diff --git a/glom/mode_find/box_data_list_find.h b/glom/mode_find/box_data_list_find.h
index c3c76ad..c73b753 100644
--- a/glom/mode_find/box_data_list_find.h
+++ b/glom/mode_find/box_data_list_find.h
@@ -39,7 +39,7 @@ public:
private:
bool fill_from_database() override;
- virtual void create_layout();
+ void create_layout() override;
//Member widgets:
Gtk::Box m_HBox;
diff --git a/glom/utility_widgets/dialog_properties.h b/glom/utility_widgets/dialog_properties.h
index a6ff7d6..fe92524 100644
--- a/glom/utility_widgets/dialog_properties.h
+++ b/glom/utility_widgets/dialog_properties.h
@@ -37,7 +37,7 @@ public:
virtual ~Dialog_Properties();
//Add a widget (probably a container) to the top half of the dialog:
- virtual void add(Gtk::Widget& widget);
+ void add(Gtk::Widget& widget) override;
virtual void set_modified(bool modified = true);
diff --git a/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h
b/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h
index 8e5da33..4a07ef8 100644
--- a/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h
+++ b/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h
@@ -94,7 +94,7 @@ public:
SpreadTableDnd();
explicit SpreadTableDnd(Gtk::Orientation orientation, guint lines);
- void insert_child(Gtk::Widget& child, int index);
+ void insert_child(Gtk::Widget& child, int index) override;
void remove_child(Gtk::Widget& child);
void set_drag_enabled(EggDragEnableMode drag_enabled);
EggDragEnableMode get_drag_enabled() const;
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index 1caa671..c799564 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -82,7 +82,7 @@ private:
void on_clipboard_clear();
void on_clipboard_received_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
- virtual AppWindow* get_appwindow() const;
+ AppWindow* get_appwindow() const override;
void setup_menu_usermode();
void show_image_data();
diff --git a/glom/utility_widgets/layouttoolbarbutton.h b/glom/utility_widgets/layouttoolbarbutton.h
index e7a565e..08dc4a8 100644
--- a/glom/utility_widgets/layouttoolbarbutton.h
+++ b/glom/utility_widgets/layouttoolbarbutton.h
@@ -46,8 +46,8 @@ private:
return "glom_print_layout_palette";
};
- virtual void on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context);
- virtual void on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data,
guint, guint);
+ void on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context) override;
+ void on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint,
guint) override;
private:
LayoutWidgetBase::enumType m_type;
diff --git a/glom/utility_widgets/notebookglom.h b/glom/utility_widgets/notebookglom.h
index 1c29cd4..a29bbe3 100644
--- a/glom/utility_widgets/notebookglom.h
+++ b/glom/utility_widgets/notebookglom.h
@@ -48,7 +48,7 @@ protected:
protected:
void init();
- virtual AppWindow* get_appwindow() const;
+ AppWindow* get_appwindow() const override;
};
} //namespace Glom
diff --git a/glom/utility_widgets/notebooklabelglom.h b/glom/utility_widgets/notebooklabelglom.h
index efb537d..1a658eb 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) override;
+ bool on_button_press_event(GdkEventButton *event) override;
Glib::RefPtr<Gio::SimpleAction> m_refNewGroup;
Glib::RefPtr<Gio::SimpleAction> m_refDelete;
diff --git a/glom/utility_widgets/placeholder.h b/glom/utility_widgets/placeholder.h
index 3ff3bdd..7a28d12 100644
--- a/glom/utility_widgets/placeholder.h
+++ b/glom/utility_widgets/placeholder.h
@@ -36,7 +36,7 @@ public:
PlaceHolder(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~PlaceHolder();
- virtual void add(Gtk::Widget& child);
+ void add(Gtk::Widget& child) override;
virtual void remove();
virtual Gtk::Widget* get_child();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]