GNOME.org
 

[glom] Remove unnecessary gtk C includes.

commit 7d5cf9b54c6075dfaa9d7aedba7d54fe0128e69f
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jun 13 14:48:08 2010 +0200

    Remove unnecessary gtk C includes.
    
    	* glom/application.cc:
    	* glom/bakery/app_withdoc_gtk.cc:
    	* glom/libglom/data_structure/print_layout.cc:
    	* glom/libglom/document/document.cc:
    	* glom/libglom/gst-package.c:
    	* glom/mode_design/comboentry_currency.cc:
    	* glom/mode_design/fields/combo_fieldtype.cc:
    	* glom/mode_design/layout/combobox_fields.cc:
    	* glom/mode_design/layout/combobox_relationship.cc:
    	* glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc:
    	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc:
    	* glom/mode_design/print_layouts/print_layout_toolbar.cc:
    	* glom/mode_design/translation/combobox_locale.cc:
    	* glom/utility_widgets/cellrendererlist/cellrendererlist.cc:
    	* glom/utility_widgets/combo_textglade.cc:
    	* glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc:
    	* glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h:
    	* glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc:
    	* glom/utility_widgets/db_adddel/cellrenderer_buttontext.h:
    	* glom/utility_widgets/db_adddel/db_adddel.cc:
    	* glom/utility_widgets/flowtable.cc:
    	* glom/utility_widgets/layouttoolbar.cc:
    	* glom/xsl_utils.cc: Remove now-unnecessary gtk+/gtk* includes,
    	replacing some with use of C++ API. These caused warnings due to GSEAL.

 ChangeLog                                          |   29 ++++++++++++++++++++
 glom/application.cc                                |    4 +--
 glom/bakery/app_withdoc_gtk.cc                     |    2 -
 glom/libglom/data_structure/print_layout.cc        |    1 -
 glom/libglom/document/document.cc                  |    2 -
 glom/libglom/gst-package.c                         |    3 +-
 glom/mode_design/comboentry_currency.cc            |    1 -
 glom/mode_design/fields/combo_fieldtype.cc         |    1 -
 glom/mode_design/layout/combobox_fields.cc         |    1 -
 glom/mode_design/layout/combobox_relationship.cc   |    1 -
 .../layout_item_dialogs/combo_summarytype.cc       |    1 -
 .../layout_item_dialogs/comboentry_borderwidth.cc  |    1 -
 .../print_layouts/print_layout_toolbar.cc          |    3 --
 glom/mode_design/translation/combobox_locale.cc    |    1 -
 .../cellrendererlist/cellrendererlist.cc           |    1 -
 glom/utility_widgets/combo_textglade.cc            |    1 -
 .../db_adddel/cellrenderer_buttonimage.cc          |    2 -
 .../db_adddel/cellrenderer_buttonimage.h           |    1 -
 .../db_adddel/cellrenderer_buttontext.cc           |    2 -
 .../db_adddel/cellrenderer_buttontext.h            |    1 -
 glom/utility_widgets/db_adddel/db_adddel.cc        |    2 -
 glom/utility_widgets/flowtable.cc                  |    9 ++----
 glom/utility_widgets/layouttoolbar.cc              |    1 -
 glom/xsl_utils.cc                                  |    1 -
 24 files changed, 34 insertions(+), 38 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9e6e82b..0162178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2010-06-13  Murray Cumming  <murrayc murrayc com>
 
