[glom] Make sure that get_appwindow() overrides are const.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] Make sure that get_appwindow() overrides are const.
Date: Wed, 14 Mar 2012 10:16:09 +0000 (UTC)
commit 6f234d7448f51aa868f5e3514335d4d46fb49fb4
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Mar 14 11:09:27 2012 +0100

    Make sure that get_appwindow() overrides are const.
    
    	* glom/mode_data/buttonglom.[h|cc]:
    	* glom/mode_data/datawidget/checkbutton.[h|cc]:
    	* glom/mode_data/datawidget/combo.[h|cc]:
    	* glom/mode_data/datawidget/combo_as_radio_buttons.[h|cc]:
    	* glom/mode_data/datawidget/datawidget.[h|cc]:
    	* glom/mode_data/datawidget/entry.[h|cc]:
    	* glom/mode_data/datawidget/label.[h|cc]:
    	* glom/mode_data/datawidget/textview.[h|cc]:
    	* glom/utility_widgets/imageglom.[h|cc]:
    	* glom/utility_widgets/notebookglom.[h|cc]: get_appwindow(): This should
    	be const because the pure virtual function (that it is meant to override)
    	is const.
    	This fixes warnings found by clang++.

 ChangeLog                                          |   18 ++++++++++++++++++
 glom/mode_data/buttonglom.cc                       |    4 ++--
 glom/mode_data/buttonglom.h                        |    3 ++-
 glom/mode_data/datawidget/checkbutton.cc           |    4 ++--
 glom/mode_data/datawidget/checkbutton.h            |    2 +-
 glom/mode_data/datawidget/combo.cc                 |    4 ++--
 glom/mode_data/datawidget/combo.h                  |    2 +-
 .../mode_data/datawidget/combo_as_radio_buttons.cc |    4 ++--
 glom/mode_data/datawidget/combo_as_radio_buttons.h |    2 +-
 glom/mode_data/datawidget/datawidget.cc            |    4 ++--
 glom/mode_data/datawidget/datawidget.h             |    2 +-
 glom/mode_data/datawidget/entry.cc                 |    4 ++--
 glom/mode_data/datawidget/entry.h                  |    2 +-
 glom/mode_data/datawidget/label.cc                 |    4 ++--
 glom/mode_data/datawidget/label.h                  |    2 +-
 glom/mode_data/datawidget/textview.cc              |    4 ++--
 glom/mode_data/datawidget/textview.h               |    2 +-
 glom/utility_widgets/imageglom.cc                  |    4 ++--
 glom/utility_widgets/imageglom.h                   |    2 +-
 glom/utility_widgets/notebookglom.cc               |    4 ++--
 glom/utility_widgets/notebookglom.h                |    2 +-
 21 files changed, 49 insertions(+), 30 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7d128e6..a53cc92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2012-03-14  Murray Cumming  <murrayc murrayc com>
 
+	Make sure that get_appwindow() overrides are const.
+
+	* glom/mode_data/buttonglom.[h|cc]:
+	* glom/mode_data/datawidget/checkbutton.[h|cc]:
+	* glom/mode_data/datawidget/combo.[h|cc]:
+	* glom/mode_data/datawidget/combo_as_radio_buttons.[h|cc]:
+	* glom/mode_data/datawidget/datawidget.[h|cc]:
+	* glom/mode_data/datawidget/entry.[h|cc]:
+	* glom/mode_data/datawidget/label.[h|cc]:
+	* glom/mode_data/datawidget/textview.[h|cc]:
+	* glom/utility_widgets/imageglom.[h|cc]:
+	* glom/utility_widgets/notebookglom.[h|cc]: get_appwindow(): This should
+	be const because the pure virtual function (that it is meant to override)
+	is const.
+	This fixes warnings found by clang++.
+
+2012-03-14  Murray Cumming  <murrayc murrayc com>
+
 	Fix some simple warnings found by clang++
 
 	* glom/appwindow.cc:
diff --git a/glom/mode_data/buttonglom.cc b/glom/mode_data/buttonglom.cc
index 05b8b79..cb384fd 100644
--- a/glom/mode_data/buttonglom.cc
+++ b/glom/mode_data/buttonglom.cc
@@ -52,9 +52,9 @@ void ButtonGlom::init()
 
 }
 
