[glom] Remove unnecessary virtual keywords.



commit 2724980ca05f75973c90079c75525012b8a7cbc2
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 29 11:45:03 2015 +0100

    Remove unnecessary virtual keywords.

 glom/bakery/appwindow.h                           |    3 ++-
 glom/libglom/appstate.h                           |    6 +++---
 glom/libglom/connectionpool.h                     |    2 +-
 glom/libglom/data_structure/layout/formatting.h   |    4 ++--
 glom/libglom/data_structure/layout/layoutitem.h   |    4 ++--
 glom/mode_data/box_data_details.h                 |    8 ++++----
 glom/mode_data/datawidget/datawidget.h            |   16 ++++++++--------
 glom/mode_data/datawidget/textview.h              |    4 ++--
 glom/mode_data/db_adddel/db_adddel.h              |    4 ++--
 glom/mode_data/db_adddel/db_treeviewcolumn_glom.h |    4 ++--
 10 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/glom/bakery/appwindow.h b/glom/bakery/appwindow.h
index bca4de3..071217f 100644
--- a/glom/bakery/appwindow.h
+++ b/glom/bakery/appwindow.h
@@ -57,7 +57,8 @@ public:
 
   virtual void init(); //Sets it up and shows it.
 
-  virtual Glib::ustring get_version() const;
+  //TODO: Remove this?
+  Glib::ustring get_version() const;
 
   static void set_command_line_args(int argc, char** &argv); //Needed for session management.
 
diff --git a/glom/libglom/appstate.h b/glom/libglom/appstate.h
index 299ca10..fcbf208 100644
--- a/glom/libglom/appstate.h
+++ b/glom/libglom/appstate.h
@@ -45,14 +45,14 @@ public:
   /** Returns whether we are in developer mode.
    * Some functionality will be deactivated when not in developer mode.
    */
-  virtual userlevels get_userlevel() const;
+  userlevels get_userlevel() const;
 
   /** This will cause the userlevel_changed signal to be emitted.
   */
-  virtual void set_userlevel(userlevels value);
+  void set_userlevel(userlevels value);
 
   /// Use this to set the initial UI state:
-  virtual void emit_userlevel_changed();
+  void emit_userlevel_changed();
 
   typedef sigc::signal<void, userlevels> type_signal_userlevel_changed;
 
diff --git a/glom/libglom/connectionpool.h b/glom/libglom/connectionpool.h
index 73f78af..7233fe0 100644
--- a/glom/libglom/connectionpool.h
+++ b/glom/libglom/connectionpool.h
@@ -243,7 +243,7 @@ public:
    * @param network_shared Whether the database (and document) should be available to other users over the 
network,
    * if possible.
    */
