[glom] Add and move #includes for the latest glibmm.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] Add and move #includes for the latest glibmm.
Date: Wed, 26 Oct 2011 21:04:19 +0000 (UTC)
commit 6e78d9b23daa9be5b14fe2a0dfa1320fec7ad688
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 26 23:04:00 2011 +0200

    Add and move #includes for the latest glibmm.
    
    	* glom/import_csv/csv_parser.cc:
    	* glom/import_csv/dialog_import_csv_progress.cc:
    	* glom/libglom/connectionpool.cc:
    	* glom/libglom/connectionpool_backends/postgres_self.cc:
    	* glom/libglom/privs.cc:
    	* glom/libglom/spawn_with_feedback.cc:
    	* glom/mode_data/box_data_list.cc:
    	* glom/mode_data/box_data_list_related.cc:
    	* glom/mode_data/db_adddel/db_adddel.cc:
    	* glom/mode_data/notebook_data.cc:
    	* glom/mode_design/print_layouts/window_print_layout_edit.h:
    	* glom/utility_widgets/dialog_image_load_progress.cc:
    	* glom/utility_widgets/dialog_image_save_progress.cc:
    	* glom/utils_ui.cc:
    	* tests/import/utils.cc: Add individual glibmm includes now that
    	gmmproc does not include glibmm.h from headers.
    	Always include glibmm/thread.h first to avoid deprecation warnings.

 ChangeLog                                          |   22 ++++++++++++++++++++
 glom/import_csv/csv_parser.cc                      |    1 +
 glom/import_csv/dialog_import_csv_progress.cc      |    1 +
 glom/libglom/connectionpool.cc                     |    2 +
 .../connectionpool_backends/postgres_self.cc       |    1 +
 glom/libglom/privs.cc                              |    1 +
 glom/libglom/spawn_with_feedback.cc                |    2 +-
 glom/mode_data/box_data_list.cc                    |    1 +
 glom/mode_data/box_data_list_related.cc            |    1 +
 glom/mode_data/db_adddel/db_adddel.cc              |    1 +
 glom/mode_data/notebook_data.cc                    |    1 +
 .../print_layouts/window_print_layout_edit.h       |    1 +
 glom/utility_widgets/dialog_image_load_progress.cc |    1 +
 glom/utility_widgets/dialog_image_save_progress.cc |    1 +
 glom/utils_ui.cc                                   |    2 +-
 tests/import/utils.cc                              |    1 +
 16 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0f2f930..8ae5982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2011-10-26  Murray Cumming  <murrayc murrayc com>
 
+	Add and move #includes for the latest glibmm. 
+
+	* glom/import_csv/csv_parser.cc:
+	* glom/import_csv/dialog_import_csv_progress.cc:
+	* glom/libglom/connectionpool.cc:
+	* glom/libglom/connectionpool_backends/postgres_self.cc:
+	* glom/libglom/privs.cc:
+	* glom/libglom/spawn_with_feedback.cc:
+	* glom/mode_data/box_data_list.cc:
+	* glom/mode_data/box_data_list_related.cc:
+	* glom/mode_data/db_adddel/db_adddel.cc:
+	* glom/mode_data/notebook_data.cc:
+	* glom/mode_design/print_layouts/window_print_layout_edit.h:
+	* glom/utility_widgets/dialog_image_load_progress.cc:
+	* glom/utility_widgets/dialog_image_save_progress.cc:
+	* glom/utils_ui.cc:
+	* tests/import/utils.cc: Add individual glibmm includes now that 
+	gmmproc does not include glibmm.h from headers.
+	Always include glibmm/thread.h first to avoid deprecation warnings.
+
+2011-10-26  Murray Cumming  <murrayc murrayc com>
+
 	Adapt to the latest goocanvasmm API.
 
 	* glom/main.cc: Pass no arguments to init(), though I think I will 
diff --git a/glom/import_csv/csv_parser.cc b/glom/import_csv/csv_parser.cc
index 56242ff..9952ac1 100644
--- a/glom/import_csv/csv_parser.cc
+++ b/glom/import_csv/csv_parser.cc
@@ -21,6 +21,7 @@
 
 #include "csv_parser.h"
 #include <glibmm/convert.h>
+#include <glibmm/main.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 b23f354..4529cfa 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -25,6 +25,7 @@
 
 #include <libglom/data_structure/glomconversions.h>
 #include <glibmm/convert.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index 00631c5..0685c54 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -29,6 +29,8 @@
 #include <libglom/connectionpool_backends/postgres_self.h>
 #include <libglom/connectionpool_backends/sqlite.h>
 
