[glom] C++11: More override keyword use.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] C++11: More override keyword use.
Date: Wed, 28 Oct 2015 10:11:10 +0000 (UTC)
commit 55fcea454de6d0898948938e4f76beb7e1f720e9
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 27 10:57:12 2015 +0100

    C++11: More override keyword use.

 glom/dialog_existing_or_new.cc                     |    2 +-
 glom/mode_data/datawidget/cellrenderer_dblist.h    |   10 +++++-----
 glom/mode_data/datawidget/checkbutton.h            |    4 ++--
 glom/mode_data/datawidget/combo.h                  |   16 ++++++++--------
 glom/mode_data/datawidget/combo_as_radio_buttons.h |   10 +++++-----
 .../datawidget/combochoiceswithtreemodel.h         |    4 ++--
 glom/mode_data/datawidget/textview.h               |    6 +++---
 glom/mode_design/layout/dialog_layout_details.h    |    2 +-
 .../layout/dialog_layout_list_related.h            |    6 +++---
 .../printoperation_relationshipsoverview.h         |    4 ++--
 .../window_relationships_overview.h                |    2 +-
 glom/print_layout/canvas_print_layout.h            |    4 ++--
 glom/print_layout/printoperation_printlayout.h     |    6 +++---
 glom/utility_widgets/canvas/canvas_group_movable.h |   14 +++++++-------
 .../canvas/canvas_group_resizable.h                |   16 ++++++++--------
 glom/utility_widgets/canvas/canvas_image_movable.h |   12 ++++++------
 glom/utility_widgets/canvas/canvas_line_movable.h  |   14 +++++++-------
 glom/utility_widgets/canvas/canvas_rect_movable.h  |   12 ++++++------
 glom/utility_widgets/canvas/canvas_table_movable.h |   14 +++++++-------
 glom/utility_widgets/canvas/canvas_text_movable.h  |   12 ++++++------
 glom/utility_widgets/imageglom.h                   |   14 +++++++-------
 21 files changed, 92 insertions(+), 92 deletions(-)
---
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index 3fb6796..a9892cc 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -76,7 +76,7 @@ public:
   }
 
 private:
-  virtual void on_start_element(const Glib::ustring& name, const AttributeList& attributes)
+  void on_start_element(const Glib::ustring& name, const AttributeList& attributes) override
   {
     if(m_title.empty()) // Already found name? Wait for parse_chunk() call to return.
     {
diff --git a/glom/mode_data/datawidget/cellrenderer_dblist.h b/glom/mode_data/datawidget/cellrenderer_dblist.h
index 3761b8a..b25a445 100644
--- a/glom/mode_data/datawidget/cellrenderer_dblist.h
+++ b/glom/mode_data/datawidget/cellrenderer_dblist.h
@@ -41,19 +41,19 @@ public:
   virtual ~CellRendererDbList();
 
   //This creates a simple ListStore, with a text cell renderer.
-  virtual void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false);
+  void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false) override;
 
   //This creates a db-based tree model, with appropriate cell renderers:
-  virtual void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value);
+  void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value) override;
 
   void set_restrict_values_to_list(bool val = true);
 
 private:
 
-  virtual void on_editing_started(Gtk::CellEditable* cell_editable, const Glib::ustring& path);
+  void on_editing_started(Gtk::CellEditable* cell_editable, const Glib::ustring& path) override;
 
-  virtual void set_value(const Gnome::Gda::Value& value);
-  virtual Gnome::Gda::Value get_value() const;
+  void set_value(const Gnome::Gda::Value& value) override;
+  Gnome::Gda::Value get_value() const override;
   
   void repack_cells_fixed(Gtk::CellLayout* combobox);
   void repack_cells_related(Gtk::CellLayout* combobox);
diff --git a/glom/mode_data/datawidget/checkbutton.h b/glom/mode_data/datawidget/checkbutton.h
index 740e5ae..d316913 100644
--- a/glom/mode_data/datawidget/checkbutton.h
+++ b/glom/mode_data/datawidget/checkbutton.h
@@ -44,8 +44,8 @@ public:
   explicit CheckButton(const Glib::ustring& title = Glib::ustring());
   virtual ~CheckButton();
 
