GNOME.org
 

[gtkmm] C++11: demos/tests: Destructors: Use override instead of virtual.

commit f2bb6d08c64143a3cfaf7860135e5933c1784797
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 24 12:45:03 2015 +0100

    C++11: demos/tests: Destructors: Use override instead of virtual.
    
    This ensures that the base destructor is really virtual.

 demos/gtk-demo/demowindow.h                       |    2 +-
 demos/gtk-demo/example_appwindow.cc               |    2 +-
 demos/gtk-demo/example_builder.cc                 |    2 +-
 demos/gtk-demo/example_buttonbox.cc               |    2 +-
 demos/gtk-demo/example_change_display.cc          |    4 ++--
 demos/gtk-demo/example_colorsel.cc                |    2 +-
 demos/gtk-demo/example_dialog.cc                  |    4 ++--
 demos/gtk-demo/example_drawingarea.cc             |    2 +-
 demos/gtk-demo/example_flowbox.cc                 |    2 +-
 demos/gtk-demo/example_gestures.cc                |    2 +-
 demos/gtk-demo/example_glarea.cc                  |    2 +-
 demos/gtk-demo/example_headerbar.cc               |    2 +-
 demos/gtk-demo/example_iconbrowser.cc             |    6 +++---
 demos/gtk-demo/example_iconview.cc                |    2 +-
 demos/gtk-demo/example_images.cc                  |    2 +-
 demos/gtk-demo/example_menus.cc                   |    2 +-
 demos/gtk-demo/example_overlay.cc                 |    2 +-
 demos/gtk-demo/example_panes.cc                   |    4 ++--
 demos/gtk-demo/example_pixbufs.cc                 |    2 +-
 demos/gtk-demo/example_sizegroup.cc               |    2 +-
 demos/gtk-demo/example_stack.cc                   |    2 +-
 demos/gtk-demo/example_stacksidebar.cc            |    2 +-
 demos/gtk-demo/example_textview.cc                |    4 ++--
 demos/gtk-demo/example_treeview_editable_cells.cc |    2 +-
 demos/gtk-demo/example_treeview_liststore.cc      |    2 +-
 demos/gtk-demo/example_treeview_treestore.cc      |    2 +-
 demos/gtk-demo/textwidget.h                       |    2 +-
 tests/child_widget/testwindow.h                   |    2 +-
 tests/child_widget_managed/main.cc                |    4 ++--
 tests/scrolledwindow/main.cc                      |    4 ++--
 30 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/demos/gtk-demo/demowindow.h b/demos/gtk-demo/demowindow.h