+	Remove unnecessary gtk C includes.
+
+	* glom/application.cc:
+	* glom/bakery/app_withdoc_gtk.cc:
+	* glom/libglom/data_structure/print_layout.cc:
+	* glom/libglom/document/document.cc:
+	* glom/libglom/gst-package.c:
+	* glom/mode_design/comboentry_currency.cc:
+	* glom/mode_design/fields/combo_fieldtype.cc:
+	* glom/mode_design/layout/combobox_fields.cc:
+	* glom/mode_design/layout/combobox_relationship.cc:
+	* glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc:
+	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc:
+	* glom/mode_design/print_layouts/print_layout_toolbar.cc:
+	* glom/mode_design/translation/combobox_locale.cc:
+	* glom/utility_widgets/cellrendererlist/cellrendererlist.cc:
+	* glom/utility_widgets/combo_textglade.cc:
+	* glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc:
+	* glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h:
+	* glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc:
+	* glom/utility_widgets/db_adddel/cellrenderer_buttontext.h:
+	* glom/utility_widgets/db_adddel/db_adddel.cc:
+	* glom/utility_widgets/flowtable.cc:
+	* glom/utility_widgets/layouttoolbar.cc:
+	* glom/xsl_utils.cc: Remove now-unnecessary gtk+/gtk* includes, 
+	replacing some with use of C++ API. These caused warnings due to GSEAL.
+
+2010-06-13  Murray Cumming  <murrayc murrayc com>
+
 	Depend on avahi-ui-3.0 instead of avahi-ui, though it does not officially exist.
     
 	* configure.ac: avahi-ui links to gtk-2.0, so depending on avahi-ui-3.0 is
diff --git a/glom/application.cc b/glom/application.cc
index 8666bdb..668f57a 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -56,14 +56,12 @@
 #include <avahi-ui/avahi-ui.h>
 #endif // !G_OS_WIN32
 
-#include <gtk/gtkstock.h> /* For use with the avahi-ui dialog. */
+#include <gtk/gtk.h>
 
 #ifndef G_OS_WIN32
 # include <netdb.h> //For gethostbyname().
 #endif
 
-#include <gtk/gtkuimanager.h>
-
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/bakery/app_withdoc_gtk.cc b/glom/bakery/app_withdoc_gtk.cc
index 25bdba0..f4f6b6f 100644
--- a/glom/bakery/app_withdoc_gtk.cc
+++ b/glom/bakery/app_withdoc_gtk.cc
@@ -38,8 +38,6 @@
 
 #include <glibmm/i18n-lib.h>
 