-AppWindow* ButtonGlom::get_appwindow()
+AppWindow* ButtonGlom::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/buttonglom.h b/glom/mode_data/buttonglom.h
index 3ff812f..62cd7d4 100644
--- a/glom/mode_data/buttonglom.h
+++ b/glom/mode_data/buttonglom.h
@@ -43,7 +43,8 @@ public:
 private:
   void init();
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
+
 #ifndef GLOM_ENABLE_CLIENT_ONLY    
   virtual void on_menu_properties_activate();
   virtual bool on_button_press_event(GdkEventButton *event);
diff --git a/glom/mode_data/datawidget/checkbutton.cc b/glom/mode_data/datawidget/checkbutton.cc
index 3ee795e..6f18132 100644
--- a/glom/mode_data/datawidget/checkbutton.cc
+++ b/glom/mode_data/datawidget/checkbutton.cc
@@ -84,9 +84,9 @@ bool CheckButton::on_button_press_event(GdkEventButton *event)
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-AppWindow* CheckButton::get_appwindow()
+AppWindow* CheckButton::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/checkbutton.h b/glom/mode_data/datawidget/checkbutton.h
index ef68fb3..79666fe 100644
--- a/glom/mode_data/datawidget/checkbutton.h
+++ b/glom/mode_data/datawidget/checkbutton.h
@@ -54,7 +54,7 @@ private:
   virtual bool on_button_press_event(GdkEventButton *event); //override
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 };
 
 } //namespace DataWidetChildren
diff --git a/glom/mode_data/datawidget/combo.cc b/glom/mode_data/datawidget/combo.cc
index d108f39..57cbffa 100644
--- a/glom/mode_data/datawidget/combo.cc
+++ b/glom/mode_data/datawidget/combo.cc
@@ -349,9 +349,9 @@ g_warning("ComboGlom::on_button_press_event()");
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-AppWindow* ComboGlom::get_appwindow()
+AppWindow* ComboGlom::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/combo.h b/glom/mode_data/datawidget/combo.h
index ced5a6d..2c9a9b5 100644
--- a/glom/mode_data/datawidget/combo.h
+++ b/glom/mode_data/datawidget/combo.h
@@ -77,7 +77,7 @@ private:
   virtual bool on_button_press_event(GdkEventButton *event);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 
 
   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.cc b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
index d09c6bd..b12a912 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.cc
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
@@ -308,9 +308,9 @@ bool ComboAsRadioButtons::on_button_press_event(GdkEventButton *event)
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-AppWindow* ComboAsRadioButtons::get_appwindow()
+AppWindow* ComboAsRadioButtons::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.h b/glom/mode_data/datawidget/combo_as_radio_buttons.h
index 4fc069a..dd3ec0a 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.h
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.h
@@ -88,7 +88,7 @@ private:
   void show_context_menu(GdkEventButton *event);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 
 
   Glib::ustring m_old_text;
diff --git a/glom/mode_data/datawidget/datawidget.cc b/glom/mode_data/datawidget/datawidget.cc
index 12f2aef..3697bbd 100644
--- a/glom/mode_data/datawidget/datawidget.cc
+++ b/glom/mode_data/datawidget/datawidget.cc
@@ -567,9 +567,9 @@ void DataWidget::on_child_user_requested_layout()
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-AppWindow* DataWidget::get_appwindow()
+AppWindow* DataWidget::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/datawidget.h b/glom/mode_data/datawidget/datawidget.h
index 305b7f5..8e0c5e9 100644
--- a/glom/mode_data/datawidget/datawidget.h
+++ b/glom/mode_data/datawidget/datawidget.h
@@ -117,7 +117,7 @@ private:
   //virtual void on_menupopup_add_item(LayoutWidgetBase::enumType item);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 
   void set_child_size_by_field(const sharedptr<const LayoutItem_Field>& field);
   int get_suitable_width(const sharedptr<const LayoutItem_Field>& field_layout);
