GNOME.org
 

[glom] Use i18n-lib.h in libglom and i18n.h in glom.

commit 014067fe51d7c73db17d41321325481b8f3dc2c6
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Mar 19 22:09:05 2016 +0100

    Use i18n-lib.h in libglom and i18n.h in glom.

 glom/bakery/appwindow_withdoc.cc                   |    2 +-
 glom/bakery/dialog_offersave.cc                    |    2 +-
 glom/box_withbuttons.cc                            |    2 +-
 glom/libglom/connectionpool_backends/mysql_self.cc |    2 +-
 glom/libglom/data_structure/field.cc               |    2 +-
 glom/libglom/data_structure/glomconversions.cc     |    2 +-
 glom/libglom/data_structure/layout/layoutgroup.cc  |    3 ++-
 .../data_structure/layout/layoutitem_button.cc     |    3 ++-
 .../layout/layoutitem_calendarportal.cc            |    3 ++-
 .../data_structure/layout/layoutitem_field.cc      |    3 ++-
 .../data_structure/layout/layoutitem_image.cc      |    2 +-
 .../data_structure/layout/layoutitem_line.cc       |    2 +-
 .../data_structure/layout/layoutitem_notebook.cc   |    3 ++-
 .../layout/layoutitem_placeholder.cc               |    3 ++-
 .../data_structure/layout/layoutitem_portal.cc     |    2 +-
 .../data_structure/layout/layoutitem_text.cc       |    3 ++-
 .../layout/report_parts/layoutitem_fieldsummary.cc |    5 +++--
 .../layout/report_parts/layoutitem_footer.cc       |    5 +++--
 .../layout/report_parts/layoutitem_groupby.cc      |    5 +++--
 .../layout/report_parts/layoutitem_header.cc       |    5 +++--
 .../layout/report_parts/layoutitem_summary.cc      |    5 +++--
 .../report_parts/layoutitem_verticalgroup.cc       |    5 +++--
 glom/libglom/data_structure/translatable_item.cc   |    2 +-
 glom/libglom/db_utils.cc                           |    2 +-
 glom/libglom/document/document.cc                  |    2 +-
 glom/libglom/report_builder.cc                     |    2 +-
 glom/libglom/translations_po.cc                    |    2 +-
 27 files changed, 46 insertions(+), 33 deletions(-)
---
diff --git a/glom/bakery/appwindow_withdoc.cc b/glom/bakery/appwindow_withdoc.cc
index d42ab66..414ef21 100644
--- a/glom/bakery/appwindow_withdoc.cc
+++ b/glom/bakery/appwindow_withdoc.cc
@@ -22,7 +22,7 @@
 #include <libglom/algorithms_utils.h>
 #include <libglom/utils.h>
 #include <giomm/file.h>
