GNOME.org
 

[glom/glom-1-18] More includes fixes to fix the build.

commit cff71311ee0613da44e050b234d1674d1d3df87a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 27 11:17:39 2011 +0200

    More includes fixes to fix the build.

 ChangeLog                                          |    4 ++++
 glom/application.h                                 |    2 +-
 glom/libglom/connectionpool_backends/sqlite.cc     |    1 +
 glom/mode_data/box_data_details.cc                 |    1 -
 glom/mode_data/datawidget/combo.cc                 |    1 -
 .../datawidget/combochoiceswithtreemodel.h         |    2 +-
 glom/mode_data/datawidget/comboentry.h             |    2 ++
 glom/mode_data/placeholder-glom.h                  |   10 ++--------
 glom/mode_design/dialog_database_preferences.h     |    1 -
 glom/mode_design/fields/dialog_fielddefinition.h   |    1 +
 .../print_layouts/window_print_layout_edit.cc      |    3 +--
 glom/notebook_glom.h                               |    2 ++
 glom/print_layout/canvas_print_layout.h            |    1 +
 glom/utility_widgets/db_adddel/db_adddel.cc        |    1 -
 glom/utility_widgets/imageglom.cc                  |    3 ---
 glom/utility_widgets/imageglom.h                   |    2 --
 tests/test_glade_derived_instantiation.cc          |   19 +++++++++++++++++--
 tests/test_selfhosting_new_from_example.cc         |    2 ++
 18 files changed, 35 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 106e8a6..d87d135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-27  Murray Cumming  <murrayc murrayc com>
+
+	More includes fixes to fix the build.
+
 2011-10-26  Murray Cumming  <murrayc murrayc com>
 
 	Add and move #includes for the latest glibmm. 
diff --git a/glom/application.h b/glom/application.h
index 6fff983..e66a763 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -38,7 +38,7 @@
 #endif //GLOM_ENABLE_MAEMO
 
 #include <glom/frame_glom.h>
-#include <glom/infobar_progress_creating.h>
+#include <glom/dialog_progress_creating.h>
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/messagedialog.h>
 
diff --git a/glom/libglom/connectionpool_backends/sqlite.cc b/glom/libglom/connectionpool_backends/sqlite.cc
index 31d11e8..8ec0b4f 100644
--- a/glom/libglom/connectionpool_backends/sqlite.cc
+++ b/glom/libglom/connectionpool_backends/sqlite.cc
@@ -24,6 +24,7 @@
 
 #include <giomm/file.h>
 #include <libgdamm/metastore.h>
+#include <libgdamm/config.h>
 
 #include <iostream>
 
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index e814bff..8ee323f 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -32,7 +32,6 @@
 #include <glom/xsl_utils.h>
 #include <glom/python_embed/glom_python.h>
 
-#include <glom/print_layout/print_layout_utils.h>
 #include <glom/application.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/viewport.h>
diff --git a/glom/mode_data/datawidget/combo.cc b/glom/mode_data/datawidget/combo.cc
index 80e96a4..4d5f831 100644
--- a/glom/mode_data/datawidget/combo.cc
+++ b/glom/mode_data/datawidget/combo.cc
@@ -25,7 +25,6 @@
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glom/utils_ui.h>
-#include <gtkmm/cellareabox.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
 
diff --git a/glom/mode_data/datawidget/combochoiceswithtreemodel.h b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
index c13ff62..c41fecf 100644
--- a/glom/mode_data/datawidget/combochoiceswithtreemodel.h
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
@@ -23,7 +23,7 @@
 
 #include <glom/mode_data/datawidget/combochoices.h>
 #include <gtkmm/celllayout.h>
-#include <gtkmm/treemodel.h>
+#include <gtkmm/liststore.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/datawidget/comboentry.h b/glom/mode_data/datawidget/comboentry.h
index 01d2774..5eac376 100644
--- a/glom/mode_data/datawidget/comboentry.h
+++ b/glom/mode_data/datawidget/comboentry.h
@@ -25,6 +25,8 @@
 
 #include <glom/mode_data/datawidget/combochoiceswithtreemodel.h>
 
+#include <gtkmm/combobox.h>
+
 #ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/picker-button.h>
 #include <hildonmm/touch-selector-entry.h>