-  virtual bool set_network_shared(const SlotProgress& slot_progress, bool network_shared = true);
+  bool set_network_shared(const SlotProgress& slot_progress, bool network_shared = true);
 
   /** Add a field to the database.
    * The caller should then update the document's list of fields,
diff --git a/glom/libglom/data_structure/layout/formatting.h b/glom/libglom/data_structure/layout/formatting.h
index 1a368e7..f9850e5 100644
--- a/glom/libglom/data_structure/layout/formatting.h
+++ b/glom/libglom/data_structure/layout/formatting.h
@@ -59,8 +59,8 @@ public:
   void set_has_custom_choices(bool val = true);
 
   typedef std::vector< std::shared_ptr<ChoiceValue> > type_list_values;
-  virtual type_list_values get_choices_custom() const;
-  virtual void set_choices_custom(const type_list_values& choices);
+  type_list_values get_choices_custom() const;
+  void set_choices_custom(const type_list_values& choices);
 
   /** Get the original text that corresponds to the translated choice for the 
    * current locale.
diff --git a/glom/libglom/data_structure/layout/layoutitem.h b/glom/libglom/data_structure/layout/layoutitem.h
index 98311aa..76a16f5 100644
--- a/glom/libglom/data_structure/layout/layoutitem.h
+++ b/glom/libglom/data_structure/layout/layoutitem.h
@@ -45,8 +45,8 @@ public:
 
   bool operator==(const LayoutItem& src) const;
 
-  virtual bool get_editable() const;
-  virtual void set_editable(bool val = true);
+  bool get_editable() const;
+  void set_editable(bool val = true);
 
   virtual Glib::ustring get_layout_display_name() const;
   virtual Glib::ustring get_part_type_name() const = 0;
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index d7c4b7e..2c7def4 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -110,14 +110,14 @@ protected:
   void on_userlevel_changed(AppState::userlevels user_level) override;
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  virtual void on_flowtable_layout_changed();
+  void on_flowtable_layout_changed();
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
   //Signal handler: The last 2 args are bind-ed.
-  virtual void on_related_record_added(Gnome::Gda::Value key_value, Glib::ustring strFromKeyName);
+  void on_related_record_added(Gnome::Gda::Value key_value, Glib::ustring strFromKeyName);
 
   //Signal handler: The last arg is bind-ed.
-  //virtual void on_related_user_requested_details(Gnome::Gda::Value key_value, Glib::ustring table_name);
+  //void on_related_user_requested_details(Gnome::Gda::Value key_value, Glib::ustring table_name);
 
   //This is virtual so it can be overriden in Box_Data_Details_Find.
   virtual void on_flowtable_field_edited(const std::shared_ptr<const LayoutItem_Field>& layout_field, const 
Gnome::Gda::Value& value);
@@ -129,7 +129,7 @@ protected:
 
   void on_flowtable_script_button_clicked(const std::shared_ptr<const LayoutItem_Button>& layout_item);
 
-  virtual void recalculate_fields_for_related_records(const Glib::ustring& relationship_name);
+  void recalculate_fields_for_related_records(const Glib::ustring& relationship_name);
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   Dialog_Layout* create_layout_dialog() const override;
diff --git a/glom/mode_data/datawidget/datawidget.h b/glom/mode_data/datawidget/datawidget.h
index 1b9c6ac..742e6ff 100644
--- a/glom/mode_data/datawidget/datawidget.h
+++ b/glom/mode_data/datawidget/datawidget.h
@@ -47,8 +47,8 @@ public:
   explicit DataWidget(const std::shared_ptr<LayoutItem_Field>& field, const Glib::ustring& table_name, const 
Document* document);
   virtual ~DataWidget();
 
-  virtual Gtk::Label* get_label();
-  virtual const Gtk::Label* get_label() const;
+  Gtk::Label* get_label();
+  const Gtk::Label* get_label() const;
 
   //Override this so we can store the text to compare later.
   //This is not virtual, so you must not use it via Gtk::Entry.
@@ -58,8 +58,8 @@ public:
 
   virtual Gnome::Gda::Value get_value() const;
 
-  virtual void set_editable(bool editable = true);
-  virtual void set_viewable(bool viewable = true);
+  void set_editable(bool editable = true);
+  void set_viewable(bool viewable = true);
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   static std::shared_ptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name, const 
std::shared_ptr<const LayoutItem_Field>& start_field, Document* document, AppWindow* app);
@@ -96,9 +96,9 @@ private:
   void on_widget_edited(); //From Gtk::Entry, or Gtk::CheckButton.
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   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);
+  void on_child_user_requested_layout();
+  void on_child_user_requested_layout_properties();
+  void on_child_layout_item_added(LayoutWidgetBase::enumType item_type);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
   void on_button_open_details();
   void on_button_select_id();
@@ -114,7 +114,7 @@ private:
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   void on_menupopup_activate_layout() override;
   void on_menupopup_activate_layout_properties() override;
-  //virtual void on_menupopup_add_item(LayoutWidgetBase::enumType item);
+  //void on_menupopup_add_item(LayoutWidgetBase::enumType item);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
   AppWindow* get_appwindow() const override;
diff --git a/glom/mode_data/datawidget/textview.h b/glom/mode_data/datawidget/textview.h
index 9dc553f..7de002e 100644
--- a/glom/mode_data/datawidget/textview.h
+++ b/glom/mode_data/datawidget/textview.h
@@ -71,9 +71,9 @@ private:
   void on_buffer_changed();
   //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
+  //void on_insert_text(const Glib::ustring& text, int* position); //From Gtk::Editable
 
-  virtual void check_for_change();
+  void check_for_change();
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   bool on_button_press_event(GdkEventButton *event) override;
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index 61113ee..5f248a8 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -56,7 +56,7 @@ public:
   virtual ~DbAddDel();
 
   virtual void set_allow_user_actions(bool bVal = true);
-  virtual bool get_allow_user_actions() const;
+  bool get_allow_user_actions() const;
 
   virtual void set_allow_add(bool val = true);
   virtual void set_allow_delete(bool val = true);
@@ -194,7 +194,7 @@ public:
   Gtk::TreeModel::iterator get_row(const Gnome::Gda::Value& key);
 
   void finish_editing(); //Closes active edit controls and commits the data to the cell.
-  //virtual void reactivate(); //Sheet doesn't seem to update unless a cell is active.
+  //void reactivate(); //Sheet doesn't seem to update unless a cell is active.
   void set_prevent_user_signals(bool bVal = true);
 
   //TODO_refactor: make private.
diff --git a/glom/mode_data/db_adddel/db_treeviewcolumn_glom.h 
b/glom/mode_data/db_adddel/db_treeviewcolumn_glom.h
index d34752b..e8ad57a 100644
--- a/glom/mode_data/db_adddel/db_treeviewcolumn_glom.h
+++ b/glom/mode_data/db_adddel/db_treeviewcolumn_glom.h
@@ -32,8 +32,8 @@ public:
   DbTreeViewColumnGlom(const Glib::ustring& title, Gtk::CellRenderer& cell);
   virtual ~DbTreeViewColumnGlom();
 
-  virtual Glib::ustring get_column_id() const;
-  virtual void set_column_id(const Glib::ustring& value);
+  Glib::ustring get_column_id() const;
+  void set_column_id(const Glib::ustring& value);
 
 private:
   Glib::ustring m_column_id; 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]