diff --git a/glom/mode_data/datawidget/entry.cc b/glom/mode_data/datawidget/entry.cc
index 08cfa07..35ab6c5 100644
--- a/glom/mode_data/datawidget/entry.cc
+++ b/glom/mode_data/datawidget/entry.cc
@@ -222,9 +222,9 @@ bool Entry::on_button_press_event(GdkEventButton *event)
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-AppWindow* Entry::get_appwindow()
+AppWindow* Entry::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/entry.h b/glom/mode_data/datawidget/entry.h
index 4a307fb..810606c 100644
--- a/glom/mode_data/datawidget/entry.h
+++ b/glom/mode_data/datawidget/entry.h
@@ -76,7 +76,7 @@ private:
   virtual bool on_button_press_event(GdkEventButton *event); //override
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 
   Glib::ustring m_old_text;
   Field::glom_field_type m_glom_type; //Store the type so we can validate the text accordingly.
diff --git a/glom/mode_data/datawidget/label.cc b/glom/mode_data/datawidget/label.cc
index 4049f7f..276f628 100644
--- a/glom/mode_data/datawidget/label.cc
+++ b/glom/mode_data/datawidget/label.cc
@@ -66,9 +66,9 @@ void Label::init()
   m_label.set_line_wrap();
 }
 
-AppWindow* Label::get_appwindow()
+AppWindow* Label::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/label.h b/glom/mode_data/datawidget/label.h
index e1793d4..b7c8bd6 100644
--- a/glom/mode_data/datawidget/label.h
+++ b/glom/mode_data/datawidget/label.h
@@ -51,7 +51,7 @@ public:
 private:
   void init();
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
     
   Gtk::Label m_label;
 #ifndef GLOM_ENABLE_CLIENT_ONLY    
diff --git a/glom/mode_data/datawidget/textview.cc b/glom/mode_data/datawidget/textview.cc
index 4c1e925..622fcb4 100644
--- a/glom/mode_data/datawidget/textview.cc
+++ b/glom/mode_data/datawidget/textview.cc
@@ -208,9 +208,9 @@ bool TextView::on_button_press_event(GdkEventButton *event)
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-AppWindow* TextView::get_appwindow()
+AppWindow* TextView::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/mode_data/datawidget/textview.h b/glom/mode_data/datawidget/textview.h
index 2a75529..90bb76c 100644
--- a/glom/mode_data/datawidget/textview.h
+++ b/glom/mode_data/datawidget/textview.h
@@ -79,7 +79,7 @@ private:
   virtual bool on_button_press_event(GdkEventButton *event); //override
 #endif
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 
   Glib::ustring m_old_text;
   Field::glom_field_type m_glom_type; //Store the type so we can validate the text accordingly.
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 84e85c8..c7c07d1 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -157,9 +157,9 @@ bool ImageGlom::on_button_press_event(GdkEventButton *event)
   return Gtk::EventBox::on_button_press_event(event);
 }
 
-AppWindow* ImageGlom::get_appwindow()
+AppWindow* ImageGlom::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index 76738ad..e943f43 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -81,7 +81,7 @@ private:
   void on_clipboard_clear();
   void on_clipboard_received_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 
   void setup_menu_usermode();
   void show_image_data();
diff --git a/glom/utility_widgets/notebookglom.cc b/glom/utility_widgets/notebookglom.cc
index 63c0923..7251cff 100644
--- a/glom/utility_widgets/notebookglom.cc
+++ b/glom/utility_widgets/notebookglom.cc
@@ -59,9 +59,9 @@ void NotebookGlom::init()
 
 }
 
-AppWindow* NotebookGlom::get_appwindow()
+AppWindow* NotebookGlom::get_appwindow() const
 {
-  Gtk::Container* pWindow = get_toplevel();
+  Gtk::Container* pWindow = const_cast<Gtk::Container*>(get_toplevel());
   //TODO: This only works when the child widget is already in its parent.
 
   return dynamic_cast<AppWindow*>(pWindow);
diff --git a/glom/utility_widgets/notebookglom.h b/glom/utility_widgets/notebookglom.h
index 55bc0a6..ed7b976 100644
--- a/glom/utility_widgets/notebookglom.h
+++ b/glom/utility_widgets/notebookglom.h
@@ -48,7 +48,7 @@ protected:
 protected:
   void init();
 
-  virtual AppWindow* get_appwindow();
+  virtual AppWindow* get_appwindow() const;
 };
 
 } //namespace Glom
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]