-  virtual void set_value(const Gnome::Gda::Value& value);
-  virtual Gnome::Gda::Value get_value() const;    
+  void set_value(const Gnome::Gda::Value& value) override;
+  Gnome::Gda::Value get_value() const override;    
 
 private:
   void init();
diff --git a/glom/mode_data/datawidget/combo.h b/glom/mode_data/datawidget/combo.h
index 599ee65..ce3fc75 100644
--- a/glom/mode_data/datawidget/combo.h
+++ b/glom/mode_data/datawidget/combo.h
@@ -50,18 +50,18 @@ public:
   virtual ~ComboGlom();
 
   //This creates a simple ListStore, with a text cell renderer.
-  virtual void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false);
+  void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false) override;
 
   //This creates a db-based tree model, with appropriate cell renderers:
-  virtual void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value);
+  void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value) override;
 
-  virtual void set_read_only(bool read_only = true) override;
+  void set_read_only(bool read_only = true) override;
 
   /** Set the text from a Gnome::Gda::Value.
    */
-  virtual void set_value(const Gnome::Gda::Value& value) override;
+  void set_value(const Gnome::Gda::Value& value) override;
 
-  virtual Gnome::Gda::Value get_value() const override;
+  Gnome::Gda::Value get_value() const override;
 
 private:
 
@@ -69,15 +69,15 @@ private:
 
   // Note that this is a normal signal handler when glibmm was complied
   // without default signal handlers
-  virtual void on_changed() override; //From Gtk::ComboBox
+  void on_changed() override; //From Gtk::ComboBox
 
   void check_for_change();
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  virtual bool on_button_press_event(GdkEventButton *event) override;
+  bool on_button_press_event(GdkEventButton *event) override;
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  virtual AppWindow* get_appwindow() const override;
+  AppWindow* get_appwindow() const override;
 
 
   Gnome::Gda::Value m_old_value; //TODO: Only useful for navigation, which currently has no implementation.
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.h 
b/glom/mode_data/datawidget/combo_as_radio_buttons.h
index a77bbd2..f2c91e9 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.h
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.h
@@ -50,11 +50,11 @@ public:
 
   virtual ~ComboAsRadioButtons();
 
-  virtual void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false);
+  void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false) override;
 
-  virtual void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value);
+  void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value) override;
 
-  virtual void set_read_only(bool read_only = true);
+  void set_read_only(bool read_only = true) override;
 
   //Override this so we can store the text to compare later.
   //This is not virtual, so you must not use it via Gtk::Entry.
@@ -64,9 +64,9 @@ public:
 
   /** Set the text from a Gnome::Gda::Value.
    */
-  virtual void set_value(const Gnome::Gda::Value& value);
+  void set_value(const Gnome::Gda::Value& value) override;
 
-  virtual Gnome::Gda::Value get_value() const;
+  Gnome::Gda::Value get_value() const override;
 
 private:
   void init();
diff --git a/glom/mode_data/datawidget/combochoiceswithtreemodel.h 
b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
index fb3b183..1b55629 100644
--- a/glom/mode_data/datawidget/combochoiceswithtreemodel.h
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
@@ -40,10 +40,10 @@ public:
   virtual ~ComboChoicesWithTreeModel();
 
   //This creates a simple ListStore, with a text cell renderer.
-  virtual void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false);
+  void set_choices_fixed(const Formatting::type_list_values& list_values, bool restricted = false) override;
 
   //This creates a db-based tree model, with appropriate cell renderers:
-  virtual void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value);
+  void set_choices_related(const Document* document, const std::shared_ptr<const LayoutItem_Field>& 
layout_field, const Gnome::Gda::Value& foreign_key_value) override;
 
 
   //Not named get_model(), to avoid clashing with ComboBox::get_model().
diff --git a/glom/mode_data/datawidget/textview.h b/glom/mode_data/datawidget/textview.h
index bd2745d..df1dedc 100644
--- a/glom/mode_data/datawidget/textview.h
+++ b/glom/mode_data/datawidget/textview.h
@@ -54,15 +54,15 @@ public:
 
   /** Set the text from a Gnome::Gda::Value.
    */
