[glom] Remove more unnecessary virtual keywords.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Remove more unnecessary virtual keywords.
- Date: Fri, 30 Oct 2015 08:44:16 +0000 (UTC)
commit 57515ef4097f48bd55df16a55f9368f13116b043
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Oct 30 09:36:03 2015 +0100
Remove more unnecessary virtual keywords.
There should now be almost no virtual methods that are never overridden.
glom/application.h | 2 +-
glom/appwindow.h | 2 +-
glom/base_db.h | 4 ++--
glom/base_db_table_data_readonly.h | 2 +-
glom/box_reports.h | 10 +++++-----
glom/mode_data/box_data.h | 2 +-
glom/mode_data/box_data_details.h | 4 ++--
glom/mode_design/fields/box_db_table_definition.h | 2 +-
glom/mode_design/layout/dialog_layout.h | 2 +-
glom/utility_widgets/placeholder.h | 6 +++---
glom/variablesmap.h | 2 +-
11 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/glom/application.h b/glom/application.h
index 0dae484..51b8416 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -39,7 +39,7 @@ protected:
//Overrides of default signal handlers:
void on_activate() override;
void on_startup() override;
- virtual void on_open(const Gio::Application::type_vec_files& files,
+ void on_open(const Gio::Application::type_vec_files& files,
const Glib::ustring& hint) override;
int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line) override;
diff --git a/glom/appwindow.h b/glom/appwindow.h
index 4e74f04..088f86e 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -255,7 +255,7 @@ private:
void on_window_translations_hide();
- virtual void on_userlevel_changed(AppState::userlevels userlevel);
+ void on_userlevel_changed(AppState::userlevels userlevel);
Document* on_connection_pool_get_document();
diff --git a/glom/base_db.h b/glom/base_db.h
index 56642d5..9fb15d0 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -61,8 +61,8 @@ public:
/** Returns whether we are in developer mode.
* Some functionality will be deactivated when not in developer mode.
*/
- virtual AppState::userlevels get_userlevel() const;
- virtual void set_userlevel(AppState::userlevels value);
+ AppState::userlevels get_userlevel() const;
+ void set_userlevel(AppState::userlevels value);
static std::shared_ptr<SharedConnection> connect_to_server(Gtk::Window* parent_window = 0);
diff --git a/glom/base_db_table_data_readonly.h b/glom/base_db_table_data_readonly.h
index f0f698f..6e2e28b 100644
--- a/glom/base_db_table_data_readonly.h
+++ b/glom/base_db_table_data_readonly.h
@@ -38,7 +38,7 @@ public:
Base_DB_Table_Data_ReadOnly();
virtual ~Base_DB_Table_Data_ReadOnly();
- virtual bool refresh_data_from_database();
+ bool refresh_data_from_database();
protected:
diff --git a/glom/box_reports.h b/glom/box_reports.h
index 94b0b77..69e0cd3 100644
--- a/glom/box_reports.h
+++ b/glom/box_reports.h
@@ -39,17 +39,17 @@ public:
private:
bool fill_from_database() override;
- virtual void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Report>& report);
+ void fill_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Report>& report);
#ifndef GLOM_ENABLE_CLIENT_ONLY
void save_to_document() override;
#endif
//Signal handlers:
- virtual void on_adddel_Add(const Gtk::TreeModel::iterator& row);
- virtual void on_adddel_Delete(const Gtk::TreeModel::iterator& rowStart, const Gtk::TreeModel::iterator&
rowEnd);
- virtual void on_adddel_Edit(const Gtk::TreeModel::iterator& row);
- virtual void on_adddel_changed(const Gtk::TreeModel::iterator& row, guint column);
+ void on_adddel_Add(const Gtk::TreeModel::iterator& row);
+ void on_adddel_Delete(const Gtk::TreeModel::iterator& rowStart, const Gtk::TreeModel::iterator& rowEnd);
+ void on_adddel_Edit(const Gtk::TreeModel::iterator& row);
+ void on_adddel_changed(const Gtk::TreeModel::iterator& row, guint column);
void on_userlevel_changed(AppState::userlevels userlevel) override;
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index 2657557..c13e1a0 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -51,7 +51,7 @@ public:
bool init_db_details(const FoundSet& found_set, const Glib::ustring& layout_platform);
//Fill the existing layout with data from the database:
- virtual bool refresh_data_from_database_with_where_clause(const FoundSet& found_set);
+ bool refresh_data_from_database_with_where_clause(const FoundSet& found_set);
virtual void print_layout(); //A test, for now.
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index 2c7def4..8072a23 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -41,8 +41,8 @@ public:
virtual ~Box_Data_Details();
bool init_db_details(const FoundSet& found_set, const Glib::ustring& layout_platform, const
Gnome::Gda::Value& primary_key_value);
- virtual bool refresh_data_from_database_with_primary_key(const Gnome::Gda::Value& primary_key_value);
- virtual bool refresh_data_from_database_blank();
+ bool refresh_data_from_database_with_primary_key(const Gnome::Gda::Value& primary_key_value);
+ bool refresh_data_from_database_blank();
void print_layout() override;
diff --git a/glom/mode_design/fields/box_db_table_definition.h
b/glom/mode_design/fields/box_db_table_definition.h
index 62b8e88..2d1c8f8 100644
--- a/glom/mode_design/fields/box_db_table_definition.h
+++ b/glom/mode_design/fields/box_db_table_definition.h
@@ -38,7 +38,7 @@ public:
private:
void init(); //Avoid duplicating code in constructors.
bool fill_from_database() override;
- virtual void fill_fields();
+ void fill_fields();
void fill_field_row(const Gtk::TreeModel::iterator& iter, const std::shared_ptr<const Field>& field);
diff --git a/glom/mode_design/layout/dialog_layout.h b/glom/mode_design/layout/dialog_layout.h
index 9a551da..bb9eecd 100644
--- a/glom/mode_design/layout/dialog_layout.h
+++ b/glom/mode_design/layout/dialog_layout.h
@@ -51,7 +51,7 @@ public:
protected:
- virtual void treeview_fill_sequences(const Glib::RefPtr<Gtk::TreeModel> model, const
Gtk::TreeModelColumn<guint>& sequence_column);
+ void treeview_fill_sequences(const Glib::RefPtr<Gtk::TreeModel> model, const Gtk::TreeModelColumn<guint>&
sequence_column);
virtual void enable_buttons();
void save_to_document() override;
diff --git a/glom/utility_widgets/placeholder.h b/glom/utility_widgets/placeholder.h
index 7a28d12..18b3f03 100644
--- a/glom/utility_widgets/placeholder.h
+++ b/glom/utility_widgets/placeholder.h
@@ -37,10 +37,10 @@ public:
virtual ~PlaceHolder();
void add(Gtk::Widget& child) override;
- virtual void remove();
+ void remove();
- virtual Gtk::Widget* get_child();
- virtual const Gtk::Widget* get_child() const;
+ Gtk::Widget* get_child();
+ const Gtk::Widget* get_child() const;
private:
Gtk::Widget* m_pChild;
diff --git a/glom/variablesmap.h b/glom/variablesmap.h
index 2472b92..cccbf06 100644
--- a/glom/variablesmap.h
+++ b/glom/variablesmap.h
@@ -73,7 +73,7 @@ protected:
/** Override this to validate the data that the user enters into the widgets.
* The return value indicates whether the widgets' data is valid.
*/
- virtual bool validate_widgets();
+ /* virtual */ bool validate_widgets();
void transfer_one_widget(Gtk::Widget* pWidget, bool to_variable);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]