index 10ed70a..739ea8d 100644
--- a/demos/gtk-demo/demowindow.h
+++ b/demos/gtk-demo/demowindow.h
@@ -34,7 +34,7 @@ class DemoWindow : public Gtk::Window
 {
 public:
   DemoWindow();
-  virtual ~DemoWindow();
+  ~DemoWindow() override;
 
 protected:
   void run_example(const Gtk::TreeModel::Row& row);
diff --git a/demos/gtk-demo/example_appwindow.cc b/demos/gtk-demo/example_appwindow.cc
index 1fdcd42..be6c4e5 100644
--- a/demos/gtk-demo/example_appwindow.cc
+++ b/demos/gtk-demo/example_appwindow.cc
@@ -9,7 +9,7 @@ class Example_AppWindow : public Gtk::Window
 {
 public:
   Example_AppWindow();
-  virtual ~Example_AppWindow();
+  ~Example_AppWindow() override;
 
 protected:
   //Signal handlers:
diff --git a/demos/gtk-demo/example_builder.cc b/demos/gtk-demo/example_builder.cc
index 6609ace..e5eb975 100644
--- a/demos/gtk-demo/example_builder.cc
+++ b/demos/gtk-demo/example_builder.cc
@@ -12,7 +12,7 @@ class Example_Builder : public Gtk::Window
 public:
   Example_Builder(BaseObjectType* cobject,
                   const Glib::RefPtr<Gtk::Builder>& builder);
-  virtual ~Example_Builder();
+  ~Example_Builder() override;
 
 protected:
   void on_file_quit();
diff --git a/demos/gtk-demo/example_buttonbox.cc b/demos/gtk-demo/example_buttonbox.cc
index de8cf41..15bac44 100644
--- a/demos/gtk-demo/example_buttonbox.cc
+++ b/demos/gtk-demo/example_buttonbox.cc
@@ -10,7 +10,7 @@ class Example_ButtonBox : public Gtk::Window
 {
 public:
   Example_ButtonBox();
-  virtual ~Example_ButtonBox();
+  ~Example_ButtonBox() override;
 
 protected:
   Gtk::Frame* create_button_box(bool horizontal, const Glib::ustring& title,
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 100c480..83e3100 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -33,7 +33,7 @@ class Popup : public Gtk::Window
 {
 public:
   Popup(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::ustring& prompt);
-  virtual ~Popup();
+  ~Popup() override;
 
 protected:
   Gtk::Frame m_Frame;
@@ -44,7 +44,7 @@ class Example_ChangeDisplay : public Gtk::Dialog
 {
 public:
   Example_ChangeDisplay();
-  virtual ~Example_ChangeDisplay();
+  ~Example_ChangeDisplay() override;
 
 protected:
   virtual void setup_frame(Gtk::Frame& frame, Gtk::TreeView& treeview, Gtk::Box& buttonbox);
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index 2bf7f7a..2b795d4 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -10,7 +10,7 @@ class Example_ColorSel : public Gtk::Window
 {
 public:
   Example_ColorSel();
-  virtual ~Example_ColorSel();
+  ~Example_ColorSel() override;
 
 protected:
   //Signal handlers:
diff --git a/demos/gtk-demo/example_dialog.cc b/demos/gtk-demo/example_dialog.cc
index 19cedeb..6d36b63 100644
--- a/demos/gtk-demo/example_dialog.cc
+++ b/demos/gtk-demo/example_dialog.cc
@@ -11,7 +11,7 @@ class Example_Dialog : public Gtk::Window
 {
 public:
   Example_Dialog();
-  virtual ~Example_Dialog();
+  ~Example_Dialog() override;
 
 protected:
   //Signal handlers:
@@ -34,7 +34,7 @@ class Dialog_Interactive : public Gtk::Dialog
 {
 public:
   Dialog_Interactive(Gtk::Window& parent, const Glib::ustring& entry1, const Glib::ustring& entry2);
-  virtual ~Dialog_Interactive();
+  ~Dialog_Interactive() override;
 
   Glib::ustring get_entry1() const;
   Glib::ustring get_entry2() const;
diff --git a/demos/gtk-demo/example_drawingarea.cc b/demos/gtk-demo/example_drawingarea.cc
index 6730f03..858e4db 100644
--- a/demos/gtk-demo/example_drawingarea.cc
+++ b/demos/gtk-demo/example_drawingarea.cc
@@ -19,7 +19,7 @@ class Example_DrawingArea : public Gtk::Window
 {
 public:
   Example_DrawingArea();
-  virtual ~Example_DrawingArea();
+  ~Example_DrawingArea() override;
 
 protected:
   //signal handlers:
diff --git a/demos/gtk-demo/example_flowbox.cc b/demos/gtk-demo/example_flowbox.cc
index 8b5092f..ed5f9be 100644
--- a/demos/gtk-demo/example_flowbox.cc
+++ b/demos/gtk-demo/example_flowbox.cc
@@ -12,7 +12,7 @@ class Example_FlowBox : public Gtk::Window
 {
 public:
   Example_FlowBox();
-  virtual ~Example_FlowBox();
+  ~Example_FlowBox() override;
 
 protected:
   //Signal handlers:
diff --git a/demos/gtk-demo/example_gestures.cc b/demos/gtk-demo/example_gestures.cc
index a45b3d0..0c3b0cb 100644
--- a/demos/gtk-demo/example_gestures.cc
+++ b/demos/gtk-demo/example_gestures.cc
@@ -11,7 +11,7 @@ class Example_Gestures : public Gtk::Window
 {
 public:
   Example_Gestures();
-  virtual ~Example_Gestures();
+  ~Example_Gestures() override;
 
 protected:
 
diff --git a/demos/gtk-demo/example_glarea.cc b/demos/gtk-demo/example_glarea.cc
index 53626fd..c7b2e39 100644
--- a/demos/gtk-demo/example_glarea.cc
+++ b/demos/gtk-demo/example_glarea.cc
@@ -34,7 +34,7 @@ class Example_GLArea : public Gtk::Window
 {
 public:
   Example_GLArea();
-  virtual ~Example_GLArea();
+  ~Example_GLArea() override;
 
 protected:
   Gtk::Box m_VBox {Gtk::ORIENTATION_VERTICAL, false};
diff --git a/demos/gtk-demo/example_headerbar.cc b/demos/gtk-demo/example_headerbar.cc
index 451a0c8..173b0ba 100644
--- a/demos/gtk-demo/example_headerbar.cc
+++ b/demos/gtk-demo/example_headerbar.cc
@@ -21,7 +21,7 @@ class Example_HeaderBar : public Gtk::Window
 {
 public:
   Example_HeaderBar();
-  virtual ~Example_HeaderBar();
+  ~Example_HeaderBar() override;
 
 protected:
 
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index cccadc2..8f46b2e 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -43,7 +43,7 @@ class IconInfoStore : public Gtk::ListStore
 {
 public:
   static Glib::RefPtr<IconInfoStore> create();
-  virtual ~IconInfoStore();
+  ~IconInfoStore() override;
 
   void set_text_column(bool symbolic)
   { m_text_column = symbolic ? m_columns.symbolic_name : m_columns.name; }
@@ -86,7 +86,7 @@ class DetailDialog : public Gtk::Dialog
 {
 public:
   DetailDialog(Gtk::Window& parent);
-  virtual ~DetailDialog();
+  ~DetailDialog() override;
 
   void set_image(const Glib::ustring& icon_name, const Glib::ustring& description);
 
@@ -116,7 +116,7 @@ class Example_IconBrowser : public Gtk::Window
 {
 public:
   Example_IconBrowser();
-  virtual ~Example_IconBrowser();
+  ~Example_IconBrowser() override;
 
 protected:
   // Signal handlers:
diff --git a/demos/gtk-demo/example_iconview.cc b/demos/gtk-demo/example_iconview.cc
index b698aa2..bcb9050 100644
--- a/demos/gtk-demo/example_iconview.cc
+++ b/demos/gtk-demo/example_iconview.cc
@@ -13,7 +13,7 @@ class Example_IconView : public Gtk::Window
 {
 public:
   Example_IconView();
-  virtual ~Example_IconView();
+  ~Example_IconView() override;
 
 protected:
 
diff --git a/demos/gtk-demo/example_images.cc b/demos/gtk-demo/example_images.cc
index c78b8b3..5742bb5 100644
--- a/demos/gtk-demo/example_images.cc
+++ b/demos/gtk-demo/example_images.cc
@@ -18,7 +18,7 @@ class Example_Images : public Gtk::Window
 {
 public:
   Example_Images();
-  virtual ~Example_Images();
+  ~Example_Images() override;
 
 protected:
   virtual void start_progressive_loading();
diff --git a/demos/gtk-demo/example_menus.cc b/demos/gtk-demo/example_menus.cc
index 04a49a5..69f555d 100644
--- a/demos/gtk-demo/example_menus.cc
+++ b/demos/gtk-demo/example_menus.cc
@@ -30,7 +30,7 @@ class Example_Menus : public Gtk::Window
 {
 public:
   Example_Menus();
-  virtual ~Example_Menus();
+  ~Example_Menus() override;
 
 protected:
   //signal handlers:
diff --git a/demos/gtk-demo/example_overlay.cc b/demos/gtk-demo/example_overlay.cc
index b016f22..072ebac 100644
--- a/demos/gtk-demo/example_overlay.cc
+++ b/demos/gtk-demo/example_overlay.cc
@@ -9,7 +9,7 @@ class Example_Overlay : public Gtk::Window
 {
 public:
   Example_Overlay();
-  virtual ~Example_Overlay();
+  ~Example_Overlay() override;
 
 protected:
 
diff --git a/demos/gtk-demo/example_panes.cc b/demos/gtk-demo/example_panes.cc
index 7403998..c49d88b 100644
--- a/demos/gtk-demo/example_panes.cc
+++ b/demos/gtk-demo/example_panes.cc
@@ -20,7 +20,7 @@ class Example_Panes : public Gtk::Window
 {
 public:
   Example_Panes();
-  virtual ~Example_Panes();
+  ~Example_Panes() override;
 };
 
 class PaneOptions : public Gtk::Frame
@@ -28,7 +28,7 @@ class PaneOptions : public Gtk::Frame
 public:
   PaneOptions(Gtk::Paned& paned, const Glib::ustring& frame_label,
               const Glib::ustring& label1, const Glib::ustring& label2);
-  virtual ~PaneOptions();
+  ~PaneOptions() override;
 
 private:
   // member widgets:
diff --git a/demos/gtk-demo/example_pixbufs.cc b/demos/gtk-demo/example_pixbufs.cc
index 59f54a1..f400b8e 100644
--- a/demos/gtk-demo/example_pixbufs.cc
+++ b/demos/gtk-demo/example_pixbufs.cc
@@ -46,7 +46,7 @@ class Example_Pixbufs : public Gtk::Window
 {
 public:
   Example_Pixbufs();
-  virtual ~Example_Pixbufs();
+  ~Example_Pixbufs() override;
 
 protected:
   virtual void load_pixbufs();
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index 95d246e..aa3e904 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -20,7 +20,7 @@ class Example_SizeGroup : public Gtk::Dialog
 {
 public:
   Example_SizeGroup();
-  virtual ~Example_SizeGroup();
+  ~Example_SizeGroup() override;
 
 protected:
   //Signal handlers:
diff --git a/demos/gtk-demo/example_stack.cc b/demos/gtk-demo/example_stack.cc
index 09ac84c..42b0542 100644
--- a/demos/gtk-demo/example_stack.cc
+++ b/demos/gtk-demo/example_stack.cc
@@ -12,7 +12,7 @@ class Example_Stack : public Gtk::Window
 {
 public:
   Example_Stack();
-  virtual ~Example_Stack();
+  ~Example_Stack() override;
 
 protected:
 
diff --git a/demos/gtk-demo/example_stacksidebar.cc b/demos/gtk-demo/example_stacksidebar.cc
index 6982a58..8fca65a 100644
--- a/demos/gtk-demo/example_stacksidebar.cc
+++ b/demos/gtk-demo/example_stacksidebar.cc
@@ -13,7 +13,7 @@ class Example_StackSidebar : public Gtk::Window
 {
 public:
   Example_StackSidebar();
-  virtual ~Example_StackSidebar();
+  ~Example_StackSidebar() override;
 
 protected:
   // Container:
diff --git a/demos/gtk-demo/example_textview.cc b/demos/gtk-demo/example_textview.cc
index b0bdbe0..ea13b76 100644
--- a/demos/gtk-demo/example_textview.cc
+++ b/demos/gtk-demo/example_textview.cc
@@ -17,7 +17,7 @@ class Window_EasterEgg : public Gtk::Window
 {
 public:
   Window_EasterEgg();
-  virtual ~Window_EasterEgg();
+  ~Window_EasterEgg() override;
 
 protected:
   virtual void recursive_attach_view(int depth, Gtk::TextView& view, Glib::RefPtr<Gtk::TextChildAnchor> 
refAnchor);
@@ -31,7 +31,7 @@ class Example_TextView : public Gtk::Window
 {
 public:
   Example_TextView();
-  virtual ~Example_TextView();
+  ~Example_TextView() override;
 
 protected:
   virtual void create_tags(Glib::RefPtr<Gtk::TextBuffer>& refBuffer);
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc 
b/demos/gtk-demo/example_treeview_editable_cells.cc
index 4bf72de..0ddda35 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -25,7 +25,7 @@ class Example_TreeView_EditableCells : public Gtk::Window
 {
 public:
   Example_TreeView_EditableCells();
-  virtual ~Example_TreeView_EditableCells();
+  ~Example_TreeView_EditableCells() override;
 
 protected:
   //signal handlers:
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index 7b777e0..975ea52 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -26,7 +26,7 @@ class Example_TreeView_ListStore : public Gtk::Window
 {
 public:
   Example_TreeView_ListStore();
-  virtual ~Example_TreeView_ListStore();
+  ~Example_TreeView_ListStore() override;
 
 protected:
   virtual void create_model();
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index 6d121b6..f5a4e51 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -34,7 +34,7 @@ class Example_TreeView_TreeStore : public Gtk::Window
 {
 public:
   Example_TreeView_TreeStore();
-  virtual ~Example_TreeView_TreeStore();
+  ~Example_TreeView_TreeStore() override;
 
 protected:
   //vfunc overrides:
diff --git a/demos/gtk-demo/textwidget.h b/demos/gtk-demo/textwidget.h
index ca68b25..9a8d2d5 100644
--- a/demos/gtk-demo/textwidget.h
+++ b/demos/gtk-demo/textwidget.h
@@ -30,7 +30,7 @@ class TextWidget : public Gtk::ScrolledWindow
 {
 public:
   TextWidget(bool is_source);
-  virtual ~TextWidget();
+  ~TextWidget() override;
 
   Glib::RefPtr<Gtk::TextBuffer> get_buffer();
   void wipe();
diff --git a/tests/child_widget/testwindow.h b/tests/child_widget/testwindow.h
index ee8d05f..d669f24 100644
--- a/tests/child_widget/testwindow.h
+++ b/tests/child_widget/testwindow.h
@@ -26,7 +26,7 @@ class TestWindow : public Gtk::Window
 {
 public:
   TestWindow();
-  virtual ~TestWindow();
+  ~TestWindow() override;
 
 protected:
 
diff --git a/tests/child_widget_managed/main.cc b/tests/child_widget_managed/main.cc
index c750e40..6994336 100644
--- a/tests/child_widget_managed/main.cc
+++ b/tests/child_widget_managed/main.cc
@@ -4,7 +4,7 @@ class MyButton : public Gtk::Button
 {
 public:
     MyButton();
-    virtual ~MyButton();
+    ~MyButton() override;
 };
 
 MyButton::MyButton()
@@ -20,7 +20,7 @@ class ExampleWindow : public Gtk::Window
 {
 public:
     ExampleWindow();
-    virtual ~ExampleWindow();
+    ~ExampleWindow() override;
 
 protected:
 
diff --git a/tests/scrolledwindow/main.cc b/tests/scrolledwindow/main.cc
index aa9d702..ef93f1a 100644
--- a/tests/scrolledwindow/main.cc
+++ b/tests/scrolledwindow/main.cc
@@ -17,14 +17,14 @@ class DerivedLabel : public Gtk::Label
 {
 public:
   DerivedLabel() {}
-  virtual ~DerivedLabel() { printf("~DerivedLabel\n");}
+  ~DerivedLabel() override { printf("~DerivedLabel\n");}
 };
 
 class DerivedScrolledWindow : public Gtk::ScrolledWindow
 {
 public:
   DerivedScrolledWindow() {}
-  virtual ~DerivedScrolledWindow() { printf("~DerivedScrolledWindow\n");}
+  ~DerivedScrolledWindow() override { printf("~DerivedScrolledWindow\n");}
 };
 
 class Instance
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]