-  virtual void set_value(const Gnome::Gda::Value& value);
+  void set_value(const Gnome::Gda::Value& value) override;
 
-  virtual Gnome::Gda::Value get_value() const;
+  Gnome::Gda::Value get_value() const override;
 
   typedef Gtk::TextView type_text_view;
   
   type_text_view* get_textview();
   
-  void set_read_only(bool read_only = true);
+  void set_read_only(bool read_only = true) override;
 
 private:
   void init();
diff --git a/glom/mode_design/layout/dialog_layout_details.h b/glom/mode_design/layout/dialog_layout_details.h
index 3e2b84e..fea0428 100644
--- a/glom/mode_design/layout/dialog_layout_details.h
+++ b/glom/mode_design/layout/dialog_layout_details.h
@@ -45,7 +45,7 @@ public:
    * @param table_name The table name.
    * @param table_fields: The actual fields in the table, in case the document does not yet know about them 
all.
    */
-  virtual void init(const Glib::ustring& layout_name, const Glib::ustring& layout_platform, Document* 
document, const Glib::ustring& table_name, const type_vecConstLayoutFields& table_fields);
+  void init(const Glib::ustring& layout_name, const Glib::ustring& layout_platform, Document* document, 
const Glib::ustring& table_name, const type_vecConstLayoutFields& table_fields) override;
 
 protected:
 
diff --git a/glom/mode_design/layout/dialog_layout_list_related.h 
b/glom/mode_design/layout/dialog_layout_list_related.h
index 407763c..6b71a20 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -58,11 +58,11 @@ protected:
   void save_to_document() override;
 
   ///@inheritdoc
-  virtual Glib::ustring get_fields_table() const;
+  Glib::ustring get_fields_table() const override;
 
   //signal handlers:
-  virtual void on_button_add_field() override;
-  virtual void on_button_edit() override;
+  void on_button_add_field() override;
+  void on_button_edit() override;
  
   void on_combo_relationship_changed();
   
diff --git a/glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h 
b/glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h
index a8a1a53..1ab30bb 100644
--- a/glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h
+++ b/glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h
@@ -38,8 +38,8 @@ private:
   PrintOperationRelationshipsOverview();
 
   //PrintOperation default signal handler overrides:
-  virtual void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context);
-  virtual void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr);
+  void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context) override;
+  void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr) override;
 
   //Not owned by this instance:
   Goocanvas::Canvas* m_canvas;
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.h 
b/glom/mode_design/relationships_overview/window_relationships_overview.h
index e0aeb49..2d53b93 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();
   
-  void load_from_document() override
+  void load_from_document() override;
 
 private:
   class TableView;
diff --git a/glom/print_layout/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
index 4b69f20..c60e17a 100644
--- a/glom/print_layout/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -73,13 +73,13 @@ public:
 
   void fill_with_data(const FoundSet& found_set, bool avoid_page_margins);
 
-  virtual void set_grid_gap(double gap = 20.0);
+  void set_grid_gap(double gap = 20.0) override;
 
   void set_outlines_visibility(bool visible = true);
 
   /** Get any items that have get_selected()==true.
    */
