[glom] Keep utils.h out of headers.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] Keep utils.h out of headers.
Date: Thu, 17 Mar 2016 12:34:28 +0000 (UTC)
commit 6eaa69656787029b4f01c2ca5635e01a889d00a2
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Mar 16 16:35:05 2016 +0100

    Keep utils.h out of headers.

 glom/appwindow.cc                                  |    1 +
 glom/base_db.cc                                    |    1 +
 glom/base_db.h                                     |    1 -
 glom/base_db_table_data.cc                         |    1 +
 glom/box_withbuttons.cc                            |    1 +
 glom/filechooser_export.cc                         |    1 +
 glom/frame_glom.cc                                 |    1 +
 glom/frame_glom.h                                  |    1 -
 glom/import_csv/dialog_import_csv.cc               |    3 +-
 .../data_structure/layout/layoutitem_field.h       |   29 ------------------
 glom/libglom/document/bakery/view/view_composite.h |    3 +-
 glom/libglom/utils.h                               |   31 +++++++++++++++++++-
 glom/mode_data/box_data.cc                         |    1 +
 glom/mode_data/box_data_calendar_related.cc        |    1 +
 glom/mode_data/box_data_details.cc                 |    3 +-
 glom/mode_data/box_data_list_related.cc            |    1 +
 glom/mode_data/box_data_portal.cc                  |    1 +
 .../mode_data/datawidget/combo_as_radio_buttons.cc |    1 +
 .../datawidget/combochoiceswithtreemodel.cc        |    1 +
 glom/mode_data/datawidget/datawidget.cc            |    1 +
 glom/mode_data/datawidget/dialog_choose_id.cc      |    1 +
 glom/mode_data/db_adddel/db_adddel.cc              |    1 +
 glom/mode_data/db_adddel/db_adddel_withbuttons.cc  |    1 +
 glom/mode_data/flowtablewithfields.cc              |    1 +
 glom/mode_data/notebook_data.cc                    |    1 +
 glom/mode_design/box_db_table_relationships.cc     |    1 +
 glom/mode_design/dialog_add_related_table.cc       |    1 +
 glom/mode_design/fields/box_db_table_definition.cc |    1 +
 glom/mode_design/layout/dialog_layout_details.cc   |    1 +
 .../layout/layout_item_dialogs/box_formatting.cc   |    1 +
 .../layout/layout_item_dialogs/dialog_group_by.cc  |    1 +
 glom/mode_find/box_data_list_find.cc               |    1 +
 glom/print_layout/canvas_print_layout.cc           |    1 +
 glom/utility_widgets/imageglom.cc                  |    1 +
 glom/utils_ui.cc                                   |    1 +
 glom/window_boxholder.cc                           |    1 +
 tests/test_document_load_and_change.cc             |    1 +
 37 files changed, 64 insertions(+), 37 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 616422a..1977c1b 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -37,6 +37,7 @@
 #include <libglom/db_utils.h>
 #include <libglom/db_utils_export.h>
 #include <libglom/privs.h>
+#include <libglom/utils.h>
 #include <glom/python_embed/python_ui_callbacks.h>
 #include <glom/python_embed/glom_python.h>
 #include <libglom/spawn_with_feedback.h>
diff --git a/glom/base_db.cc b/glom/base_db.cc
index e176d79..8eef37c 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -26,6 +26,7 @@
 #include <libglom/standard_table_prefs_fields.h>
 #include <libglom/document/document.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
 #include <glom/mode_design/layout/dialog_choose_field.h>
 
 //#ifndef GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/base_db.h b/glom/base_db.h
index 6e85986..9249ff8 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -29,7 +29,6 @@
 #include <libglom/data_structure/foundset.h>
 #include <libglom/data_structure/privileges.h>
 #include <libglom/data_structure/system_prefs.h>
-#include <libglom/utils.h>
 #include <libglom/calcinprogress.h>
 #include <libglom/document/bakery/view/view.h>
 #include <glom/bakery/busy_cursor.h>
