[glom] C++11: Use override keyword with View methods.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] C++11: Use override keyword with View methods.
- Date: Wed, 28 Oct 2015 10:10:55 +0000 (UTC)
commit 26cc5426186aa16637d186e294cd6a390e9edf83
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Oct 27 08:41:04 2015 +0100
C++11: Use override keyword with View methods.
glom/base_db.h | 2 +-
glom/box_reports.h | 2 +-
glom/dialog_connection.h | 2 +-
glom/frame_glom.h | 4 ++--
glom/libglom/document/bakery/view/view_composite.h | 6 +++---
glom/mode_design/layout/dialog_layout.h | 2 +-
.../layout/dialog_layout_calendar_related.h | 2 +-
glom/mode_design/layout/dialog_layout_details.h | 2 +-
.../layout/dialog_layout_list_related.h | 2 +-
glom/mode_design/print_layouts/box_print_layouts.h | 2 +-
.../window_relationships_overview.h | 2 +-
.../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/navigation/box_tables.h | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/glom/base_db.h b/glom/base_db.h
index ccbe057..2abc7b5 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -67,7 +67,7 @@ public:
static std::shared_ptr<SharedConnection> connect_to_server(Gtk::Window* parent_window = 0);
virtual void set_document(Document* pDocument) override; //View override
- virtual void load_from_document() 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/box_reports.h b/glom/box_reports.h
index b1607a7..f6e1f18 100644
--- a/glom/box_reports.h
+++ b/glom/box_reports.h
@@ -42,7 +42,7 @@ private:
virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Report>& report);
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void save_to_document();
+ void save_to_document() override;
#endif
//Signal handlers:
diff --git a/glom/dialog_connection.h b/glom/dialog_connection.h
index c5c03dc..1de34db 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;
+ 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 6019c4b..756327f 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) override; //View override
- virtual void load_from_document() override; //View override
+ void set_document(Document* pDocument) override; //View override
+ void load_from_document() override; //View override
enum class enumModes
{
diff --git a/glom/libglom/document/bakery/view/view_composite.h
b/glom/libglom/document/bakery/view/view_composite.h
index 642d2d4..c6a6fdf 100644
--- a/glom/libglom/document/bakery/view/view_composite.h
+++ b/glom/libglom/document/bakery/view/view_composite.h
@@ -63,7 +63,7 @@ public:
m_vecViews.erase(iter);
}
- virtual void set_document(T_Document* pDocument)
+ void set_document(T_Document* pDocument) override
{
//Call base class:
View<T_Document>::set_document(pDocument);
@@ -76,7 +76,7 @@ public:
}
}
- virtual void load_from_document()
+ void load_from_document() override
{
//Delegate to the child views:
for(const auto& pView : m_vecViews)
@@ -86,7 +86,7 @@ public:
}
}
- virtual void save_to_document()
+ void save_to_document() override
{
//Delegate to the child views:
for(const auto& pView : m_vecViews)
diff --git a/glom/mode_design/layout/dialog_layout.h b/glom/mode_design/layout/dialog_layout.h
index c829d5a..1802b4f 100644
--- a/glom/mode_design/layout/dialog_layout.h
+++ b/glom/mode_design/layout/dialog_layout.h
@@ -54,7 +54,7 @@ protected:
virtual void treeview_fill_sequences(const Glib::RefPtr<Gtk::TreeModel> model, const
Gtk::TreeModelColumn<guint>& sequence_column);
virtual void enable_buttons();
- virtual void save_to_document();
+ void save_to_document() override;
void move_treeview_selection_down(Gtk::TreeView* treeview, const Gtk::TreeModelColumn<guint>&
sequence_column);
void move_treeview_selection_up(Gtk::TreeView* treeview, const Gtk::TreeModelColumn<guint>&
sequence_column);
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.h
b/glom/mode_design/layout/dialog_layout_calendar_related.h
index 85298bb..375ec5f 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -57,7 +57,7 @@ public:
private:
- virtual void save_to_document();
+ void save_to_document() override;
//signal handlers:
virtual void on_button_add_field() override;
diff --git a/glom/mode_design/layout/dialog_layout_details.h b/glom/mode_design/layout/dialog_layout_details.h
index f8da02e..1fa0ee9 100644
--- a/glom/mode_design/layout/dialog_layout_details.h
+++ b/glom/mode_design/layout/dialog_layout_details.h
@@ -55,7 +55,7 @@ protected:
//Enable/disable buttons, depending on treeview selection:
virtual void enable_buttons();
- virtual void save_to_document();
+ void save_to_document() override;
std::shared_ptr<Relationship> offer_relationship_list();
std::shared_ptr<Relationship> offer_relationship_list(const std::shared_ptr<const Relationship>&
relationship);
diff --git a/glom/mode_design/layout/dialog_layout_list_related.h
b/glom/mode_design/layout/dialog_layout_list_related.h
index e081a22..407763c 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -55,7 +55,7 @@ public:
protected:
- virtual void save_to_document();
+ void save_to_document() override;
///@inheritdoc
virtual Glib::ustring get_fields_table() const;
diff --git a/glom/mode_design/print_layouts/box_print_layouts.h
b/glom/mode_design/print_layouts/box_print_layouts.h
index 3482cf3..e495e93 100644
--- a/glom/mode_design/print_layouts/box_print_layouts.h
+++ b/glom/mode_design/print_layouts/box_print_layouts.h
@@ -42,7 +42,7 @@ private:
virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const PrintLayout>&
print_layout);
- virtual void save_to_document();
+ void save_to_document() override;
//Signal handlers:
void on_adddel_user_added(const Gtk::TreeModel::iterator& row);
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.h
b/glom/mode_design/relationships_overview/window_relationships_overview.h
index 19b3bfa..e0aeb49 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.h
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.h
@@ -51,7 +51,7 @@ public:
Window_RelationshipsOverview(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Window_RelationshipsOverview();
- virtual void load_from_document(); //overridden.
+ void load_from_document() override
private:
class TableView;
diff --git a/glom/mode_design/report_layout/dialog_layout_report.h
b/glom/mode_design/report_layout/dialog_layout_report.h
index b4712d8..7864a29 100644
--- a/glom/mode_design/report_layout/dialog_layout_report.h
+++ b/glom/mode_design/report_layout/dialog_layout_report.h
@@ -62,7 +62,7 @@ private:
//Enable/disable buttons, depending on treeview selection:
virtual void enable_buttons();
- virtual void save_to_document();
+ void save_to_document() override;
std::shared_ptr<Relationship> offer_relationship_list();
diff --git a/glom/mode_design/users/dialog_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index 8fb048c..59cab2b 100644
--- a/glom/mode_design/users/dialog_groups_list.h
+++ b/glom/mode_design/users/dialog_groups_list.h
@@ -63,7 +63,7 @@ private:
//Enable/disable buttons, depending on treeview selection:
virtual void enable_buttons();
- virtual void save_to_document();
+ void save_to_document() override;
//signal handlers:
diff --git a/glom/mode_design/users/dialog_users_list.h b/glom/mode_design/users/dialog_users_list.h
index 2bbd71e..a48ffb1 100644
--- a/glom/mode_design/users/dialog_users_list.h
+++ b/glom/mode_design/users/dialog_users_list.h
@@ -58,7 +58,7 @@ private:
//Enable/disable buttons, depending on treeview selection:
virtual void enable_buttons();
- virtual void save_to_document();
+ void save_to_document() override;
//signal handlers:
virtual void on_button_user_delete();
diff --git a/glom/navigation/box_tables.h b/glom/navigation/box_tables.h
index faae731..8f06d5a 100644
--- a/glom/navigation/box_tables.h
+++ b/glom/navigation/box_tables.h
@@ -52,7 +52,7 @@ private:
//Signal handlers:
#ifndef GLOM_ENABLE_CLIENT_ONLY
- virtual void save_to_document();
+ void save_to_document() override;
void on_adddel_Add(const Gtk::TreeModel::iterator& row);
void on_adddel_Delete(const Gtk::TreeModel::iterator& rowStart, const Gtk::TreeModel::iterator& rowEnd);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]