+#include <glibmm/main.h>
+
 #ifdef G_OS_WIN32
 # include <windows.h>
 #else
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 397167c..a9a4fd7 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -30,6 +30,7 @@
 #include <glibmm/miscutils.h>
 #include <glibmm/stringutils.h>
 #include <glibmm/regex.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <libglom/gst-package.h>
diff --git a/glom/libglom/privs.cc b/glom/libglom/privs.cc
index bdb77ac..aec2cfc 100644
--- a/glom/libglom/privs.cc
+++ b/glom/libglom/privs.cc
@@ -23,6 +23,7 @@
 #include <libglom/db_utils.h>
 #include <libglom/utils.h>
 //#include <glom/application.h>
+#include <glibmm/main.h>
 
 #include <iostream>
 
diff --git a/glom/libglom/spawn_with_feedback.cc b/glom/libglom/spawn_with_feedback.cc
index ddc66e1..5cfe128 100644
--- a/glom/libglom/spawn_with_feedback.cc
+++ b/glom/libglom/spawn_with_feedback.cc
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <glibmm/thread.h>
 #include <libglom/spawn_with_feedback.h>
 #include <glibmm/main.h>
 #include <glibmm/spawn.h>
-#include <glibmm/thread.h>
 #include <glibmm/iochannel.h>
 #include <glibmm/shell.h>
 #include <glibmm/fileutils.h>
diff --git a/glom/mode_data/box_data_list.cc b/glom/mode_data/box_data_list.cc
index 6b17f09..736296a 100644
--- a/glom/mode_data/box_data_list.cc
+++ b/glom/mode_data/box_data_list.cc
@@ -26,6 +26,7 @@
 #include <libglom/db_utils.h>
 #include <libglom/utils.h> //For bold_message()).
 #include <sstream> //For stringstream
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index 3b0ca58..454bdbd 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -25,6 +25,7 @@
 #include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <glom/utils_ui.h> //For bold_message()).
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index 649881b..bd7c621 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -32,6 +32,7 @@
 #include <glom/utils_ui.h> //For Utils::image_scale_keeping_ratio().
 #include <glom/mode_data/datawidget/cellcreation.h>
 #include <gtkmm/stock.h>
+#include <glibmm/main.h>
 #include <libglom/db_utils.h>
 
 #include <iostream> //For debug output.
diff --git a/glom/mode_data/notebook_data.cc b/glom/mode_data/notebook_data.cc
index db5a08b..2c71cda 100644
--- a/glom/mode_data/notebook_data.cc
+++ b/glom/mode_data/notebook_data.cc
@@ -20,6 +20,7 @@
 
 #include <glom/mode_data/notebook_data.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.h b/glom/mode_design/print_layouts/window_print_layout_edit.h
index ca3de9d..94c6557 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -34,6 +34,7 @@
 #include <glom/utility_widgets/gimpruler/gimpruler.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/spinbutton.h>
+#include <gtkmm/button.h>
 #include <gtkmm/builder.h>
 
 namespace Glom
diff --git a/glom/utility_widgets/dialog_image_load_progress.cc b/glom/utility_widgets/dialog_image_load_progress.cc
index 892196e..ddd188a 100644
--- a/glom/utility_widgets/dialog_image_load_progress.cc
+++ b/glom/utility_widgets/dialog_image_load_progress.cc
@@ -21,6 +21,7 @@
 #include "dialog_image_load_progress.h"
 
 #include <gtkmm/messagedialog.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 namespace
diff --git a/glom/utility_widgets/dialog_image_save_progress.cc b/glom/utility_widgets/dialog_image_save_progress.cc
index 245f0d7..6bca24f 100644
--- a/glom/utility_widgets/dialog_image_save_progress.cc
+++ b/glom/utility_widgets/dialog_image_save_progress.cc
@@ -21,6 +21,7 @@
 #include "dialog_image_save_progress.h"
 
 #include <gtkmm/messagedialog.h>
+#include <glibmm/main.h>
 #include <iostream>
 #include <glibmm/i18n.h>
 
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 9c04287..b279e73 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -36,7 +36,7 @@
 #include <glibmm/fileutils.h>
 
 #include <giomm/file.h>
-
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <string.h> // for strchr
diff --git a/tests/import/utils.cc b/tests/import/utils.cc
index 35afa19..e24020d 100644
--- a/tests/import/utils.cc
+++ b/tests/import/utils.cc
@@ -1,6 +1,7 @@
 #include <tests/import/utils.h>
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/main.h>
 
 namespace ImportTests
 {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]