-//#include <gtk/gtkfilesel.h>
-
 namespace GlomBakery
 {
 
diff --git a/glom/libglom/data_structure/print_layout.cc b/glom/libglom/data_structure/print_layout.cc
index aa4b936..bf6a10c 100644
--- a/glom/libglom/data_structure/print_layout.cc
+++ b/glom/libglom/data_structure/print_layout.cc
@@ -19,7 +19,6 @@
  */
 
 #include <libglom/data_structure/print_layout.h>
-#include <gtk/gtkpagesetup.h> //For gtk_page_setup_copy().
 
 namespace Glom
 {
diff --git a/glom/libglom/document/document.cc b/glom/libglom/document/document.cc
index 10a9fa8..3ba6922 100644
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@ -37,8 +37,6 @@
 
 #include <libglom/connectionpool.h>
 
-#include <gtk/gtkpagesetup.h> //TODO: Remove this when we can use the C++ constructor.
-
 #include <glibmm/i18n.h>
 //#include <libglom/libglom_config.h> //To get GLOM_DTD_INSTALL_DIR - dependent on configure prefix.
 #include <algorithm> //For std::find_if().
diff --git a/glom/libglom/gst-package.c b/glom/libglom/gst-package.c
index 6c236c6..20291bf 100644
--- a/glom/libglom/gst-package.c
+++ b/glom/libglom/gst-package.c
@@ -34,8 +34,7 @@
 
 #include <gdk/gdkspawn.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/glom/mode_design/comboentry_currency.cc b/glom/mode_design/comboentry_currency.cc
index 4fbc1be..1912f56 100644
--- a/glom/mode_design/comboentry_currency.cc
+++ b/glom/mode_design/comboentry_currency.cc
@@ -19,7 +19,6 @@
  */
 
 #include "comboentry_currency.h"
-#include <gtk/gtkcomboboxentry.h>
 #include <glom/mode_design/iso_codes.h>
 
 namespace Glom
diff --git a/glom/mode_design/fields/combo_fieldtype.cc b/glom/mode_design/fields/combo_fieldtype.cc
index d13055b..7b0f0ae 100644
--- a/glom/mode_design/fields/combo_fieldtype.cc
+++ b/glom/mode_design/fields/combo_fieldtype.cc
@@ -20,7 +20,6 @@
 
 #include "combo_fieldtype.h"
 #include "../../box_db_table.h"
-#include <gtk/gtkliststore.h> //For debugging.
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/layout/combobox_fields.cc b/glom/mode_design/layout/combobox_fields.cc
index f1c060b..c17e462 100644
--- a/glom/mode_design/layout/combobox_fields.cc
+++ b/glom/mode_design/layout/combobox_fields.cc
@@ -19,7 +19,6 @@
  */
 
 #include <glom/mode_design/layout/combobox_fields.h>
-#include <gtk/gtkcomboboxentry.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/layout/combobox_relationship.cc b/glom/mode_design/layout/combobox_relationship.cc
index b155ac7..4536e58 100644
--- a/glom/mode_design/layout/combobox_relationship.cc
+++ b/glom/mode_design/layout/combobox_relationship.cc
@@ -19,7 +19,6 @@
  */
 
 #include <glom/mode_design/layout/combobox_relationship.h>
-#include <gtk/gtkcomboboxentry.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
index b4b15fc..9b35735 100644
--- a/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
@@ -19,7 +19,6 @@
  */
 
 #include "combo_summarytype.h"
-#include <gtk/gtkcombobox.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
index da6f866..56d794e 100644
--- a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
@@ -19,7 +19,6 @@
  */
 
 #include "comboentry_borderwidth.h"
-#include <gtk/gtkcomboboxentry.h>
 #include <sstream> //For stringstream.
 
 namespace Glom
diff --git a/glom/mode_design/print_layouts/print_layout_toolbar.cc b/glom/mode_design/print_layouts/print_layout_toolbar.cc
index cd0fc2f..f15a6b0 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar.cc
+++ b/glom/mode_design/print_layouts/print_layout_toolbar.cc
@@ -23,9 +23,6 @@
 #include <glibmm/i18n.h>
 #include <libglom/libglom_config.h>
 
-//#include "layoutwidgetbase.h"
-//#include <gtk/gtktoolitemgroup.h>
-
 namespace Glom
 {
 
diff --git a/glom/mode_design/translation/combobox_locale.cc b/glom/mode_design/translation/combobox_locale.cc
index cf900a2..72fcbb8 100644
--- a/glom/mode_design/translation/combobox_locale.cc
+++ b/glom/mode_design/translation/combobox_locale.cc
@@ -19,7 +19,6 @@
  */
 
 #include "combobox_locale.h"
-#include <gtk/gtkcomboboxentry.h>
 #include <glom/mode_design/iso_codes.h>
 
 namespace Glom
diff --git a/glom/utility_widgets/cellrendererlist/cellrendererlist.cc b/glom/utility_widgets/cellrendererlist/cellrendererlist.cc
index bb4c738..4ce43e6 100644
--- a/glom/utility_widgets/cellrendererlist/cellrendererlist.cc
+++ b/glom/utility_widgets/cellrendererlist/cellrendererlist.cc
@@ -20,7 +20,6 @@
  
 #include "cellrendererlist.h"
 #include <gtkmm.h>
-#include <gtk/gtkcombobox.h>
 
 
 namespace Glom
diff --git a/glom/utility_widgets/combo_textglade.cc b/glom/utility_widgets/combo_textglade.cc
index c3068a0..344a73c 100644
--- a/glom/utility_widgets/combo_textglade.cc
+++ b/glom/utility_widgets/combo_textglade.cc
@@ -19,7 +19,6 @@
  */
 
 #include "combo_textglade.h"
-#include <gtk/gtkcombobox.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc b/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc
index 7fb7816..46d7c26 100644
--- a/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc
+++ b/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc
@@ -20,8 +20,6 @@
 
 #include "cellrenderer_buttonimage.h"
 #include <gtkmm/stock.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrendererpixbuf.h>
 
 
 namespace Glom
diff --git a/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h b/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h
index 342c5c6..cec14aa 100644
--- a/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h
+++ b/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h
@@ -24,7 +24,6 @@
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/treepath.h>
 #include <gtkmm/treemodel.h>
-#include <gtk/gtkcellrenderer.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc b/glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc
index 08ba653..9063ede 100644
--- a/glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc
+++ b/glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc
@@ -19,8 +19,6 @@
  */
 
 #include "cellrenderer_buttontext.h"
-#include <gtk/gtkcellrenderertext.h>
-
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h b/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h
index 19bdcfb..0879551 100644
--- a/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h
+++ b/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h
@@ -24,7 +24,6 @@
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/treepath.h>
 #include <gtkmm/treemodel.h>
-#include <gtk/gtkcellrenderer.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index 93908f6..018b533 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -33,8 +33,6 @@
 #include <libglom/db_utils.h>
 
 #include <iostream> //For debug output.
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkstock.h>
 
 #ifdef GLOM_ENABLE_MAEMO
 //TODO: Remove this when we don't need to call C hildon functions:
diff --git a/glom/utility_widgets/flowtable.cc b/glom/utility_widgets/flowtable.cc
index 47d8d0c..97689cd 100644
--- a/glom/utility_widgets/flowtable.cc
+++ b/glom/utility_widgets/flowtable.cc
@@ -20,12 +20,9 @@
 
 #include "flowtable.h"
 #include "layoutwidgetbase.h"
-#include <gtk/gtkwidget.h>
-#include <gdk/gdktypes.h>
 #include <iostream>
 #include <gdkmm/window.h>
 #include <glom/utils_ui.h>
-#include <gtk/gtk.h>
 
 
 namespace Glom
@@ -284,8 +281,8 @@ void FlowTable::add(Gtk::Widget& first, Gtk::Widget& second, bool expand_second)
 
   item.m_expand_second = expand_second; //Expand to fill the width for all of the second item.
   m_children.push_back(item);
-  gtk_widget_set_parent(GTK_WIDGET(item.m_first->gobj()), GTK_WIDGET(gobj()));
-  gtk_widget_set_parent(GTK_WIDGET(item.m_second->gobj()), GTK_WIDGET(gobj()));
+  item.m_first->set_parent(*this);
+  item.m_second->set_parent(*this);
 }
 
 void FlowTable::add(Gtk::Widget& first, bool expand)
@@ -293,7 +290,7 @@ void FlowTable::add(Gtk::Widget& first, bool expand)
   FlowTableItem item(&first, this);
   item.m_expand_first_full = expand; //Expand to fill the width for first and second.
   m_children.push_back(item);
-  gtk_widget_set_parent(GTK_WIDGET(item.m_first->gobj()), GTK_WIDGET(gobj()));
+  item.m_first->set_parent(*this);
 }
 
 void FlowTable::insert_before(Gtk::Widget& first, Gtk::Widget& before, bool expand)
diff --git a/glom/utility_widgets/layouttoolbar.cc b/glom/utility_widgets/layouttoolbar.cc
index 9ee8ee8..16ad936 100644
--- a/glom/utility_widgets/layouttoolbar.cc
+++ b/glom/utility_widgets/layouttoolbar.cc
@@ -24,7 +24,6 @@
 #include <libglom/libglom_config.h>
 
 #include "layoutwidgetbase.h"
-//#include <gtk/gtktoolitemgroup.h>
 
 namespace
 {
diff --git a/glom/xsl_utils.cc b/glom/xsl_utils.cc
index dfbac55..b7b3d7a 100644
--- a/glom/xsl_utils.cc
+++ b/glom/xsl_utils.cc
@@ -30,7 +30,6 @@
 //#include <libexslt/exslt.h> //For exsltRegisterAll().
 #include <giomm.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 
 #include <sstream> //For stringstream
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]