[glom/glom-1-18] Change #includes for the latest glibmm.



commit 06a8bb6c5c27ff61d65acb065b4b857b6545bb93
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.
    
    Conflicts:
    
    	glom/bakery/app_withdoc_gtk.cc
    	glom/glom_create_from_example.cc
    	glom/libglom/xsl_utils.cc
    	glom/mode_data/datawidget/cellcreation.cc
    	glom/mode_data/datawidget/cellrenderer_dblist.cc
    	glom/mode_data/test_flowtablewithfields.cc
    	glom/mode_design/print_layouts/window_print_layout_edit.cc
    	glom/report_builder.cc
    	glom/utility_widgets/cellrendererlist.cc
    	glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
    	glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc
    	glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
    	glom/utility_widgets/imageglom.cc
    	glom/utility_widgets/test_flowtable.cc
    	glom/utility_widgets/test_flowtable_dnd.cc
    	tests/import/test_parsing.cc
    	tests/import/test_signals.cc
    	tests/python/test_python_execute_func_with_record.cc
    	tests/test_glade_derived_instantiation.cc
    	tests/test_selfhosting_utils.cc

 ChangeLog                                          |    9 ++++
 glom/application.cc                                |    4 +-
 glom/bakery/app_withdoc.cc                         |    2 +-
 glom/bakery/app_withdoc_gtk.cc                     |    1 +
 glom/bakery/dialog_offersave.cc                    |    1 +
 glom/base_db.h                                     |    2 -
 glom/dialog_existing_or_new.cc                     |    1 +
 glom/glade_utils.h                                 |    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/test_avahi_publisher.cc               |    4 +-
 glom/libglom/utils.cc                              |    2 +-
 glom/main.cc                                       |    5 ++-
 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      |   11 ++++-
 .../dialog_relationships_overview.cc               |    2 +-
 .../report_layout/treestore_report_layout.cc       |    1 -
 .../translation/dialog_change_language.cc          |    1 -
 glom/report_builder.cc                             |    3 +
 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/imageglom.cc                  |    3 +
 glom/utility_widgets/layouttoolbarbutton.cc        |    1 -
 glom/utility_widgets/layoutwidgetutils.cc          |    1 -
 glom/utility_widgets/test_flowtable.cc             |    8 +++-
 glom/utility_widgets/test_flowtable_dnd.cc         |    3 +-
 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                       |    3 +
 tests/import/utils.cc                              |    2 +
 tests/test_document_autosave.cc                    |    2 +
 tests/test_document_load.cc                        |    2 +
 tests/test_glade_derived_instantiation.cc          |   40 +++++++++++--------
 tests/test_selfhosting_new_empty.cc                |    2 +
 53 files changed, 127 insertions(+), 50 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 05dd96f..ee166a8 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>
 
 	Do not include gtkmm.h, glibmm.h, giomm.h, or similar in headers.
diff --git a/glom/application.cc b/glom/application.cc
index 6b52678..e2ccf4c 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -46,7 +46,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.
 
 #ifdef GLOM_ENABLE_MAEMO
diff --git a/glom/bakery/app_withdoc.cc b/glom/bakery/app_withdoc.cc
index fc98d64..6b14e87 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 a03cf0c..f8c36c7 100644
--- a/glom/bakery/app_withdoc_gtk.cc
+++ b/glom/bakery/app_withdoc_gtk.cc
@@ -27,6 +27,7 @@
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/aboutdialog.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 513477d..d07db9c 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 2c6e972..f12b5b6 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 b3b3f55..a56152f 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 GLOM_ENABLE_MAEMO
 #include <hildon-fmmm/file-chooser-dialog.h>
diff --git a/glom/glade_utils.h b/glom/glade_utils.h
index ff8d32e..3e00a7d 100644
--- a/glom/glade_utils.h
+++ b/glom/glade_utils.h
@@ -25,6 +25,9 @@
 #include <gtkmm/builder.h>
 #include <glom/dialog_progress_creating.h>
 #include <giomm/file.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/markup.h>
