GNOME.org
 

[glom] Change #includes for the latest glibmm.

commit a9513ff7db67e5eda5fccea071769f352a451340
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 25 14:07:47 2011 +0200

    Change #includes for the latest glibmm.
    
    Add individual includes instead of general giomm.h, glibmm.h or gtkmm.h
    includes.
    Among other things, this might let us avoid the annoying warning about
    deprecated GThread functions.

 ChangeLog                                          |    9 +++++++
 glom/application.cc                                |    4 ++-
 glom/bakery/app_withdoc.cc                         |    2 +-
 glom/bakery/app_withdoc_gtk.cc                     |    2 +-
 glom/bakery/dialog_offersave.cc                    |    1 +
 glom/base_db.h                                     |    2 -
 glom/dialog_existing_or_new.cc                     |    1 +
 glom/glade_utils.h                                 |    3 ++
 glom/glom_create_from_example.cc                   |    3 ++
 glom/import_csv/csv_parser.cc                      |    1 +
 glom/import_csv/dialog_import_csv.cc               |    2 +
 glom/import_csv/dialog_import_csv_progress.cc      |    1 +
 glom/libglom/connectionpool.cc                     |    2 +
 glom/libglom/connectionpool_backends/postgres.cc   |    4 ++-
 .../connectionpool_backends/postgres_self.cc       |    6 ++++-
 glom/libglom/data_structure/fieldtypes.h           |    1 +
 glom/libglom/data_structure/glomconversions.cc     |    5 +++-
 .../data_structure/layout/fieldformatting.h        |    1 +
 glom/libglom/db_utils.cc                           |    1 +
 glom/libglom/document/bakery/document.cc           |    2 +-
 glom/libglom/document/document.cc                  |    2 +-
 glom/libglom/example_document_load.cc              |    1 +
 glom/libglom/init.cc                               |    2 +-
 glom/libglom/report_builder.cc                     |    1 +
 glom/libglom/test_avahi_publisher.cc               |    4 ++-
 glom/libglom/utils.cc                              |    2 +-
 glom/libglom/xsl_utils.cc                          |    3 +-
 glom/main.cc                                       |    5 +++-
 glom/mode_data/datawidget/cellcreation.cc          |    3 +-
 glom/mode_data/datawidget/cellrenderer_dblist.cc   |    2 +-
 glom/mode_data/test_flowtablewithfields.cc         |    2 +-
 glom/mode_design/box_db_table_relationships.cc     |    1 -
 glom/mode_design/fields/combo_fieldtype.cc         |    2 +-
 glom/mode_design/iso_codes.cc                      |    1 +
 glom/mode_design/layout/treestore_layout.cc        |    1 -
 .../print_layouts/print_layout_toolbar.cc          |    1 -
 .../print_layouts/window_print_layout_edit.cc      |    8 ++++-
 .../dialog_relationships_overview.cc               |    2 +-
 .../report_layout/treestore_report_layout.cc       |    1 -
 .../translation/dialog_change_language.cc          |    1 -
 glom/utility_widgets/canvas/canvas_editable.cc     |    1 -
 glom/utility_widgets/canvas/canvas_text_movable.cc |    1 +
 .../utility_widgets/canvas/test_canvas_editable.cc |    2 +-
 glom/utility_widgets/cellrendererlist.cc           |    1 -
 .../eggspreadtablemm/eggspreadtabledndmm.cc        |    2 +-
 .../eggspreadtablemm/eggspreadtablemm.cc           |    2 +-
 .../eggspreadtablemm/test_spreadtablednd.cc        |   14 ++++++++++-
 glom/utility_widgets/imageglom.cc                  |    4 ++-
 glom/utility_widgets/layouttoolbarbutton.cc        |    1 -
 glom/utility_widgets/layoutwidgetutils.cc          |    1 -
 glom/utility_widgets/test_flowtable.cc             |    6 ++++-
 glom/utility_widgets/test_flowtable_dnd.cc         |    2 +-
 glom/utils_ui.cc                                   |    5 +++-
 glom/variablesmap.h                                |    1 +
 tests/glade_toplevels_instantiation.cc             |    4 ++-
 tests/import/test_parsing.cc                       |    7 ++++-
 tests/import/test_signals.cc                       |    4 ++-
 tests/import/utils.cc                              |    2 +
 .../python/test_python_execute_func_with_record.cc |    2 +
 tests/test_document_autosave.cc                    |    2 +
 tests/test_document_load.cc                        |    2 +
 tests/test_glade_derived_instantiation.cc          |   25 ++++++++++++++++++-
 tests/test_selfhosting_new_empty.cc                |    2 +
 tests/test_selfhosting_utils.cc                    |    2 +
 64 files changed, 149 insertions(+), 44 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 99b5ed9..18f5fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-25  Murray Cumming  <murrayc murrayc com>