diff --git a/glom/base_db_table_data.cc b/glom/base_db_table_data.cc
index a4b5b73..1282523 100644
--- a/glom/base_db_table_data.cc
+++ b/glom/base_db_table_data.cc
@@ -25,6 +25,7 @@
 #include <glom/python_embed/glom_python.h>
 #include <glom/utils_ui.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 #include <sstream>
 #include <iostream>
 #include <glibmm/i18n.h>
diff --git a/glom/box_withbuttons.cc b/glom/box_withbuttons.cc
index 47fe9ac..b99d7e7 100644
--- a/glom/box_withbuttons.cc
+++ b/glom/box_withbuttons.cc
@@ -21,6 +21,7 @@
 #include <glom/box_withbuttons.h>
 #include <glom/appwindow.h> //AppWindow.
 #include <glom/utils_ui.h>
+#include <libglom/utils.h>
 #include <libglom/appstate.h>
 
 #include <sstream> //For stringstream
diff --git a/glom/filechooser_export.cc b/glom/filechooser_export.cc
index f27e600..aaabea5 100644
--- a/glom/filechooser_export.cc
+++ b/glom/filechooser_export.cc
@@ -22,6 +22,7 @@
 #include <glom/mode_design/layout/dialog_layout_export.h>
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
+#include <libglom/utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index d64e34f..502eb06 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -64,6 +64,7 @@
 
 #include <glom/filechooser_export.h>
 #include <libglom/privs.h>
+#include <libglom/utils.h>
 #include <libglom/db_utils.h>
 #include <libglom/db_utils_export.h>
 #include <sstream> //For stringstream.
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index 5fc72a6..543ff83 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -43,7 +43,6 @@
 
 #include "dialog_connection.h"
 #include <gtkmm/applicationwindow.h>
-#include <libglom/utils.h>
 
 #include "mode_data/box_data_list_related.h" //only for m_HackToFixLinkerError.
 
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index 11ab019..9bc80ac 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -21,9 +21,8 @@
 #include "dialog_import_csv.h"
 #include <glom/import_csv/file_encodings.h>
 #include <libglom/libglom_config.h>
-
+#include <libglom/utils.h>
 #include <libglom/data_structure/glomconversions.h>
-
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/cellrenderercombo.h>
 #include <glom/utils_ui.h>
diff --git a/glom/libglom/data_structure/layout/layoutitem_field.h 
b/glom/libglom/data_structure/layout/layoutitem_field.h
index 292152c..99f231b 100644
--- a/glom/libglom/data_structure/layout/layoutitem_field.h
+++ b/glom/libglom/data_structure/layout/layoutitem_field.h
@@ -27,7 +27,6 @@
 #include <libglom/data_structure/numeric_format.h>
 #include <libglom/data_structure/relationship.h>
 #include <libglom/data_structure/layout/custom_title.h>
-#include <libglom/algorithms_utils.h>
 
 namespace Glom
 {
@@ -159,34 +158,6 @@ private:
   std::shared_ptr<CustomTitle> m_title_custom; //translatable.
 };
 
-/**
- * Find the element in the container which is a LayoutItem_Field which refers 
- * to the same field, without comparing irrelevant stuff such as formatting.
- * This assumes that the element is a shared_ptr<>.
- */
-template
-<typename T_Container>
-bool find_if_layout_item_field_is_same_field_exists(T_Container& container, const std::shared_ptr<const 
LayoutItem_Field>& layout_item)
-{
-  return Utils::find_if_exists(container,
-    [&layout_item](const typename T_Container::value_type& element)
-    {
-      //Assume that element is a shared_ptr<>.
-
-      if(!layout_item && !element)
-        return true;
-
-      //Allow this to be used on a container of LayoutItems,
-      //as well as just of LayoutItem_Fields.
-      const auto element_field = std::dynamic_pointer_cast<const LayoutItem_Field>(element);
-      if(!element_field)
-        return false;
-
-      return layout_item && layout_item->is_same_field(element_field);
-    }
-  );
-}
-
 } //namespace Glom
 
 #endif //GLOM_DATASTRUCTURE_LAYOUTITEM_FIELD_H