+#include <glibmm/fileutils.h>
 
 namespace Glom
 {
diff --git a/glom/import_csv/csv_parser.cc b/glom/import_csv/csv_parser.cc
index 971785d..d5c796b 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 9d18c71..6e05808 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 18d30b5..ae8ad11 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 926854e..17b056e 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 020c5cf..bd5d787 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 b5dcb35..42bb0f0 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -21,9 +21,13 @@
 #include <libglom/connectionpool_backends/postgres_self.h>
 #include <libglom/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 a79238a..51419a0 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 524149b..356a249 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
 {
diff --git a/glom/libglom/data_structure/layout/fieldformatting.h b/glom/libglom/data_structure/layout/fieldformatting.h
index 275896f..079ad57 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 2c9491a..961d734 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -27,6 +27,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>
 #include <iostream>
diff --git a/glom/libglom/document/bakery/document.cc b/glom/libglom/document/bakery/document.cc
index 08459f1..7938b07 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 37091ec..b14ba31 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 ef565af..f9c265f 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/test_avahi_publisher.cc b/glom/libglom/test_avahi_publisher.cc
index 8db0682..16ba771 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 2e69428..079d62f 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/main.cc b/glom/main.cc
index 8806c27..c4cc15a 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_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 9447ad0..52b9fe4 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 fea6bbd..c741d72 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -22,10 +22,17 @@
 #include "window_print_layout_edit.h"
 #include <glom/box_db_table.h>
 #include <glom/print_layout/canvas_layout_item.h>
+#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 2dbbc76..875c062 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/report_builder.cc b/glom/report_builder.cc
index 2a3a644..b747355 100644
--- a/glom/report_builder.cc
+++ b/glom/report_builder.cc
@@ -28,6 +28,9 @@
 #include <libglom/data_structure/layout/report_parts/layoutitem_footer.h>
 #include <libglom/db_utils.h>
 #include <glom/xsl_utils.h>
+#include <iostream>
+#include <glibmm/miscutils.h>
+#include <glibmm/i18n.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/canvas/canvas_editable.cc b/glom/utility_widgets/canvas/canvas_editable.cc
index c0b2e7b..0ca6c1b 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 f8a9ad7..f3c9e2e 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 e20fec3..1e0157f 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/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 4ddb776..aa9fae5 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -30,6 +30,9 @@
 #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
 
 namespace Glom
diff --git a/glom/utility_widgets/layouttoolbarbutton.cc b/glom/utility_widgets/layouttoolbarbutton.cc
index d8f374e..d7e4f16 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"
 
 namespace
diff --git a/glom/utility_widgets/layoutwidgetutils.cc b/glom/utility_widgets/layoutwidgetutils.cc
index a2b7e7a..f237aa5 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 78f7dba..b38b275 100644
--- a/glom/utility_widgets/test_flowtable.cc
+++ b/glom/utility_widgets/test_flowtable.cc
@@ -17,8 +17,12 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * 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"
 
 
diff --git a/glom/utility_widgets/test_flowtable_dnd.cc b/glom/utility_widgets/test_flowtable_dnd.cc
index 2c9114c..dd1d236 100644
--- a/glom/utility_widgets/test_flowtable_dnd.cc
+++ b/glom/utility_widgets/test_flowtable_dnd.cc
@@ -18,9 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include <gtkmm.h>
 #include "flowtable_dnd.h"
-
+#include <gtkmm/window.h>
 
 //#include "dragwindow.h"
 
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 4641198..70b22bb 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>
 
 #ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/note.h>
diff --git a/glom/variablesmap.h b/glom/variablesmap.h
index 9a1f3aa..66a3e2a 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 db89fe8..fef96c7 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 255128d..b98ba3a 100644
--- a/tests/import/test_parsing.cc
+++ b/tests/import/test_parsing.cc
@@ -1,7 +1,12 @@
 #include <gtkmm.h>
 #include <glom/import_csv/csv_parser.h>
 #include <tests/import/utils.h>
-//#include <glibmm/regex.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 ffd47d2..3bcda00 100644
--- a/tests/import/test_signals.cc
+++ b/tests/import/test_signals.cc
@@ -1,6 +1,9 @@
 #include <gtkmm.h>
 #include <glom/import_csv/csv_parser.h>
 #include <tests/import/utils.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 421511e..338d6b7 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/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 67aff02..63873f0 100644
--- a/tests/test_glade_derived_instantiation.cc
+++ b/tests/test_glade_derived_instantiation.cc
@@ -1,20 +1,23 @@
-#include <gtkmm.h>
-#include <gtksourceviewmm/init.h>
-#include <glom/glade_utils.h>
-#include <glom/application.h>
-#include <glom/dialog_existing_or_new.h>
-#include <glom/mode_design/print_layouts/box_print_layouts.h>
-#include <glom/mode_design/relationships_overview/dialog_relationships_overview.h>
-#include <glom/mode_design/dialog_relationships.h>
-#include <glom/mode_design/report_layout/dialog_layout_report.h>
-#include <glom/box_reports.h>
-#include <glom/navigation/box_tables.h>
-#include <glom/import_csv/dialog_import_csv.h>
-#include <glom/import_csv/dialog_import_csv_progress.h>
-#include <glom/mode_data/datawidget/dialog_choose_date.h>
-#include <glom/mode_data/datawidget/dialog_choose_id.h>
-#include <glom/utility_widgets/dialog_flowtable.h>
-#include <glom/utility_widgets/dialog_image_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>
@@ -52,6 +55,9 @@
 #include <glom/mode_design/print_layouts/dialog_text_formatting.h>
 #include <glom/dialog_progress_creating.h>
 #include <glom/dialog_invalid_data.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/main.h>
+#include <gtksourceviewmm/init.h>
 
 
 template<class T_Widget>
diff --git a/tests/test_selfhosting_new_empty.cc b/tests/test_selfhosting_new_empty.cc
index 8568c10..6e0f8c5 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()



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]