+
+	Change #includes for the latest glibmm.
+
+	Add individual includes instead of general giomm.h, glibmm.h or gtkmm.h 
+	includes.
+	Among other things, this might let us avoid the annoying warning about 
+	deprecated GThread functions.
+
 2011-10-24  Murray Cumming  <murrayc murrayc com>
 
 	Main window: Use a smaller default size.
diff --git a/glom/application.cc b/glom/application.cc
index 169ed0c..5b4e82f 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -44,7 +44,9 @@
 
 #include <cstdio>
 #include <memory> //For std::auto_ptr<>
-#include <giomm.h>
+#include <giomm/file.h>
+#include <glibmm/spawn.h>
+#include <glibmm/convert.h>
 #include <sstream> //For stringstream.
 
 #ifndef G_OS_WIN32
diff --git a/glom/bakery/app_withdoc.cc b/glom/bakery/app_withdoc.cc
index e11b5b6..9a0eda3 100644
--- a/glom/bakery/app_withdoc.cc
+++ b/glom/bakery/app_withdoc.cc
@@ -19,7 +19,7 @@
 #include "config.h"
 #include <glom/bakery/app_withdoc.h>
 #include <glom/bakery/dialog_offersave.h>
-#include <giomm.h>
+#include <giomm/file.h>
 #include <algorithm>
 #include <glibmm/i18n-lib.h>
 
diff --git a/glom/bakery/app_withdoc_gtk.cc b/glom/bakery/app_withdoc_gtk.cc
index 88db4a3..d4ca478 100644
--- a/glom/bakery/app_withdoc_gtk.cc
+++ b/glom/bakery/app_withdoc_gtk.cc
@@ -25,7 +25,7 @@
 #include <gtkmm/recentchoosermenu.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/filechooserdialog.h>
-#include <giomm.h>
+#include <giomm/file.h>
 #include <algorithm>
 #include <iostream>
 
diff --git a/glom/bakery/dialog_offersave.cc b/glom/bakery/dialog_offersave.cc
index de9db86..042ec3d 100644
--- a/glom/bakery/dialog_offersave.cc
+++ b/glom/bakery/dialog_offersave.cc
@@ -21,6 +21,7 @@
 #include <glom/bakery/dialog_offersave.h>
 #include <glom/bakery/app_withdoc_gtk.h>
 #include <gtkmm/stock.h>
+#include <glibmm/convert.h> 
 #include <glibmm/i18n-lib.h>
 
 namespace
diff --git a/glom/base_db.h b/glom/base_db.h
index 10f8897..5ccb1ad 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -23,8 +23,6 @@
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
-//#include <gtkmm.h>
-
 #include <libglom/document/view.h>
 #include <libglom/connectionpool.h>
 #include <libglom/appstate.h>
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index 9ff4394..a34bf28 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -29,6 +29,7 @@
 #include <gtkmm/recentmanager.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/stock.h>
+#include <glibmm/miscutils.h>
 
 #ifdef G_OS_WIN32
 # include <glib/gwin32.h>
diff --git a/glom/glade_utils.h b/glom/glade_utils.h
index 4af790e..7a3a1e3 100644
--- a/glom/glade_utils.h
+++ b/glom/glade_utils.h
@@ -25,6 +25,9 @@
 #include <gtkmm/builder.h>
 #include <gtkmm/window.h>
 #include <giomm/file.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/markup.h>