diff --git a/glom/mode_data/placeholder-glom.h b/glom/mode_data/placeholder-glom.h
index 5f9c55a..562a292 100644
--- a/glom/mode_data/placeholder-glom.h
+++ b/glom/mode_data/placeholder-glom.h
@@ -22,20 +22,14 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
-
-
-#ifndef GLOM_MODE_DATA_PLACEHOLDER_GLOM_H
-#define GLOM_MODE_DATA_PLACEHOLDER_GLOM_H
-
+#ifndef GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
+#define GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
 
 #include <gtkmm/widget.h>
 #include <glom/utility_widgets/layoutwidgetbase.h>
 //#include <libglom/data_structure/layout/layoutitem_button.h>
 //#include <gtkmm/builder.h>
 
-#ifndef GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
-#define GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
-
 namespace Glom
 {
 
diff --git a/glom/mode_design/dialog_database_preferences.h b/glom/mode_design/dialog_database_preferences.h
index f1ec443..6ebca83 100644
--- a/glom/mode_design/dialog_database_preferences.h
+++ b/glom/mode_design/dialog_database_preferences.h
@@ -29,7 +29,6 @@
 #include <gtksourceviewmm/sourceview.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
-#include <gtksourceviewmm/view.h>
 #include <glom/base_db.h>
 #include <libglom/data_structure/system_prefs.h>
 #include <libglom/connectionpool.h>
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h b/glom/mode_design/fields/dialog_fielddefinition.h
index dc2b874..3d1fd78 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -25,6 +25,7 @@
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/entry.h>
+#include <gtkmm/table.h>
 #include "../../utility_widgets/combo_textglade.h"
 #include <glom/mode_design/layout/combobox_relationship.h>
 #include "combo_fieldtype.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 c741d72..78684f8 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -24,11 +24,10 @@
 #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/table.h>
 #include <gtkmm/printoperation.h>
 #include <libglom/data_structure/layout/layoutitem_line.h>
 #include <libglom/data_structure/layout/layoutitem_portal.h>
diff --git a/glom/notebook_glom.h b/glom/notebook_glom.h
index a4edab5..5f4c4e7 100644
--- a/glom/notebook_glom.h
+++ b/glom/notebook_glom.h
@@ -22,6 +22,8 @@
 #define NOTEBOOK_GLOM_H
 
 #include <glom/box_withbuttons.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/window.h>
 #include <libglom/document/document.h>
 
 namespace Glom
diff --git a/glom/print_layout/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
index 34100a1..fb6f5b5 100644
--- a/glom/print_layout/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -28,6 +28,7 @@
 #include <gtkmm/uimanager.h>
 #include <gtkmm/toggleaction.h>
 #include <gtkmm/pagesetup.h>
+#include <goocanvasmm/table.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index b799d57..2ffa8aa 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -30,7 +30,6 @@
 #include "cellrenderer_buttonimage.h"
 #include "cellrenderer_buttontext.h"
 #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>
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index aa9fae5..42b6cbb 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -24,9 +24,6 @@
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
 #include <libglom/data_structure/glomconversions.h>
-#include <glom/utility_widgets/dialog_image_load_progress.h>
-#include <glom/utility_widgets/dialog_image_save_progress.h>
-#include <gtkmm/appchooserdialog.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/stock.h>
 #include <giomm.h>
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index d7065a6..e4f493a 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -30,8 +30,6 @@
 #include <gtkmm/builder.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/builder.h>
-#include <giomm/appinfo.h>
-#include <evince-view.h>
 
 namespace Glom
 {
diff --git a/tests/test_glade_derived_instantiation.cc b/tests/test_glade_derived_instantiation.cc
index 63873f0..6c60b9a 100644
--- a/tests/test_glade_derived_instantiation.cc
+++ b/tests/test_glade_derived_instantiation.cc
@@ -18,6 +18,23 @@
  * Boston, MA 02111-1307, USA.
  */
  
+#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>
 #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>
@@ -55,8 +72,6 @@
 #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>
 
 
diff --git a/tests/test_selfhosting_new_from_example.cc b/tests/test_selfhosting_new_from_example.cc
index a36bac6..4804164 100644
--- a/tests/test_selfhosting_new_from_example.cc
+++ b/tests/test_selfhosting_new_from_example.cc
@@ -25,6 +25,8 @@
 #include <libglom/privs.h>
 #include <libglom/db_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]