diff --git a/glom/libglom/document/bakery/view/view_composite.h 
b/glom/libglom/document/bakery/view/view_composite.h
index eef45fd..3381b4b 100644
--- a/glom/libglom/document/bakery/view/view_composite.h
+++ b/glom/libglom/document/bakery/view/view_composite.h
@@ -20,7 +20,6 @@
 #define GLOM_BAKERY_VIEW_COMPOSITE_H
 
 #include <libglom/document/bakery/view/view.h>
-#include <libglom/algorithms_utils.h>
 #include <vector>
 #include <algorithm> //For std::find
 
@@ -55,7 +54,7 @@ public:
 
   virtual void remove_view(type_view* pView)
   {
-    auto iter = Glom::Utils::find(m_vecViews, pView);
+    auto iter = std::find(std::begin(m_vecViews), std::end(m_vecViews), pView);
     if(iter != m_vecViews.end())
       m_vecViews.erase(iter);
   }
diff --git a/glom/libglom/utils.h b/glom/libglom/utils.h
index 657ddb2..fe35caa 100644
--- a/glom/libglom/utils.h
+++ b/glom/libglom/utils.h
@@ -24,8 +24,8 @@
 #include <libglom/data_structure/field.h>
 #include <libglom/data_structure/numeric_format.h>
 #include <libglom/document/document.h>
-
 #include <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/algorithms_utils.h>
 
 #include <libgdamm/sqlexpr.h>
 #include <giomm/file.h>
@@ -265,6 +265,35 @@ to_utype(E enumerator) noexcept
   return static_cast<typename std::underlying_type<E>::type>(enumerator);
 }
 
+
+/**
+ * Find the element in the container which is a LayoutItem_Field which refers 
+ * to the same field, without comparing irrelevant stuff such as formatting.
+ * This assumes that the element is a shared_ptr<>.
+ */
+template
+<typename T_Container>
+bool find_if_layout_item_field_is_same_field_exists(T_Container& container, const std::shared_ptr<const 
LayoutItem_Field>& layout_item)
+{
+  return Utils::find_if_exists(container,
+    [&layout_item](const typename T_Container::value_type& element)
+    {
+      //Assume that element is a shared_ptr<>.
+
+      if(!layout_item && !element)
+        return true;
+
+      //Allow this to be used on a container of LayoutItems,
+      //as well as just of LayoutItem_Fields.
+      const auto element_field = std::dynamic_pointer_cast<const LayoutItem_Field>(element);
+      if(!element_field)
+        return false;
+
+      return layout_item && layout_item->is_same_field(element_field);
+    }
+  );
+}
+
 } //namespace Utils
 
 } //namespace Glom
diff --git a/glom/mode_data/box_data.cc b/glom/mode_data/box_data.cc
index a085e29..761114b 100644
--- a/glom/mode_data/box_data.cc
+++ b/glom/mode_data/box_data.cc
@@ -30,6 +30,7 @@
 #include <glom/python_embed/python_ui_callbacks.h>
 #include <glom/appwindow.h>
 #include <libglom/libglom_config.h>
+#include <libglom/utils.h>
 #include <iostream>
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index 0ad1a93..580ba20 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -23,6 +23,7 @@
 #include <glom/utils_ui.h>
 #include <glom/appwindow.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
 #include <libglom/db_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <glom/glade_utils.h>
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index 200cd9a..1e3cd5d 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -26,6 +26,7 @@
 #include <libglom/data_structure/relationship.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 #include <glom/mode_design/layout/dialog_layout_details.h>
 #include <glom/glade_utils.h>
 #include <glom/utils_ui.h>
@@ -306,7 +307,7 @@ bool Box_Data_Details::fill_from_database()
         bool index_primary_key_found = false;
         unsigned int index_primary_key = 0; //Arbitrary default.
         //g_warning("primary_key name = %s", m_field_primary_key->get_name().c_str());