-  virtual type_vec_items get_selected_items();
+  type_vec_items get_selected_items() override;
 
   /** Set all items as selected or unselected. 
    * @param selected Use false to unselect all.
diff --git a/glom/print_layout/printoperation_printlayout.h b/glom/print_layout/printoperation_printlayout.h
index c953ead..1801f53 100644
--- a/glom/print_layout/printoperation_printlayout.h
+++ b/glom/print_layout/printoperation_printlayout.h
@@ -38,9 +38,9 @@ private:
   PrintOperationPrintLayout();
 
   //PrintOperation default signal handler overrides:
-  virtual bool on_paginate(const Glib::RefPtr<Gtk::PrintContext>& context); //Comment this out if GTK+ bug 
#345345 has not been fixed yet.
-  virtual void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context);
-  virtual void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr);
+  bool on_paginate(const Glib::RefPtr<Gtk::PrintContext>& context) override; //Comment this out if GTK+ bug 
#345345 has not been fixed yet.
+  void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context) override;
+  void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr) override;
 
   //Not owned by this instance:
   Canvas_PrintLayout* m_canvas;
diff --git a/glom/utility_widgets/canvas/canvas_group_movable.h 
b/glom/utility_widgets/canvas/canvas_group_movable.h
index 19538eb..5955e45 100644
--- a/glom/utility_widgets/canvas/canvas_group_movable.h
+++ b/glom/utility_widgets/canvas/canvas_group_movable.h
@@ -38,14 +38,14 @@ protected:
 public:
   static Glib::RefPtr<CanvasGroupMovable> create();
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x, double y);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
-  virtual void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x, double y) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
+  void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid) override;
 
 private:
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
   enum class Corners
   {
@@ -58,7 +58,7 @@ private:
 
   void snap_position_one_corner(Corners corner, double& x, double& y) const;
 
-  virtual void snap_position(double& x, double& y) const;
+  void snap_position(double& x, double& y) const override;
 
   //We store the position so that we have something before any children wer added:
   double m_x, m_y, m_width, m_height;
diff --git a/glom/utility_widgets/canvas/canvas_group_resizable.h 
b/glom/utility_widgets/canvas/canvas_group_resizable.h
index ee94ab3..c02b457 100644
--- a/glom/utility_widgets/canvas/canvas_group_resizable.h
+++ b/glom/utility_widgets/canvas/canvas_group_resizable.h
@@ -55,13 +55,13 @@ public:
   /// Get the only child:
   Glib::RefPtr<const CanvasItemMovable> get_child() const;
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x_offet, double y_offset);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
-  virtual void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x_offet, double y_offset) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
+  void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid) override;
 
-  virtual void snap_position(double& x, double& y) const;
+  void snap_position(double& x, double& y) const override;
 
   void set_outline_visible(bool visible = true);
 
@@ -77,8 +77,8 @@ public:
   static void get_outline_stroke(Glib::ustring& color, double& width);
 
 private:
-  virtual void show_selected();
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  void show_selected() override;
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
   enum class Corners
   {
diff --git a/glom/utility_widgets/canvas/canvas_image_movable.h 
b/glom/utility_widgets/canvas/canvas_image_movable.h
index 879fbc2..baae2aa 100644
--- a/glom/utility_widgets/canvas/canvas_image_movable.h
+++ b/glom/utility_widgets/canvas/canvas_image_movable.h
@@ -72,15 +72,15 @@ public:
    */
   void set_snap_corner(Corners corner);
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x, double y);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x, double y) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
 
 private:
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
-  virtual void snap_position(double& x, double& y) const;
+  void snap_position(double& x, double& y) const override;
 
   //What corner is considered when snapping to a grid while moving:
   Corners m_snap_corner;
diff --git a/glom/utility_widgets/canvas/canvas_line_movable.h 
b/glom/utility_widgets/canvas/canvas_line_movable.h
index 313165b..abb5818 100644
--- a/glom/utility_widgets/canvas/canvas_line_movable.h
+++ b/glom/utility_widgets/canvas/canvas_line_movable.h
@@ -41,16 +41,16 @@ public:
 
   void set_hover_color(const Glib::ustring& color);
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x, double y);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x, double y) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
 
 private:
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
-  virtual bool on_enter_notify_event(const Glib::RefPtr<Item>& target, GdkEventCrossing* event);
-  virtual bool on_leave_notify_event(const Glib::RefPtr<Item>& target, GdkEventCrossing* event);
+  bool on_enter_notify_event(const Glib::RefPtr<Item>& target, GdkEventCrossing* event) override;
+  bool on_leave_notify_event(const Glib::RefPtr<Item>& target, GdkEventCrossing* event) override;
 
   Gdk::RGBA m_stroke_color;
   Glib::ustring m_hover_color;
diff --git a/glom/utility_widgets/canvas/canvas_rect_movable.h 
b/glom/utility_widgets/canvas/canvas_rect_movable.h
index 5a7f332..54cf36e 100644
--- a/glom/utility_widgets/canvas/canvas_rect_movable.h
+++ b/glom/utility_widgets/canvas/canvas_rect_movable.h
@@ -56,15 +56,15 @@ public:
    */
   void set_snap_corner(Corners corner);
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x, double y);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x, double y) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
 
 private:
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
-  virtual void snap_position(double& x, double& y) const;
+  void snap_position(double& x, double& y) const override;
   void snap_position_one_corner(Corners corner, double& x, double& y) const;
   void snap_position_all_corners(double& x, double& y) const;
 