-#include <glibmm/i18n-lib.h>
+#include <glibmm/i18n.h>
 
 namespace GlomBakery
 {
diff --git a/glom/bakery/dialog_offersave.cc b/glom/bakery/dialog_offersave.cc
index ff41742..f746c9d 100644
--- a/glom/bakery/dialog_offersave.cc
+++ b/glom/bakery/dialog_offersave.cc
@@ -22,7 +22,7 @@
 #include <glom/appwindow.h>
 #include <libglom/utils.h>
 #include <glibmm/convert.h> 
-#include <glibmm/i18n-lib.h>
+#include <glibmm/i18n.h>
 
 namespace
 {
diff --git a/glom/box_withbuttons.cc b/glom/box_withbuttons.cc
index b99d7e7..7de4648 100644
--- a/glom/box_withbuttons.cc
+++ b/glom/box_withbuttons.cc
@@ -26,7 +26,7 @@
 
 #include <sstream> //For stringstream
 
-#include <glibmm/i18n-lib.h>
+#include <glibmm/i18n.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/connectionpool_backends/mysql_self.cc 
b/glom/libglom/connectionpool_backends/mysql_self.cc
index becd783..7fbf260 100644
--- a/glom/libglom/connectionpool_backends/mysql_self.cc
+++ b/glom/libglom/connectionpool_backends/mysql_self.cc
@@ -30,7 +30,7 @@
 #include <glibmm/timer.h>
 #include <glibmm/main.h>
 #include <glibmm/shell.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 #include <iostream>
 
 #ifdef G_OS_WIN32
diff --git a/glom/libglom/data_structure/field.cc b/glom/libglom/data_structure/field.cc
index ec04ed1..a387633 100644
--- a/glom/libglom/data_structure/field.cc
+++ b/glom/libglom/data_structure/field.cc
@@ -25,7 +25,7 @@
 #include <libglom/utils.h>
 #include <libglom/string_utils.h>
 #include <libgda/gda-blob-op.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 #include <iostream>
 
diff --git a/glom/libglom/data_structure/glomconversions.cc b/glom/libglom/data_structure/glomconversions.cc
index d5d7784..c8b8b6b 100644
--- a/glom/libglom/data_structure/glomconversions.cc
+++ b/glom/libglom/data_structure/glomconversions.cc
@@ -34,7 +34,7 @@
 #include <iomanip>
 #include <string.h> // for strlen, memset, strcmp
 
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutgroup.cc 
b/glom/libglom/data_structure/layout/layoutgroup.cc
index 183d1e7..4dd202a 100644
--- a/glom/libglom/data_structure/layout/layoutgroup.cc
+++ b/glom/libglom/data_structure/layout/layoutgroup.cc
@@ -18,9 +18,10 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutgroup.h>
 #include <libglom/algorithms_utils.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 #include <iostream> 
 
 namespace Glom
diff --git a/glom/libglom/data_structure/layout/layoutitem_button.cc 
b/glom/libglom/data_structure/layout/layoutitem_button.cc
index 4947094..85969a3 100644
--- a/glom/libglom/data_structure/layout/layoutitem_button.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_button.cc
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutitem_button.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc 
b/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc
index d67d1bf..cb6a29b 100644
--- a/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_field.cc 
b/glom/libglom/data_structure/layout/layoutitem_field.cc
index b655e54..60a462e 100644
--- a/glom/libglom/data_structure/layout/layoutitem_field.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_field.cc
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutitem_field.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_image.cc 
b/glom/libglom/data_structure/layout/layoutitem_image.cc
index d3965f0..5ba02b7 100644
--- a/glom/libglom/data_structure/layout/layoutitem_image.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_image.cc
@@ -21,7 +21,7 @@
 #include <libglom/data_structure/layout/layoutitem_image.h>
 #include <libglom/utils.h>
 #include <libglom/file_utils.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_line.cc 
b/glom/libglom/data_structure/layout/layoutitem_line.cc
index 9a97bf8..0e5c410 100644
--- a/glom/libglom/data_structure/layout/layoutitem_line.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_line.cc
@@ -20,7 +20,7 @@
 
 #include <libglom/data_structure/layout/layoutitem_line.h>
 #include <libglom/utils.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_notebook.cc 
b/glom/libglom/data_structure/layout/layoutitem_notebook.cc
index ee32a45..ad1eee9 100644
--- a/glom/libglom/data_structure/layout/layoutitem_notebook.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_notebook.cc
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutitem_notebook.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_placeholder.cc 
b/glom/libglom/data_structure/layout/layoutitem_placeholder.cc
index 12994c1..bf3bfca 100644
--- a/glom/libglom/data_structure/layout/layoutitem_placeholder.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_placeholder.cc
@@ -22,8 +22,9 @@
  *   Boston, MA  02110-1301, USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutitem_placeholder.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_portal.cc 
b/glom/libglom/data_structure/layout/layoutitem_portal.cc
index 38ff28a..f15587b 100644
--- a/glom/libglom/data_structure/layout/layoutitem_portal.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_portal.cc
@@ -21,7 +21,7 @@
 #include <libglom/data_structure/layout/layoutitem_portal.h>
 #include <libglom/document/document.h> //For the utility functions.
 #include <iostream>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/layoutitem_text.cc 
b/glom/libglom/data_structure/layout/layoutitem_text.cc
index 016d4e6..a72930a 100644
--- a/glom/libglom/data_structure/layout/layoutitem_text.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_text.cc
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/layoutitem_text.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc 
b/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
index 8d2ed1a..e0fe509 100644
--- a/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
+++ b/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
@@ -17,9 +17,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  */
- 
+
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc 
b/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc
index c24436c..6d32142 100644
--- a/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc
+++ b/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc
@@ -17,9 +17,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  */
- 
+
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_footer.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc 
b/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc
index 9302fc4..45ed61b 100644
--- a/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc
+++ b/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc
@@ -17,9 +17,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  */
- 
+
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_groupby.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc 
b/glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc
index 83d22f0..361a598 100644
--- a/glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc
+++ b/glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc
@@ -17,9 +17,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  */
- 
+
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_header.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc 
b/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc
index 7031747..b90b8c6 100644
--- a/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc
+++ b/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc
@@ -17,9 +17,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  */
- 
+
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc 
b/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc
index c48d1e1..606d82d 100644
--- a/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc
+++ b/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc
@@ -17,9 +17,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  */
- 
+
+#include <libglom/libglom_config.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/data_structure/translatable_item.cc 
b/glom/libglom/data_structure/translatable_item.cc
index b43f834..72ab2d7 100644
--- a/glom/libglom/data_structure/translatable_item.cc
+++ b/glom/libglom/data_structure/translatable_item.cc
@@ -20,7 +20,7 @@
 
 #include <libglom/data_structure/translatable_item.h>
 #include <libglom/utils.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 #include <iostream>
 
 namespace Glom
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index 4d1bf96..1f66411 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -32,7 +32,7 @@
 #include <glibmm/timer.h>
 #include <libgda/libgda.h> // For gda_g_type_from_string
 #include "string_utils.h"
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 
 #include <iostream>
diff --git a/glom/libglom/document/document.cc b/glom/libglom/document/document.cc
index 9590304..8749655 100644
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@ -48,7 +48,7 @@
 #include <archive.h>
 #include <archive_entry.h>
 
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 #include <iostream>
 
 namespace Glom
diff --git a/glom/libglom/report_builder.cc b/glom/libglom/report_builder.cc
index 8e971b9..657d292 100644
--- a/glom/libglom/report_builder.cc
+++ b/glom/libglom/report_builder.cc
@@ -28,7 +28,7 @@
 #include <libglom/xml_utils.h>
 #include <iostream>
 #include <glibmm/miscutils.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 namespace Glom
 {
diff --git a/glom/libglom/translations_po.cc b/glom/libglom/translations_po.cc
index c9a106f..880eae6 100644
--- a/glom/libglom/translations_po.cc
+++ b/glom/libglom/translations_po.cc
@@ -27,7 +27,7 @@
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/datetime.h>
-#include <glibmm/i18n.h>
+#include <glibmm/i18n-lib.h>
 
 #include <iostream>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]