[gtksourceview] Include: gtksourceview-i18n.h -> glib/gi18n-lib.h where sufficient

From: Sébastien Wilmet <swilmet src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceview] Include: gtksourceview-i18n.h -> glib/gi18n-lib.h where sufficient
Date: Sat, 23 Sep 2017 11:16:18 +0000 (UTC)
commit 5e9f4deed7b345a87c2b25253ae3ca7a370a9965
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Sep 21 20:09:20 2017 +0200

    Include: gtksourceview-i18n.h -> glib/gi18n-lib.h where sufficient
    
    Or simply remove the #include where gettext is not used.
    
    See the previous commit that removes the ENABLE_NLS option. Now
    including glib/gi18n-lib.h is sufficient in most places, which is also
    more standard for a GNOME library, so it is easier for contributors.
    
    Also fix #include order where it was wrong, see:
    https://wiki.gnome.org/Projects/GTK%2B/BestPractices/GlibIncludes

 .../words/gtksourcecompletionwords.c               |    5 ++---
 gtksourceview/gtksourcebuffer.c                    |    1 -
 gtksourceview/gtksourcebufferoutputstream.c        |    4 ++--
 gtksourceview/gtksourcecompletion.c                |    2 +-
 gtksourceview/gtksourcecompletioncontext.c         |    1 -
 gtksourceview/gtksourcecompletioninfo.c            |    4 ++--
 gtksourceview/gtksourcecompletionitem.c            |    1 -
 gtksourceview/gtksourcecompletionmodel.c           |    2 +-
 gtksourceview/gtksourcecontextengine.c             |    2 +-
 gtksourceview/gtksourceencoding.c                  |    2 +-
 gtksourceview/gtksourcefile.c                      |    1 -
 gtksourceview/gtksourcefileloader.c                |    2 +-
 gtksourceview/gtksourcefilesaver.c                 |    2 +-
 gtksourceview/gtksourcegutter.c                    |    1 -
 gtksourceview/gtksourcegutterrenderer.c            |    1 -
 gtksourceview/gtksourcegutterrendererpixbuf.c      |    1 -
 gtksourceview/gtksourcegutterrenderertext.c        |    1 -
 gtksourceview/gtksourcelanguage-parser-2.c         |    2 +-
 gtksourceview/gtksourcelanguagemanager.c           |    1 -
 gtksourceview/gtksourcemark.c                      |    1 -
 gtksourceview/gtksourcemarkattributes.c            |    1 -
 gtksourceview/gtksourceprintcompositor.c           |    1 -
 gtksourceview/gtksourceregex.c                     |    4 ++--
 gtksourceview/gtksourcesearchcontext.c             |    4 +---
 gtksourceview/gtksourcesearchsettings.c            |    1 -
 gtksourceview/gtksourcestyle.c                     |    1 -
 gtksourceview/gtksourcestylescheme.c               |    6 +++---
 gtksourceview/gtksourcestyleschemechooserbutton.c  |    2 +-
 gtksourceview/gtksourcestyleschememanager.c        |    3 +--
 gtksourceview/gtksourceview.c                      |    3 +--
 30 files changed, 22 insertions(+), 41 deletions(-)
---
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c 
b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
index ac0a659..c2e1cfc 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
@@ -34,14 +34,13 @@
 #endif
 
 #include "gtksourcecompletionwords.h"
+#include <string.h>
+#include <glib/gi18n-lib.h>
 #include "gtksourcecompletionwordslibrary.h"
 #include "gtksourcecompletionwordsbuffer.h"
 #include "gtksourcecompletionwordsutils.h"
 #include "gtksourceview/gtksource.h"
 #include "gtksourceview/gtksourceview-enumtypes.h"
-#include "gtksourceview/gtksourceview-i18n.h"
-
-#include <string.h>
 
 #define BUFFER_KEY "GtkSourceCompletionWordsBufferKey"
 
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index 0cda084..6375a4e 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -44,7 +44,6 @@
 #include "gtksourcemarkssequence.h"
 #include "gtksourcesearchcontext.h"
 #include "gtksourcetag.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourceview-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcebufferoutputstream.c b/gtksourceview/gtksourcebufferoutputstream.c