+#include <glibmm/fileutils.h>
 
 namespace Glom
 {
diff --git a/glom/glom_create_from_example.cc b/glom/glom_create_from_example.cc
index e5948b5..b74af81 100644
--- a/glom/glom_create_from_example.cc
+++ b/glom/glom_create_from_example.cc
@@ -32,6 +32,9 @@
 #include <libglom/db_utils.h>
 #include <libglom/utils.h>
 #include <giomm/file.h>
+#include <glibmm/optioncontext.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <iostream>
 
 #include <glibmm/i18n.h>
diff --git a/glom/import_csv/csv_parser.cc b/glom/import_csv/csv_parser.cc
index a1503af..56242ff 100644
--- a/glom/import_csv/csv_parser.cc
+++ b/glom/import_csv/csv_parser.cc
@@ -20,6 +20,7 @@
  */
 
 #include "csv_parser.h"
+#include <glibmm/convert.h>
 
 #include <cerrno>
 #include <iostream>
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index ee55d8b..525eed9 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -28,6 +28,8 @@
 #include <gtkmm/cellrenderercombo.h>
 #include <glom/utils_ui.h>
 #include <gtkmm/main.h>
+#include <glibmm/convert.h>
+#include <glibmm/markup.h>
 #include <glibmm/i18n.h>
 #include <cerrno>
 #include <iostream>
diff --git a/glom/import_csv/dialog_import_csv_progress.cc b/glom/import_csv/dialog_import_csv_progress.cc
index 339be18..b23f354 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -24,6 +24,7 @@
 #include <gtkmm/main.h>
 
 #include <libglom/data_structure/glomconversions.h>
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index 053012b..00631c5 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -38,6 +38,8 @@
 
 #include <signal.h> //To catch segfaults
 
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/libglom/connectionpool_backends/postgres.cc b/glom/libglom/connectionpool_backends/postgres.cc
index e47541c..c194cc4 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -25,7 +25,9 @@
 #include <libglom/spawn_with_feedback.h>
 #include <libglom/utils.h>
 #include <libgdamm/config.h>
-#include <giomm.h>
+#include <giomm/file.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <glib/gstdio.h> /* For g_rename(). TODO: Wrap this in glibmm? */
 #include <glibmm/i18n.h>
 
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index b7ff22b..397167c 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -23,9 +23,13 @@
 #include <libglom/utils.h>
 #include <libglom/db_utils.h>
 #include <libglom/spawn_with_feedback.h>
-#include <giomm.h>
+#include <giomm/file.h>
 #include <glib/gstdio.h> // For g_remove
 
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/stringutils.h>
+#include <glibmm/regex.h>
 #include <glibmm/i18n.h>
 
 #include <libglom/gst-package.h>
diff --git a/glom/libglom/data_structure/fieldtypes.h b/glom/libglom/data_structure/fieldtypes.h
index 6956737..4a765bf 100644
--- a/glom/libglom/data_structure/fieldtypes.h
+++ b/glom/libglom/data_structure/fieldtypes.h
@@ -23,6 +23,7 @@
 #define GLOM_DATASTRUCTURE_FIELDTYPES_H
 
 #include <libgdamm/connection.h>
+#include <map>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/glomconversions.cc b/glom/libglom/data_structure/glomconversions.cc
index 08644fc..78766fc 100644
--- a/glom/libglom/data_structure/glomconversions.cc
+++ b/glom/libglom/data_structure/glomconversions.cc
@@ -25,7 +25,7 @@
 #include <libglom/connectionpool.h>
 #include <libglom/utils.h>
 
-#include <glibmm/i18n.h>
+#include <glibmm/convert.h>
 #include <sstream> //For stringstream
 
 #include <locale>     // for locale, time_put
@@ -33,6 +33,9 @@
 #include <iostream>   // for cout, endl
 #include <iomanip>
 #include <string.h> // for strlen, memset, strcmp
+#include <stdexcept>
+
+#include <glibmm/i18n.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/fieldformatting.h b/glom/libglom/data_structure/layout/fieldformatting.h
index 232d174..810c24b 100644
--- a/glom/libglom/data_structure/layout/fieldformatting.h
+++ b/glom/libglom/data_structure/layout/fieldformatting.h
@@ -26,6 +26,7 @@
 #include <libglom/data_structure/relationship.h>
 #include <libglom/sharedptr.h>
 #include <libgdamm/value.h>
+#include <list>
 
 namespace Glom
 {
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index 249b163..a8d7dc9 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -28,6 +28,7 @@
 #include <libglom/utils.h>
 #include <libgdamm/value.h>
 #include <libgdamm/metastore.h>
+#include <glibmm/timer.h>
 #include <libgda/libgda.h> // For gda_g_type_from_string
 #include <glibmm/i18n.h>
 
diff --git a/glom/libglom/document/bakery/document.cc b/glom/libglom/document/bakery/document.cc
index 29fa535..d6a038a 100644
--- a/glom/libglom/document/bakery/document.cc
+++ b/glom/libglom/document/bakery/document.cc
@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include <libglom/document/bakery/document.h>
-#include <giomm.h>
+#include <giomm/file.h>
 #include <iostream>
 #include <glibmm/i18n-lib.h>
 
diff --git a/glom/libglom/document/document.cc b/glom/libglom/document/document.cc
index d9c873d..74f00c9 100644
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@ -32,7 +32,7 @@
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
 #include <libglom/data_structure/layout/layoutitem_line.h>
 #include <libglom/standard_table_prefs_fields.h>
-#include <giomm.h>
+#include <giomm/file.h>
 //#include <libglom/busy_cursor.h>
 
 #include <libglom/connectionpool.h>
diff --git a/glom/libglom/example_document_load.cc b/glom/libglom/example_document_load.cc
index 37171c7..7b2fee7 100644
--- a/glom/libglom/example_document_load.cc
+++ b/glom/libglom/example_document_load.cc
@@ -23,6 +23,7 @@
 
 #include <libglom/document/document.h>
 #include <libglom/init.h>
+#include <glibmm/convert.h>
 
 #include <iostream>
 
diff --git a/glom/libglom/init.cc b/glom/libglom/init.cc
index e5061f3..6460d38 100644
--- a/glom/libglom/init.cc
+++ b/glom/libglom/init.cc
@@ -24,7 +24,7 @@
 #endif
 
 #include <glom/libglom/connectionpool.h>
-#include <giomm.h>
+#include <giomm/init.h>
 #include <libgdamm/connection.h>
 #include <libgdamm/init.h>
 #include <iostream>
diff --git a/glom/libglom/report_builder.cc b/glom/libglom/report_builder.cc
index af4a2a6..ab7e4e7 100644
--- a/glom/libglom/report_builder.cc
+++ b/glom/libglom/report_builder.cc
@@ -24,6 +24,7 @@
 #include <libglom/db_utils.h>
 #include <libglom/xsl_utils.h>
 #include <iostream>
+#include <glibmm/miscutils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/libglom/test_avahi_publisher.cc b/glom/libglom/test_avahi_publisher.cc
index 4ae5276..7ad3fd9 100644
--- a/glom/libglom/test_avahi_publisher.cc
+++ b/glom/libglom/test_avahi_publisher.cc
@@ -1,4 +1,6 @@
-#include <gtkmm.h>
+#include <gtkmm/window.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
 #include <libglom/avahi_publisher.h>
 #include <libglom/utils.h>
 #include <iostream>
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index 792f8fb..6b3be7f 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -27,7 +27,7 @@
 
 #include <glibmm/i18n.h>
 
-#include <giomm.h>
+#include <giomm/file.h>
 
 #include <string.h> // for strchr
 #include <sstream> //For stringstream
diff --git a/glom/libglom/xsl_utils.cc b/glom/libglom/xsl_utils.cc
index 20c6db1..faac694 100644
--- a/glom/libglom/xsl_utils.cc
+++ b/glom/libglom/xsl_utils.cc
@@ -27,7 +27,8 @@
 #include <libxml++/libxml++.h>
 #include <libxslt/transform.h>
 //#include <libexslt/exslt.h> //For exsltRegisterAll().
-#include <giomm.h>
+#include <giomm/file.h>
+#include <glibmm/miscutils.h>
 #include <glibmm/i18n.h>
 
 #include <sstream> //For stringstream
diff --git a/glom/main.cc b/glom/main.cc
index 6068313..e3a4e74 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -30,7 +30,10 @@
 #include <glom/glade_utils.h>
 #include <gtkmm/main.h>
 
-#include <giomm.h>
+#include <giomm/file.h>
+#include <glibmm/optioncontext.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 
 // For postgres availability checks:
 #ifdef GLOM_ENABLE_POSTGRESQL
diff --git a/glom/mode_data/datawidget/cellcreation.cc b/glom/mode_data/datawidget/cellcreation.cc
index 2b02749..5d8e8a2 100644
--- a/glom/mode_data/datawidget/cellcreation.cc
+++ b/glom/mode_data/datawidget/cellcreation.cc
@@ -18,12 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include <glom/utility_widgets/cellrendererlist.h>
 #include <glom/mode_data/datawidget/cellrenderer_dblist.h>
 #include <glom/mode_data/datawidget/cellrenderer_buttonimage.h>
 #include <glom/mode_data/datawidget/cellrenderer_buttontext.h>
 #include <glom/utils_ui.h>
+#include <gtkmm/cellrenderertext.h>
+#include <gtkmm/stock.h>
 #include <libglom/data_structure/layout/layoutitem_field.h>
 #include <libglom/data_structure/layout/layoutitem_image.h>
 #include <libglom/utils.h>
diff --git a/glom/mode_data/datawidget/cellrenderer_dblist.cc b/glom/mode_data/datawidget/cellrenderer_dblist.cc
index 551d6ea..b60a932 100644
--- a/glom/mode_data/datawidget/cellrenderer_dblist.cc
+++ b/glom/mode_data/datawidget/cellrenderer_dblist.cc
@@ -21,7 +21,7 @@
 #include "cellrenderer_dblist.h"
 #include <glom/mode_data/datawidget/cellcreation.h>
 #include <glom/mode_data/datawidget/treemodel_db_withextratext.h>
-#include <gtkmm.h>
+#include <gtkmm/cellrenderertext.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <iostream>
 
diff --git a/glom/mode_data/test_flowtablewithfields.cc b/glom/mode_data/test_flowtablewithfields.cc
index 40c6223..dc972ae 100644
--- a/glom/mode_data/test_flowtablewithfields.cc
+++ b/glom/mode_data/test_flowtablewithfields.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
+#include <gtkmm/window.h>
 #include <glom/mode_data/flowtablewithfields.h>
 #include <iostream>
 
diff --git a/glom/mode_design/box_db_table_relationships.cc b/glom/mode_design/box_db_table_relationships.cc
index d1c2aef..205cfd9 100644
--- a/glom/mode_design/box_db_table_relationships.cc
+++ b/glom/mode_design/box_db_table_relationships.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 //#include <gtkmm/builder.h>
 #include "box_db_table_relationships.h"
 #include <algorithm>
diff --git a/glom/mode_design/fields/combo_fieldtype.cc b/glom/mode_design/fields/combo_fieldtype.cc
index db26369..91136fe 100644
--- a/glom/mode_design/fields/combo_fieldtype.cc
+++ b/glom/mode_design/fields/combo_fieldtype.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
+#include <gtkmm/liststore.h>
 #include "combo_fieldtype.h"
 #include "../../box_db_table.h"
 #include <glibmm/i18n.h>
diff --git a/glom/mode_design/iso_codes.cc b/glom/mode_design/iso_codes.cc
index 9b3070d..a9bc379 100644
--- a/glom/mode_design/iso_codes.cc
+++ b/glom/mode_design/iso_codes.cc
@@ -24,6 +24,7 @@
 #include <libxml++/libxml++.h>
 #include <libglom/document/document.h>
 #include <libglom/utils.h>
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/mode_design/layout/treestore_layout.cc b/glom/mode_design/layout/treestore_layout.cc
index 4bc470f..da64d39 100644
--- a/glom/mode_design/layout/treestore_layout.cc
+++ b/glom/mode_design/layout/treestore_layout.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include <glom/mode_design/layout/treestore_layout.h>
 #include <iostream>
 
diff --git a/glom/mode_design/print_layouts/print_layout_toolbar.cc b/glom/mode_design/print_layouts/print_layout_toolbar.cc
index f29d4ad..4abf616 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar.cc
+++ b/glom/mode_design/print_layouts/print_layout_toolbar.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include "print_layout_toolbar.h"
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index af4766f..2ea0f84 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -24,10 +24,14 @@
 #include <glom/utils_ui.h>
 #include <glom/application.h>
 #include <glom/print_layout/print_layout_utils.h>
+#include <gtkmm/radioaction.h>
+#include <gtkmm/printsettings.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/grid.h>
+#include <gtkmm/printoperation.h>
 #include <libglom/data_structure/layout/layoutitem_line.h>
 #include <libglom/data_structure/layout/layoutitem_portal.h>
-#include <libglom/utils.h> //For bold_message()).
-#include <gtkmm.h>
+#include <libglom/utils.h> //For bold_message()).>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
index a0539d0..5de17d9 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
-#include <gtkmm.h>
 #include "dialog_relationships_overview.h"
 #include "glom/utility_widgets/canvas/canvas_line_movable.h"
 #include "glom/utility_widgets/canvas/canvas_text_movable.h"
 #include <glom/mode_design/layout/dialog_choose_relationship.h>
 #include "printoperation_relationshipsoverview.h"
 #include "glom/application.h"
+#include <gtkmm/stock.h>
 #include <goocanvas.h>
 #include <glibmm/i18n.h>
 #include <iostream>
diff --git a/glom/mode_design/report_layout/treestore_report_layout.cc b/glom/mode_design/report_layout/treestore_report_layout.cc
index ba9db82..1d399d4 100644
--- a/glom/mode_design/report_layout/treestore_report_layout.cc
+++ b/glom/mode_design/report_layout/treestore_report_layout.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include "treestore_report_layout.h"
 #include <libglom/data_structure/layout/report_parts/layoutitem_groupby.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
diff --git a/glom/mode_design/translation/dialog_change_language.cc b/glom/mode_design/translation/dialog_change_language.cc
index ec37af2..207772f 100644
--- a/glom/mode_design/translation/dialog_change_language.cc
+++ b/glom/mode_design/translation/dialog_change_language.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include "dialog_change_language.h"
 #include <glibmm/i18n.h>
 
diff --git a/glom/utility_widgets/canvas/canvas_editable.cc b/glom/utility_widgets/canvas/canvas_editable.cc
index b370dc3..7e6f126 100644
--- a/glom/utility_widgets/canvas/canvas_editable.cc
+++ b/glom/utility_widgets/canvas/canvas_editable.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include "canvas_editable.h"
 #include "canvas_group_resizable.h"
 #include "canvas_rect_movable.h"
diff --git a/glom/utility_widgets/canvas/canvas_text_movable.cc b/glom/utility_widgets/canvas/canvas_text_movable.cc
index bf84dd0..7be4c61 100644
--- a/glom/utility_widgets/canvas/canvas_text_movable.cc
+++ b/glom/utility_widgets/canvas/canvas_text_movable.cc
@@ -20,6 +20,7 @@
 
 #include "canvas_text_movable.h"
 #include <goocanvasmm/canvas.h>
+#include <glibmm/markup.h>
 #include <goocanvastext.h>
 #include <iostream>
 
diff --git a/glom/utility_widgets/canvas/test_canvas_editable.cc b/glom/utility_widgets/canvas/test_canvas_editable.cc
index aeb7664..8a57e81 100644
--- a/glom/utility_widgets/canvas/test_canvas_editable.cc
+++ b/glom/utility_widgets/canvas/test_canvas_editable.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include <gtkmm.h>
+#include <gtkmm/window.h>
 #include "canvas_editable.h"
 #include "canvas_line_movable.h"
 #include "canvas_rect_movable.h"
diff --git a/glom/utility_widgets/cellrendererlist.cc b/glom/utility_widgets/cellrendererlist.cc
index b3f213b..aca1b2f 100644
--- a/glom/utility_widgets/cellrendererlist.cc
+++ b/glom/utility_widgets/cellrendererlist.cc
@@ -19,7 +19,6 @@
  */
 
 #include "cellrendererlist.h"
-#include <gtkmm.h>
 
 
 namespace Glom
diff --git a/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc b/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
index 6ce8fa2..60ebf4e 100644
--- a/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
+++ b/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
@@ -19,7 +19,7 @@
 
 #include <glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h>
 #include <glom/utility_widgets/eggspreadtablemm/private/eggspreadtabledndmm_p.h>
-
+#include <glibmm/exceptionhandler.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc b/glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc
index dfc8d68..3bc44ad 100644
--- a/glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc
+++ b/glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc
@@ -19,7 +19,7 @@
 
 #include <glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.h>
 #include <glom/utility_widgets/eggspreadtablemm/private/eggspreadtablemm_p.h>
-
+#include <glibmm/exceptionhandler.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc b/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
index be9b6e1..10872c8 100644
--- a/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
+++ b/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
@@ -20,7 +20,19 @@
 
 #include <glom/utility_widgets/eggspreadtable/eggspreadtablednd.h>
 #include <glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h>
-#include <gtkmm.h>
+#include <gtkmm/window.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/main.h>
 
 static const guint INITIAL_HSPACING = 2;
 static const guint INITIAL_VSPACING = 2;
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index b8c49bb..14c2008 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -29,7 +29,9 @@
 #include <gtkmm/appchooserdialog.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/stock.h>
-#include <giomm.h>
+#include <giomm/file.h>
+#include <giomm/contenttype.h>
+#include <glibmm/convert.h>
 
 #include <iostream>   // for cout, endl
 
diff --git a/glom/utility_widgets/layouttoolbarbutton.cc b/glom/utility_widgets/layouttoolbarbutton.cc
index 9032147..ebe9e82 100644
--- a/glom/utility_widgets/layouttoolbarbutton.cc
+++ b/glom/utility_widgets/layouttoolbarbutton.cc
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
 #include "layouttoolbarbutton.h"
 #include <glom/utils_ui.h>
 
diff --git a/glom/utility_widgets/layoutwidgetutils.cc b/glom/utility_widgets/layoutwidgetutils.cc
index eb9f5eb..c7f20b2 100644
--- a/glom/utility_widgets/layoutwidgetutils.cc
+++ b/glom/utility_widgets/layoutwidgetutils.cc
@@ -22,7 +22,6 @@
 
 #include "layoutwidgetutils.h"
 #include <glibmm/i18n.h>
-#include <gtkmm.h>
 #include <iostream>
 
 namespace Glom
diff --git a/glom/utility_widgets/test_flowtable.cc b/glom/utility_widgets/test_flowtable.cc
index bfceb6e..fdcab42 100644
--- a/glom/utility_widgets/test_flowtable.cc
+++ b/glom/utility_widgets/test_flowtable.cc
@@ -18,7 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtkmm.h>
+#include <gtkmm/window.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/button.h>
+#include <gtkmm/main.h>
 #include "flowtable.h"
 #include <iostream>
 
diff --git a/glom/utility_widgets/test_flowtable_dnd.cc b/glom/utility_widgets/test_flowtable_dnd.cc
index 93facf9..50059fa 100644
--- a/glom/utility_widgets/test_flowtable_dnd.cc
+++ b/glom/utility_widgets/test_flowtable_dnd.cc
@@ -19,7 +19,7 @@
  */
  
 #include "flowtable_dnd.h"
-#include <gtkmm.h>
+#include <gtkmm/window.h>
 
 //#include "dragwindow.h"
 
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 5cdb0c2..9c04287 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -31,8 +31,11 @@
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
 
-#include <giomm.h>
+#include <giomm/file.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/glom/variablesmap.h b/glom/variablesmap.h
index 18c5a6d..2472b92 100644
--- a/glom/variablesmap.h
+++ b/glom/variablesmap.h
@@ -21,6 +21,7 @@
 #define GLOM_VARIABLESMAP_H
 
 #include <gtkmm/builder.h>
+#include <glibmm/date.h>
 #include <map>
 
 namespace Glom
diff --git a/tests/glade_toplevels_instantiation.cc b/tests/glade_toplevels_instantiation.cc
index d5fee5c..7502f1f 100644
--- a/tests/glade_toplevels_instantiation.cc
+++ b/tests/glade_toplevels_instantiation.cc
@@ -17,7 +17,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/dialog.h>
+#include <gtkmm/main.h>
 #include <gtksourceviewmm/init.h>
 #include <libxml++/libxml++.h>
 
diff --git a/tests/import/test_parsing.cc b/tests/import/test_parsing.cc
index b923a39..6faa4ad 100644
--- a/tests/import/test_parsing.cc
+++ b/tests/import/test_parsing.cc
@@ -1,7 +1,12 @@
 #include <glom/import_csv/csv_parser.h>
 #include <tests/import/utils.h>
 //#include <glibmm/regex.h>
-#include <giomm.h>
+#include <giomm/file.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/regex.h>
+#include <glibmm/init.h>
+#include <giomm/init.h>
 #include <iostream>
 #include <cstdlib>
 
diff --git a/tests/import/test_signals.cc b/tests/import/test_signals.cc
index 3cb7d76..d0bc98d 100644
--- a/tests/import/test_signals.cc
+++ b/tests/import/test_signals.cc
@@ -1,6 +1,8 @@
 #include <glom/import_csv/csv_parser.h>
 #include <tests/import/utils.h>
-#include <giomm.h>
+#include <giomm/file.h>
+#include <glibmm/init.h>
+#include <giomm/init.h>
 #include <iostream>
 #include <stdexcept>
 #include <cstdlib>
diff --git a/tests/import/utils.cc b/tests/import/utils.cc
index f639f41..35afa19 100644
--- a/tests/import/utils.cc
+++ b/tests/import/utils.cc
@@ -1,4 +1,6 @@
 #include <tests/import/utils.h>
+#include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 
 namespace ImportTests
 {
diff --git a/tests/python/test_python_execute_func_with_record.cc b/tests/python/test_python_execute_func_with_record.cc
index c9748d5..76b471f 100644
--- a/tests/python/test_python_execute_func_with_record.cc
+++ b/tests/python/test_python_execute_func_with_record.cc
@@ -3,6 +3,8 @@
 #include <glom/python_embed/glom_python.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/utils.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <boost/python.hpp>
 #include <iostream>
 
diff --git a/tests/test_document_autosave.cc b/tests/test_document_autosave.cc
index a7bbfd9..3e73b34 100644
--- a/tests/test_document_autosave.cc
+++ b/tests/test_document_autosave.cc
@@ -21,6 +21,8 @@
 #include <libglom/document/document.h>
 #include <libglom/init.h>
 #include <giomm/file.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <iostream>
 
 Glib::ustring file_uri;
diff --git a/tests/test_document_load.cc b/tests/test_document_load.cc
index b2fcf4b..8a1bae1 100644
--- a/tests/test_document_load.cc
+++ b/tests/test_document_load.cc
@@ -21,6 +21,8 @@
 #include <libglom/document/document.h>
 #include <libglom/init.h>
 #include <giomm/file.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 
 #include <iostream>
 
diff --git a/tests/test_glade_derived_instantiation.cc b/tests/test_glade_derived_instantiation.cc
index fed2f0d..a7cc090 100644
--- a/tests/test_glade_derived_instantiation.cc
+++ b/tests/test_glade_derived_instantiation.cc
@@ -1,5 +1,3 @@
-#include <gtkmm.h>
-#include <gtksourceviewmm/init.h>
 #include <glom/glade_utils.h>
 #include <glom/application.h>
 #include <glom/dialog_existing_or_new.h>
@@ -16,6 +14,26 @@
 #include <glom/utility_widgets/dialog_flowtable.h>
 #include <glom/utility_widgets/dialog_image_load_progress.h>
 #include <glom/utility_widgets/dialog_image_save_progress.h>
+/* Glom
+ *
+ * Copyright (C) 2010-2011 Murray Cumming
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
 #include <glom/mode_design/layout/dialog_choose_field.h>
 #include <glom/mode_design/dialog_add_related_table.h>
 #include <glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h>
@@ -53,6 +71,9 @@
 #include <glom/mode_design/users/dialog_user.h>
 #include <glom/mode_design/print_layouts/dialog_text_formatting.h>
 #include <glom/dialog_invalid_data.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/main.h>
+#include <gtksourceviewmm/init.h>
 
 const int GLOM_MAX_WINDOW_WIDTH = 800;
 const int GLOM_MAX_WINDOW_HEIGHT = 600;
diff --git a/tests/test_selfhosting_new_empty.cc b/tests/test_selfhosting_new_empty.cc
index a4cedd2..7b688b8 100644
--- a/tests/test_selfhosting_new_empty.cc
+++ b/tests/test_selfhosting_new_empty.cc
@@ -25,6 +25,8 @@
 #include <libglom/privs.h>
 #include <libglom/utils.h>
 #include <giomm/file.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <iostream>
 
 static void on_initialize_progress()
diff --git a/tests/test_selfhosting_utils.cc b/tests/test_selfhosting_utils.cc
index cc0a476..876e1b3 100644
--- a/tests/test_selfhosting_utils.cc
+++ b/tests/test_selfhosting_utils.cc
@@ -28,6 +28,8 @@
 #include <libglom/db_utils.h>
 #include <libglom/utils.h>
 #include <giomm/file.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <iostream>
 
 static void on_initialize_progress()
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]