[glom] C++11: AppWindow: Use of override keyword.



commit 26009c36d61d76a463a851a51682804accb4e2c3
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 27 08:37:25 2015 +0100

    C++11: AppWindow: Use of override keyword.

 glom/appwindow.h                |   26 +++++++++++++-------------
 glom/bakery/appwindow_withdoc.h |    8 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/glom/appwindow.h b/glom/appwindow.h
index ab0b0e6..46469df 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -182,14 +182,14 @@ protected:
   virtual void on_hide() override;
 
   //Overrides from AppWindow_WithDoc:
-  virtual void document_history_add(const Glib::ustring& file_uri); //overridden.
-  virtual void document_history_remove(const Glib::ustring& file_uri); //overridden.
-  virtual void update_window_title();
-  virtual void ui_warning(const Glib::ustring& text, const Glib::ustring& secondary_text);
-  virtual Glib::ustring ui_file_select_open(const Glib::ustring& starting_folder_uri = Glib::ustring());
-  virtual Glib::ustring ui_file_select_save(const Glib::ustring& old_file_uri);
-  virtual void ui_show_modification_status();
-  virtual enumSaveChanges ui_offer_to_save_changes();
+  void document_history_add(const Glib::ustring& file_uri) override;
+  void document_history_remove(const Glib::ustring& file_uri) override;
+  void update_window_title() override;
+  void ui_warning(const Glib::ustring& text, const Glib::ustring& secondary_text) override;
+  Glib::ustring ui_file_select_open(const Glib::ustring& starting_folder_uri = Glib::ustring()) override;
+  Glib::ustring ui_file_select_save(const Glib::ustring& old_file_uri) override;
+  void ui_show_modification_status() override;
+  enumSaveChanges ui_offer_to_save_changes() override;
 
 
   //Signal handlers:
@@ -197,10 +197,10 @@ protected:
   //Menus:
 
 
-  virtual void ui_hide();
-  virtual void ui_bring_to_front();
+  void ui_hide() override;
+  void ui_bring_to_front() override;
 
-  virtual bool on_delete_event(GdkEventAny* event) override;
+  bool on_delete_event(GdkEventAny* event) override;
 
   void on_menu_edit_copy_activate();
   void on_menu_edit_cut_activate();
@@ -224,7 +224,7 @@ protected:
   Glib::RefPtr<Gio::SimpleAction> m_action_save, m_action_saveas;
 
 protected:
-  virtual void ui_warning_load_failed(int failure_code = 0); //Override.
+  void ui_warning_load_failed(int failure_code = 0) override;
 
 private:
   virtual void init_create_document() override;
@@ -270,7 +270,7 @@ private:
   void on_connection_avahi_done();
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  void on_menu_help_about();
+  void on_menu_help_about() override;
   void on_about_close();
 
 #ifndef G_OS_WIN32
diff --git a/glom/bakery/appwindow_withdoc.h b/glom/bakery/appwindow_withdoc.h
index a4b569c..1aa1fe9 100644
--- a/glom/bakery/appwindow_withdoc.h
+++ b/glom/bakery/appwindow_withdoc.h
@@ -117,11 +117,11 @@ public:
   virtual void on_menu_file_saveas(); //signal handler.
   virtual void offer_saveas(); //For direct use.
   virtual void on_menu_file_save(); //signal handler.
-  virtual void on_menu_file_close();
+  void on_menu_file_close() override;
 
-  virtual void on_menu_edit_copy();
-  virtual void on_menu_edit_paste();
-  virtual void on_menu_edit_clear();
+  void on_menu_edit_copy() override;
+  void on_menu_edit_paste() override;
+  void on_menu_edit_clear() override;
 
 protected:
   //Document:


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