index 3f51ea3..6b58609 100644
--- a/gtksourceview/gtksourcebufferoutputstream.c
+++ b/gtksourceview/gtksourcebufferoutputstream.c
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
+#include "gtksourcebufferoutputstream.h"
 #include <string.h>
 #include <errno.h>
-#include "gtksourcebufferoutputstream.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
 #include "gtksourceencoding.h"
 #include "gtksourcefileloader.h"
-#include "gtksourceview-i18n.h"
 
 /* NOTE: never use async methods on this stream, the stream is just
  * a wrapper around GtkTextBuffer api so that we can use GIO Stream
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index d1dbb52..a1b6287 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -102,6 +102,7 @@
 
 #include "gtksourcecompletion.h"
 #include "gtksourcecompletion-private.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourcecompletionmodel.h"
 #include "gtksourcecompletioncontext.h"
 #include "gtksourcecompletioninfo.h"
@@ -110,7 +111,6 @@
 #include "gtksourcecompletioncontainer.h"
 #include "gtksourcebuffer.h"
 #include "gtksourceview.h"
-#include "gtksourceview-i18n.h"
 
 enum
 {
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c
index b9c8dac..ed2006c 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -66,7 +66,6 @@
 #include "gtksourcecompletioncontext.h"
 #include "gtksourceview-enumtypes.h"
 #include "gtksourcecompletionprovider.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourcecompletion.h"
 
 struct _GtkSourceCompletionContextPrivate
diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c
index c625982..c1ae157 100644
--- a/gtksourceview/gtksourcecompletioninfo.c
+++ b/gtksourceview/gtksourcecompletioninfo.c
@@ -59,8 +59,8 @@
 #include <config.h>
 #endif
 
-#include <gtksourceview/gtksourcecompletioninfo.h>
-#include "gtksourceview-i18n.h"
+#include "gtksourcecompletioninfo.h"
+#include <glib/gi18n-lib.h>
 
 struct _GtkSourceCompletionInfoPrivate
 {
diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c
index 7ee1716..5825f81 100644
--- a/gtksourceview/gtksourcecompletionitem.c
+++ b/gtksourceview/gtksourcecompletionitem.c
@@ -34,7 +34,6 @@
 
 #include "gtksourcecompletionitem.h"
 #include "gtksourcecompletionproposal.h"
-#include "gtksourceview-i18n.h"
 
 struct _GtkSourceCompletionItemPrivate
 {
diff --git a/gtksourceview/gtksourcecompletionmodel.c b/gtksourceview/gtksourcecompletionmodel.c
index e2c715a..8b14b6b 100644
--- a/gtksourceview/gtksourcecompletionmodel.c
+++ b/gtksourceview/gtksourcecompletionmodel.c
@@ -24,9 +24,9 @@
 #endif
 
 #include "gtksourcecompletionmodel.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourcecompletionprovider.h"
 #include "gtksourcecompletionproposal.h"
-#include "gtksourceview-i18n.h"
 
 typedef struct
 {
diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c
index 0999880..91b05f1 100644
--- a/gtksourceview/gtksourcecontextengine.c
+++ b/gtksourceview/gtksourcecontextengine.c
@@ -26,7 +26,7 @@
 #include "gtksourcecontextengine.h"
 #include <string.h>
 #include <glib.h>
-#include "gtksourceview-i18n.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourceregion.h"
 #include "gtksourcelanguage.h"
 #include "gtksourcelanguage-private.h"
diff --git a/gtksourceview/gtksourceencoding.c b/gtksourceview/gtksourceencoding.c
index 8ea86ad..c8d2858 100644
--- a/gtksourceview/gtksourceencoding.c
+++ b/gtksourceview/gtksourceencoding.c
@@ -25,7 +25,7 @@
 
 #include "gtksourceencoding.h"
 #include "gtksourceencoding-private.h"
-#include "gtksourceview-i18n.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * SECTION:encoding
diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c
index 7225917..cca8829 100644
--- a/gtksourceview/gtksourcefile.c
+++ b/gtksourceview/gtksourcefile.c
@@ -25,7 +25,6 @@
 #include "gtksourcefile.h"
 #include "gtksourceencoding.h"
 #include "gtksourceview-enumtypes.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:file
diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c
index fd1b4fc..fd36538 100644
--- a/gtksourceview/gtksourcefileloader.c
+++ b/gtksourceview/gtksourcefileloader.c
@@ -26,13 +26,13 @@
 #endif
 
 #include "gtksourcefileloader.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourcebuffer.h"
 #include "gtksourcefile.h"
 #include "gtksourcebufferoutputstream.h"
 #include "gtksourceencoding.h"
 #include "gtksourceencoding-private.h"
 #include "gtksourceview-enumtypes.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:fileloader
diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c
index 56fdf33..de958fd 100644
--- a/gtksourceview/gtksourcefilesaver.c
+++ b/gtksourceview/gtksourcefilesaver.c
@@ -26,13 +26,13 @@
 #endif
 
 #include "gtksourcefilesaver.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourcefile.h"
 #include "gtksourcebufferinputstream.h"
 #include "gtksourceencoding.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
 #include "gtksourceview-enumtypes.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:filesaver
diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c
index 2aeeb02..7f13947 100644
--- a/gtksourceview/gtksourcegutter.c
+++ b/gtksourceview/gtksourcegutter.c
@@ -25,7 +25,6 @@
 #include "gtksourcegutter.h"
 #include "gtksourcegutter-private.h"
 #include "gtksourceview.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourcegutterrenderer.h"
 #include "gtksourcegutterrenderer-private.h"
 
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index 775a9b8..35ffed8 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -26,7 +26,6 @@
 #include "gtksourcegutterrenderer-private.h"
 #include "gtksourcestylescheme.h"
 #include "gtksourceview-enumtypes.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:gutterrenderer
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c
index e8d4bc4..2b52bf4 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.c
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.c
@@ -23,7 +23,6 @@
 #endif
 
 #include "gtksourcegutterrendererpixbuf.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourcepixbufhelper.h"
 
 /**
diff --git a/gtksourceview/gtksourcegutterrenderertext.c b/gtksourceview/gtksourcegutterrenderertext.c
index d3ead75..5f06b59 100644
--- a/gtksourceview/gtksourcegutterrenderertext.c
+++ b/gtksourceview/gtksourcegutterrenderertext.c
@@ -23,7 +23,6 @@
 #endif
 
 #include "gtksourcegutterrenderertext.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:gutterrenderertext
diff --git a/gtksourceview/gtksourcelanguage-parser-2.c b/gtksourceview/gtksourcelanguage-parser-2.c
index 77f8f7a..55a9117 100644
--- a/gtksourceview/gtksourcelanguage-parser-2.c
+++ b/gtksourceview/gtksourcelanguage-parser-2.c
@@ -32,7 +32,6 @@
 #include <config.h>
 #endif
 
-#include "gtksourceview-i18n.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcelanguage.h"
 #include "gtksourcelanguage-private.h"
@@ -40,6 +39,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <fcntl.h>
diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c
index 5236985..cac37c5 100644
--- a/gtksourceview/gtksourcelanguagemanager.c
+++ b/gtksourceview/gtksourcelanguagemanager.c
@@ -30,7 +30,6 @@
 #include "gtksourcelanguage.h"
 #include "gtksourcelanguage-private.h"
 #include "gtksourceview-utils.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:languagemanager
diff --git a/gtksourceview/gtksourcemark.c b/gtksourceview/gtksourcemark.c
index 3ca6559..b6b6c46 100644
--- a/gtksourceview/gtksourcemark.c
+++ b/gtksourceview/gtksourcemark.c
@@ -25,7 +25,6 @@
 #include "gtksourcemark.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:mark
diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c
index 62486d7..b3cbb95 100644
--- a/gtksourceview/gtksourcemarkattributes.c
+++ b/gtksourceview/gtksourcemarkattributes.c
@@ -25,7 +25,6 @@
 
 #include "gtksourcemarkattributes.h"
 #include "gtksourcemark.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourcepixbufhelper.h"
 
 /**
diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtksourceprintcompositor.c
index 1abcc50..712407e 100644
--- a/gtksourceview/gtksourceprintcompositor.c
+++ b/gtksourceview/gtksourceprintcompositor.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "gtksourceview-i18n.h"
 #include "gtksourceprintcompositor.h"
 #include "gtksourceview.h"
 #include "gtksourcebuffer.h"
diff --git a/gtksourceview/gtksourceregex.c b/gtksourceview/gtksourceregex.c
index fb523a5..49ab8b2 100644
--- a/gtksourceview/gtksourceregex.c
+++ b/gtksourceview/gtksourceregex.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 
+#include "gtksourceregex.h"
 #include <string.h>
 #include <glib.h>
-#include "gtksourceview-i18n.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourceview-utils.h"
-#include "gtksourceregex.h"
 
 /*
  * GRegex wrapper which adds a few features needed for syntax highlighting,
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index 59936a6..67d62af 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "gtksourcesearchcontext.h"
+#include <string.h>
 #include "gtksourcesearchsettings.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
@@ -32,11 +33,8 @@
 #include "gtksourceutils.h"
 #include "gtksourceregion.h"
 #include "gtksourceiter.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourceview-enumtypes.h"
 
-#include <string.h>
-
 /**
  * SECTION:searchcontext
  * @Short_description: Search context
diff --git a/gtksourceview/gtksourcesearchsettings.c b/gtksourceview/gtksourcesearchsettings.c
index 8f537f6..23b1cdd 100644
--- a/gtksourceview/gtksourcesearchsettings.c
+++ b/gtksourceview/gtksourcesearchsettings.c
@@ -23,7 +23,6 @@
 #endif
 
 #include "gtksourcesearchsettings.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:searchsettings
diff --git a/gtksourceview/gtksourcestyle.c b/gtksourceview/gtksourcestyle.c
index 87b875b..45f0dd8 100644
--- a/gtksourceview/gtksourcestyle.c
+++ b/gtksourceview/gtksourcestyle.c
@@ -24,7 +24,6 @@
 
 #include "gtksourcestyle.h"
 #include "gtksourcestyle-private.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:style
diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
index 0f6d9e9..5d1f23c 100644
--- a/gtksourceview/gtksourcestylescheme.c
+++ b/gtksourceview/gtksourcestylescheme.c
@@ -23,14 +23,14 @@
 #endif
 
 #include "gtksourcestylescheme.h"
+#include <libxml/parser.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
 #include "gtksourcestyleschememanager.h"
 #include "gtksourcestyle.h"
 #include "gtksourcestyle-private.h"
 #include "gtksourceview.h"
 #include "gtksourcelanguage-private.h"
-#include "gtksourceview-i18n.h"
-#include <libxml/parser.h>
-#include <string.h>
 
 /**
  * SECTION:stylescheme
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.c 
b/gtksourceview/gtksourcestyleschemechooserbutton.c
index 2685c42..009cea3 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.c
+++ b/gtksourceview/gtksourcestyleschemechooserbutton.c
@@ -24,10 +24,10 @@
 #endif
 
 #include "gtksourcestyleschemechooserbutton.h"
+#include <glib/gi18n-lib.h>
 #include "gtksourcestyleschemechooser.h"
 #include "gtksourcestyleschemechooserwidget.h"
 #include "gtksourcestylescheme.h"
-#include "gtksourceview-i18n.h"
 
 /**
  * SECTION:styleschemechooserbutton
diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c
index 0859cf7..3282d70 100644
--- a/gtksourceview/gtksourcestyleschememanager.c
+++ b/gtksourceview/gtksourcestyleschememanager.c
@@ -23,10 +23,9 @@
 #endif
 
 #include "gtksourcestyleschememanager.h"
+#include <string.h>
 #include "gtksourcestylescheme.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourceview-utils.h"
-#include <string.h>
 
 /**
  * SECTION:styleschememanager
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 005529a..bb3470d 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -28,15 +28,14 @@
 #include "gtksourceview.h"
 
 #include <string.h> /* For strlen */
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <pango/pango-tabs.h>
+#include <glib/gi18n-lib.h>
 
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
 #include "gtksourcebufferinternal.h"
-#include "gtksourceview-i18n.h"
 #include "gtksourceview-enumtypes.h"
 #include "gtksourcemark.h"
 #include "gtksourcemarkattributes.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]