diff --git a/glom/utility_widgets/canvas/canvas_table_movable.h 
b/glom/utility_widgets/canvas/canvas_table_movable.h
index 29f494d..6d56946 100644
--- a/glom/utility_widgets/canvas/canvas_table_movable.h
+++ b/glom/utility_widgets/canvas/canvas_table_movable.h
@@ -38,11 +38,11 @@ private:
 public:
   static Glib::RefPtr<CanvasTableMovable> create();
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x, double y);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
-  virtual void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x, double y) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
+  void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid) override;
 
   void set_lines_details(double row_line_width, double column_line_width, const Glib::ustring& color);
 
@@ -52,7 +52,7 @@ public:
   void set_lines_visibility(bool show = true);
 
 private:
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
   enum class Corners
   {
@@ -65,7 +65,7 @@ private:
 
   void snap_position_one_corner(Corners corner, double& x, double& y) const;
 
-  virtual void snap_position(double& x, double& y) const;
+  void snap_position(double& x, double& y) const override;
   
   double m_row_line_width, m_column_line_width;
   Glib::ustring m_line_color;
diff --git a/glom/utility_widgets/canvas/canvas_text_movable.h 
b/glom/utility_widgets/canvas/canvas_text_movable.h
index f20ecc6..8231f7e 100644
--- a/glom/utility_widgets/canvas/canvas_text_movable.h
+++ b/glom/utility_widgets/canvas/canvas_text_movable.h
@@ -52,10 +52,10 @@ public:
    */
   void set_snap_corner(Corners corner);
 
-  virtual void get_xy(double& x, double& y) const;
-  virtual void set_xy(double x, double y);
-  virtual void get_width_height(double& width, double& height) const;
-  virtual void set_width_height(double width, double height);
+  void get_xy(double& x, double& y) const override;
+  void set_xy(double x, double y) override;
+  void get_width_height(double& width, double& height) const override;
+  void set_width_height(double width, double height) override;
 
   /** Use this instead of property_text() (from the base class),
    * so that the desired points size will be used.
@@ -70,9 +70,9 @@ public:
   void set_font_points(const Glib::ustring& font);
 
 private:
-  virtual Goocanvas::Canvas* get_parent_canvas_widget();
+  Goocanvas::Canvas* get_parent_canvas_widget() override;
 
-  virtual void snap_position(double& x, double& y) const;
+  void snap_position(double& x, double& y) const override;
 
   void reconstruct_markup();
 
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index c799564..7f9504e 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -48,27 +48,27 @@ public:
 
   virtual ~ImageGlom();
   
-  virtual void set_layout_item(const std::shared_ptr<LayoutItem>& layout_item, const Glib::ustring& 
table_name);
+  void set_layout_item(const std::shared_ptr<LayoutItem>& layout_item, const Glib::ustring& table_name) 
override;
 
-  virtual void set_value(const Gnome::Gda::Value& value);
-  virtual Gnome::Gda::Value get_value() const;
-  virtual bool get_has_original_data() const;
+  void set_value(const Gnome::Gda::Value& value) override;
+  Gnome::Gda::Value get_value() const override;
+  bool get_has_original_data() const override;
 
   //Optionally use this instead of set_value(), to avoid creating an unnecessary Value.
   //void set_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
 
   void do_choose_image();
 
-  void set_read_only(bool read_only = true);
+  void set_read_only(bool read_only = true) override;
 
   void on_ev_job_finished(EvJob* job);
   
 private:
   void init();
 
-  virtual void on_size_allocate(Gtk::Allocation& allocation);
+  void on_size_allocate(Gtk::Allocation& allocation) override;
 
-  virtual bool on_button_press_event(GdkEventButton *event) override;
+  bool on_button_press_event(GdkEventButton *event) override;
 
   void on_menupopup_activate_open_file();
   void on_menupopup_activate_open_file_with();
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]