-        if(!find_if_layout_item_field_is_same_field_exists(fieldsToGet, layout_item_pk))
+        if(!Utils::find_if_layout_item_field_is_same_field_exists(fieldsToGet, layout_item_pk))
         {
           fieldsToGet.emplace_back(layout_item_pk);
           index_primary_key = fieldsToGet.size() - 1;
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index 2f9f70c..665bbd4 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -24,6 +24,7 @@
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/db_utils.h>
 #include <libglom/privs.h>
+#include <libglom/utils.h>
 #include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <glom/utils_ui.h> //For bold_message()).
diff --git a/glom/mode_data/box_data_portal.cc b/glom/mode_data/box_data_portal.cc
index 6c095c8..0ad308b 100644
--- a/glom/mode_data/box_data_portal.cc
+++ b/glom/mode_data/box_data_portal.cc
@@ -21,6 +21,7 @@
 #include <glom/mode_data/box_data_portal.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 #include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <glom/utils_ui.h> //For bold_message()).
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.cc 
b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
index b676a3c..cb1de14 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.cc
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
@@ -24,6 +24,7 @@
 #include <glom/dialog_invalid_data.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/appwindow.h>
+#include <libglom/utils.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
 
diff --git a/glom/mode_data/datawidget/combochoiceswithtreemodel.cc 
b/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
index a60a018..b025e9a 100644
--- a/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
@@ -22,6 +22,7 @@
 #include <glom/mode_data/datawidget/treemodel_db_withextratext.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/privs.h>
+#include <libglom/utils.h>
 #include <glom/utils_ui.h>
 #include <glom/appwindow.h>
 #include <gtkmm/liststore.h>
diff --git a/glom/mode_data/datawidget/datawidget.cc b/glom/mode_data/datawidget/datawidget.cc
index c2debd3..7022e33 100644
--- a/glom/mode_data/datawidget/datawidget.cc
+++ b/glom/mode_data/datawidget/datawidget.cc
@@ -37,6 +37,7 @@
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_data/datawidget/dialog_choose_id.cc b/glom/mode_data/datawidget/dialog_choose_id.cc
index b24b4be..dfc5b4c 100644
--- a/glom/mode_data/datawidget/dialog_choose_id.cc
+++ b/glom/mode_data/datawidget/dialog_choose_id.cc
@@ -21,6 +21,7 @@
 #include "dialog_choose_id.h"
 #include <glom/utils_ui.h> //For bold_message()).
 #include <glom/appwindow.h>
+#include <libglom/utils.h>
 //#include <libgnome/gnome-i18n.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index 29d4f3a..9bbd113 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -26,6 +26,7 @@
 #include <glom/mode_data/datawidget/cellrenderer_dblist.h>
 #include "db_treeviewcolumn_glom.h"
 #include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
 #include <glom/dialog_invalid_data.h>
 #include <glom/appwindow.h>
 #include <glom/utils_ui.h> //For UiUtils::image_scale_keeping_ratio().
diff --git a/glom/mode_data/db_adddel/db_adddel_withbuttons.cc 
b/glom/mode_data/db_adddel/db_adddel_withbuttons.cc
index cb9e273..f3485cc 100644
--- a/glom/mode_data/db_adddel/db_adddel_withbuttons.cc
+++ b/glom/mode_data/db_adddel/db_adddel_withbuttons.cc
@@ -20,6 +20,7 @@
 
 #include "db_adddel_withbuttons.h"
 #include <glom/utils_ui.h>
+#include <libglom/utils.h>
 #include <gtkmm/buttonbox.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index feb3722..68cd3da 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -30,6 +30,7 @@
 #include <glom/appwindow.h>
 #include <gtkmm/checkbutton.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
 #include <glom/glade_utils.h>
 #include <glom/mode_data/box_data_list_related.h>
 #include <glom/mode_design/layout/dialog_choose_relationship.h>
diff --git a/glom/mode_data/notebook_data.cc b/glom/mode_data/notebook_data.cc
index cc6b345..46c36f2 100644
--- a/glom/mode_data/notebook_data.cc
+++ b/glom/mode_data/notebook_data.cc
@@ -21,6 +21,7 @@
 #include <glom/mode_data/notebook_data.h>
 #include <glom/signal_reemitter.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
 #include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_design/box_db_table_relationships.cc b/glom/mode_design/box_db_table_relationships.cc
index e9f1b74..7340aa7 100644
--- a/glom/mode_design/box_db_table_relationships.cc
+++ b/glom/mode_design/box_db_table_relationships.cc
@@ -22,6 +22,7 @@
 #include "box_db_table_relationships.h"
 #include <glom/appwindow.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 #include <algorithm>
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_design/dialog_add_related_table.cc b/glom/mode_design/dialog_add_related_table.cc
index 04f5a72..6455145 100644
--- a/glom/mode_design/dialog_add_related_table.cc
+++ b/glom/mode_design/dialog_add_related_table.cc
@@ -21,6 +21,7 @@
 #include "dialog_add_related_table.h"
 #include <glom/frame_glom.h> //For show_ok_dialog.h
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/fields/box_db_table_definition.cc 
b/glom/mode_design/fields/box_db_table_definition.cc
index 2dd7abd..8eb62df 100644
--- a/glom/mode_design/fields/box_db_table_definition.cc
+++ b/glom/mode_design/fields/box_db_table_definition.cc
@@ -25,6 +25,7 @@
 #include <glom/appwindow.h>
 #include <libglom/libglom_config.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/layout/dialog_layout_details.cc 
b/glom/mode_design/layout/dialog_layout_details.cc
index 0a8f085..db6c035 100644
--- a/glom/mode_design/layout/dialog_layout_details.cc
+++ b/glom/mode_design/layout/dialog_layout_details.cc
@@ -25,6 +25,7 @@
 #include <glom/frame_glom.h> //For show_ok_dialog()
 //#include <libgnome/gnome-i18n.h>
 #include <glom/utils_ui.h> //For bold_message()).
+#include <libglom/utils.h>
 #include <glom/appwindow.h>
 #include <glibmm/i18n.h>
 #include <sstream> //For stringstream
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc 
b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
index 6b7face..495b474 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
@@ -24,6 +24,7 @@
 #include <glom/glade_utils.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/mode_design/layout/layout_item_dialogs/dialog_fieldslist.h>
+#include <libglom/utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
index 02514c5..49448ea 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
@@ -21,6 +21,7 @@
 #include <glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h>
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
+#include <libglom/utils.h>
 #include <sstream> //For stringstream
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_find/box_data_list_find.cc b/glom/mode_find/box_data_list_find.cc
index 6d5ce00..f3dc30d 100644
--- a/glom/mode_find/box_data_list_find.cc
+++ b/glom/mode_find/box_data_list_find.cc
@@ -20,6 +20,7 @@
 
 #include <glom/mode_find/box_data_list_find.h>
 #include <glom/utils_ui.h>
+#include <libglom/utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index 654b722..16370b6 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -33,6 +33,7 @@
 #include <glom/appwindow.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/db_utils.h>
+#include <libglom/utils.h>
 
 #include <glom/glade_utils.h>
 #include <gtkmm/builder.h>
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 1aca071..53f1e15 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -27,6 +27,7 @@
 #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 <libglom/utils.h>
 #include <gtkmm/appchooserdialog.h>
 #include <gtkmm/filechooserdialog.h>
 #include <giomm/file.h>
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 5913bec..acc991b 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -22,6 +22,7 @@
 
 #include <glom/utils_ui.h>
 #include <glom/appwindow.h>
+#include <libglom/utils.h>
 #include <libglom/connectionpool.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
 #include <libglom/data_structure/glomconversions.h>
diff --git a/glom/window_boxholder.cc b/glom/window_boxholder.cc
index 71a4cca..7be307e 100644
--- a/glom/window_boxholder.cc
+++ b/glom/window_boxholder.cc
@@ -20,6 +20,7 @@
  
 #include <glom/window_boxholder.h>
 #include <glom/utils_ui.h>
+#include <libglom/utils.h>
 
 namespace Glom
 {
diff --git a/tests/test_document_load_and_change.cc b/tests/test_document_load_and_change.cc
index baa2166..a13138a 100644
--- a/tests/test_document_load_and_change.cc
+++ b/tests/test_document_load_and_change.cc
@@ -21,6 +21,7 @@
 #include "tests/test_utils.h"
 #include <libglom/document/document.h>
 #include <libglom/init.h>
+#include <libglom/utils.h>
 #include <giomm/file.h>
 #include <glibmm/convert.h>
 #include <glibmm/miscutils.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]