[gtksourceview/wip/chergert/gsv-gtk4] build: use relative includes when possible

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceview/wip/chergert/gsv-gtk4] build: use relative includes when possible
Date: Thu, 9 Jan 2020 22:26:15 +0000 (UTC)
commit e0dba764e5e0eb3a37cd34cf1920c52e30371f9c
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 9 14:25:43 2020 -0800

    build: use relative includes when possible

 .../words/gtksourcecompletionwords.h               |  3 +-
 .../gtksourcecompletionwordsproposal-private.h     |  9 +--
 gtksourceview/gtksource.h                          | 80 +++++++++++-----------
 gtksourceview/gtksourcebuffer.h                    |  3 +-
 gtksourceview/gtksourcecompletion-private.h        |  3 +-
 gtksourceview/gtksourcecompletion.h                |  3 +-
 gtksourceview/gtksourcecompletioncontext.h         |  3 +-
 gtksourceview/gtksourcecompletioninfo.h            |  3 +-
 gtksourceview/gtksourcecompletionitem.h            |  3 +-
 gtksourceview/gtksourcecompletionproposal.h        |  3 +-
 gtksourceview/gtksourcecompletionprovider.h        |  5 +-
 gtksourceview/gtksourceencoding.h                  |  3 +-
 gtksourceview/gtksourcefile.h                      |  3 +-
 gtksourceview/gtksourcefileloader.h                |  5 +-
 gtksourceview/gtksourcefilesaver.h                 |  5 +-
 gtksourceview/gtksourcegutter.h                    |  3 +-
 gtksourceview/gtksourcegutterrenderer.h            |  3 +-
 gtksourceview/gtksourcegutterrendererpixbuf.h      |  4 +-
 gtksourceview/gtksourcegutterrenderertext.h        |  4 +-
 gtksourceview/gtksourceinit.h                      |  6 +-
 gtksourceview/gtksourcelanguage.h                  |  3 +-
 gtksourceview/gtksourcelanguagemanager.h           |  3 +-
 gtksourceview/gtksourcemap.h                       |  5 +-
 gtksourceview/gtksourcemark.h                      | 22 +++---
 gtksourceview/gtksourcemarkattributes.h            |  3 +-
 gtksourceview/gtksourceprintcompositor.h           |  3 +-
 gtksourceview/gtksourceregion.h                    | 11 ++-
 gtksourceview/gtksourcesearchcontext.h             |  3 +-
 gtksourceview/gtksourcesearchsettings.h            |  3 +-
 gtksourceview/gtksourcespacedrawer.h               |  3 +-
 gtksourceview/gtksourcestyle.h                     |  3 +-
 gtksourceview/gtksourcestylescheme.h               |  3 +-
 gtksourceview/gtksourcestyleschemechooser.h        |  3 +-
 gtksourceview/gtksourcestyleschemechooserbutton.h  |  3 +-
 gtksourceview/gtksourcestyleschememanager.h        |  3 +-
 gtksourceview/gtksourcetag.h                       |  3 +-
 gtksourceview/gtksourcetypes.h                     |  3 +-
 gtksourceview/gtksourceundomanager.h               |  3 +-
 gtksourceview/gtksourceutils.h                     |  8 +--
 gtksourceview/gtksourceview.h                      |  3 +-
 gtksourceview/meson.build                          |  2 +-
 41 files changed, 138 insertions(+), 112 deletions(-)
---
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
index 73c892c8..2e1b9f6a 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
@@ -24,9 +24,10 @@
 #error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourcecompletionprovider.h>
 #include <gtk/gtk.h>
 
+#include "../../gtksourcecompletionprovider.h"
+
 G_BEGIN_DECLS
 
 #define GTK_SOURCE_TYPE_COMPLETION_WORDS (gtk_source_completion_words_get_type())
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal-private.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal-private.h
index 0273f1da..e4121077 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal-private.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal-private.h
@@ -18,13 +18,12 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H
-#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H
+#pragma once
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
 
-#include "gtksourceview/gtksourcetypes-private.h"
+#include "../../gtksourcecompletionproposal.h"
+#include "../../gtksourcetypes-private.h"
 
 G_BEGIN_DECLS
 
@@ -43,5 +42,3 @@ GTK_SOURCE_INTERNAL
 void                              gtk_source_completion_words_proposal_unuse    
(GtkSourceCompletionWordsProposal *proposal);
 
 G_END_DECLS
-
-#endif /* GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H */
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index a3fd2862..2f84a3b4 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -19,45 +19,45 @@
 
 #define GTK_SOURCE_H_INSIDE
 
-#include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcecompletioncontext.h>
-#include <gtksourceview/gtksourcecompletion.h>
-#include <gtksourceview/gtksourcecompletioninfo.h>
-#include <gtksourceview/gtksourcecompletionitem.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
-#include <gtksourceview/gtksourcecompletionprovider.h>
-#include <gtksourceview/gtksourceencoding.h>
-#include <gtksourceview/gtksourcefile.h>
-#include <gtksourceview/gtksourcefileloader.h>
-#include <gtksourceview/gtksourcefilesaver.h>
-#include <gtksourceview/gtksourcegutter.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
-#include <gtksourceview/gtksourcegutterrenderertext.h>
-#include <gtksourceview/gtksourcegutterrendererpixbuf.h>
-#include <gtksourceview/gtksourceinit.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourcemap.h>
-#include <gtksourceview/gtksourcemark.h>
-#include <gtksourceview/gtksourcemarkattributes.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
-#include <gtksourceview/gtksourceregion.h>
-#include <gtksourceview/gtksourcesearchcontext.h>
-#include <gtksourceview/gtksourcesearchsettings.h>
-#include <gtksourceview/gtksourcespacedrawer.h>
-#include <gtksourceview/gtksourcestyle.h>
-#include <gtksourceview/gtksourcestylescheme.h>
-#include <gtksourceview/gtksourcestyleschemechooser.h>
-#include <gtksourceview/gtksourcestyleschemechooserbutton.h>
-#include <gtksourceview/gtksourcestyleschemechooserwidget.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
-#include <gtksourceview/gtksourcetag.h>
-#include <gtksourceview/gtksourceundomanager.h>
-#include <gtksourceview/gtksourceutils.h>
-#include <gtksourceview/gtksourceversion.h>
-#include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksource-enumtypes.h>
+#include "completion-providers/words/gtksourcecompletionwords.h"
+#include "gtksourcetypes.h"
+#include "gtksourcebuffer.h"
+#include "gtksourcecompletioncontext.h"
+#include "gtksourcecompletion.h"
+#include "gtksourcecompletioninfo.h"
+#include "gtksourcecompletionitem.h"
+#include "gtksourcecompletionproposal.h"
+#include "gtksourcecompletionprovider.h"
+#include "gtksourceencoding.h"
+#include "gtksourcefile.h"
+#include "gtksourcefileloader.h"
+#include "gtksourcefilesaver.h"
+#include "gtksourcegutter.h"
+#include "gtksourcegutterrenderer.h"
+#include "gtksourcegutterrenderertext.h"
+#include "gtksourcegutterrendererpixbuf.h"
+#include "gtksourceinit.h"
+#include "gtksourcelanguage.h"
+#include "gtksourcelanguagemanager.h"
+#include "gtksourcemap.h"
+#include "gtksourcemark.h"
+#include "gtksourcemarkattributes.h"
+#include "gtksourceprintcompositor.h"
+#include "gtksourceregion.h"
+#include "gtksourcesearchcontext.h"
+#include "gtksourcesearchsettings.h"
+#include "gtksourcespacedrawer.h"
+#include "gtksourcestyle.h"
+#include "gtksourcestylescheme.h"
+#include "gtksourcestyleschemechooser.h"
+#include "gtksourcestyleschemechooserbutton.h"
+#include "gtksourcestyleschemechooserwidget.h"
+#include "gtksourcestyleschememanager.h"
+#include "gtksourcetag.h"
+#include "gtksourceundomanager.h"
+#include "gtksourceutils.h"
+#include "gtksourceversion.h"
+#include "gtksourceview.h"
+#include "gtksource-enumtypes.h"
 
 #undef GTK_SOURCE_H_INSIDE
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h
index c6dda139..6a791c2c 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtksourcebuffer.h
@@ -29,7 +29,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtksourcecompletion-private.h
index 2bca815b..534b4bcc 100644
--- a/gtksourceview/gtksourcecompletion-private.h
+++ b/gtksourceview/gtksourcecompletion-private.h
@@ -21,7 +21,8 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_GNUC_INTERNAL
 GtkSourceCompletion *_gtk_source_completion_new           (GtkSourceView               *source_view);
diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h
index bdf3eaca..bd393e24 100644
--- a/gtksourceview/gtksourcecompletion.h
+++ b/gtksourceview/gtksourcecompletion.h
@@ -26,7 +26,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h
index 7aa7e774..84c98f40 100644
--- a/gtksourceview/gtksourcecompletioncontext.h
+++ b/gtksourceview/gtksourcecompletioncontext.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h
index 25be7392..29665217 100644
--- a/gtksourceview/gtksourcecompletioninfo.h
+++ b/gtksourceview/gtksourcecompletioninfo.h
@@ -26,7 +26,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h
index 6eeb465f..1666741b 100644
--- a/gtksourceview/gtksourcecompletionitem.h
+++ b/gtksourceview/gtksourcecompletionitem.h
@@ -26,7 +26,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtksourcecompletionproposal.h
index b92d6d8b..c1bca136 100644
--- a/gtksourceview/gtksourcecompletionproposal.h
+++ b/gtksourceview/gtksourcecompletionproposal.h
@@ -27,7 +27,8 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h
index 493d9966..b2b53991 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtksourcecompletionprovider.h
@@ -26,8 +26,9 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcecompletioncontext.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcecompletioncontext.h"
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtksourceencoding.h
index e2a4e35c..cf429883 100644
--- a/gtksourceview/gtksourceencoding.h
+++ b/gtksourceview/gtksourceencoding.h
@@ -27,7 +27,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h
index 84a13abc..e6a88679 100644
--- a/gtksourceview/gtksourcefile.h
+++ b/gtksourceview/gtksourcefile.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtksourcefileloader.h
index 09071090..aee8b094 100644
--- a/gtksourceview/gtksourcefileloader.h
+++ b/gtksourceview/gtksourcefileloader.h
@@ -28,8 +28,9 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcefile.h>
+
+#include "gtksourcetypes.h"
+#include "gtksourcefile.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtksourcefilesaver.h
index 117a1579..79178745 100644
--- a/gtksourceview/gtksourcefilesaver.h
+++ b/gtksourceview/gtksourcefilesaver.h
@@ -28,8 +28,9 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcefile.h>
+
+#include "gtksourcetypes.h"
+#include "gtksourcefile.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h
index c9745b04..3fdf5b44 100644
--- a/gtksourceview/gtksourcegutter.h
+++ b/gtksourceview/gtksourcegutter.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index 4d8001e4..bc7a06ab 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h
index a506edf7..ee82b6a4 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.h
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.h
@@ -24,8 +24,8 @@
 #error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
+#include "gtksourcetypes.h"
+#include "gtksourcegutterrenderer.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h
index 59efe60f..c31600c6 100644
--- a/gtksourceview/gtksourcegutterrenderertext.h
+++ b/gtksourceview/gtksourcegutterrenderertext.h
@@ -24,8 +24,8 @@
 #error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
+#include "gtksourcetypes.h"
+#include "gtksourcegutterrenderer.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceinit.h b/gtksourceview/gtksourceinit.h
index bacfb95f..b2efc720 100644
--- a/gtksourceview/gtksourceinit.h
+++ b/gtksourceview/gtksourceinit.h
@@ -24,13 +24,13 @@
 #endif
 
 #include <glib.h>
-#include <gtksourceview/gtksourceversion.h>
+
+#include "gtksourceversion.h"
 
 G_BEGIN_DECLS
 
 GTK_SOURCE_AVAILABLE_IN_4_0
-void   gtk_source_init         (void);
-
+void   gtk_source_init           (void);
 GTK_SOURCE_AVAILABLE_IN_4_0
 void   gtk_source_finalize     (void);
 
diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h
index 61b2e9ac..f27dbfc3 100644
--- a/gtksourceview/gtksourcelanguage.h
+++ b/gtksourceview/gtksourcelanguage.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
index 58409fea..0c84deb9 100644
--- a/gtksourceview/gtksourcelanguagemanager.h
+++ b/gtksourceview/gtksourcelanguagemanager.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcemap.h b/gtksourceview/gtksourcemap.h
index 5de357ac..9fd57c33 100644
--- a/gtksourceview/gtksourcemap.h
+++ b/gtksourceview/gtksourcemap.h
@@ -24,8 +24,9 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourceview.h>
+
+#include "gtksourcetypes.h"
+#include "gtksourceview.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h
index 426be867..17bc46e5 100644
--- a/gtksourceview/gtksourcemark.h
+++ b/gtksourceview/gtksourcemark.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
@@ -38,23 +39,20 @@ struct _GtkSourceMarkClass
 {
        GtkTextMarkClass parent_class;
 
-       /* Padding for future expansion */
+       /*< private >*/
        gpointer _reserved[10];
 };
 
 GTK_SOURCE_AVAILABLE_IN_ALL
-GtkSourceMark   *gtk_source_mark_new           (const gchar    *name,
-                                                const gchar    *category);
-
+GtkSourceMark *gtk_source_mark_new          (const gchar *name,
+                                             const gchar *category);
 GTK_SOURCE_AVAILABLE_IN_ALL
-const gchar    *gtk_source_mark_get_category   (GtkSourceMark  *mark);
-
+const gchar   *gtk_source_mark_get_category (GtkSourceMark *mark);
 GTK_SOURCE_AVAILABLE_IN_ALL
-GtkSourceMark  *gtk_source_mark_next           (GtkSourceMark  *mark,
-                                                const gchar    *category);
-
+GtkSourceMark *gtk_source_mark_next         (GtkSourceMark *mark,
+                                             const gchar   *category);
 GTK_SOURCE_AVAILABLE_IN_ALL
-GtkSourceMark  *gtk_source_mark_prev           (GtkSourceMark  *mark,
-                                                const gchar    *category);
+GtkSourceMark *gtk_source_mark_prev         (GtkSourceMark *mark,
+                                             const gchar   *category);
 
 G_END_DECLS
diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h
index b5ca6f4d..a4b6a3e6 100644
--- a/gtksourceview/gtksourcemarkattributes.h
+++ b/gtksourceview/gtksourcemarkattributes.h
@@ -26,7 +26,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h
index ee6abca1..059483fd 100644
--- a/gtksourceview/gtksourceprintcompositor.h
+++ b/gtksourceview/gtksourceprintcompositor.h
@@ -26,7 +26,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceregion.h b/gtksourceview/gtksourceregion.h
index 879a1b19..a690c42d 100644
--- a/gtksourceview/gtksourceregion.h
+++ b/gtksourceview/gtksourceregion.h
@@ -26,23 +26,22 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourceversion.h>
+
+#include "gtksourceversion.h"
 
 G_BEGIN_DECLS
 
 #define GTK_SOURCE_TYPE_REGION (gtk_source_region_get_type ())
 
 GTK_SOURCE_AVAILABLE_IN_3_22
-G_DECLARE_DERIVABLE_TYPE (GtkSourceRegion, gtk_source_region,
-                         GTK_SOURCE, REGION,
-                         GObject)
+G_DECLARE_DERIVABLE_TYPE (GtkSourceRegion, gtk_source_region, GTK_SOURCE, REGION, GObject)
 
 struct _GtkSourceRegionClass
 {
        GObjectClass parent_class;
 
-       /* Padding for future expansion */
-       gpointer padding[10];
+       /*< private >*/
+       gpointer _reserved[10];
 };
 
 /**
diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtksourcesearchcontext.h
index 5f1e596d..bf571c4f 100644
--- a/gtksourceview/gtksourcesearchcontext.h
+++ b/gtksourceview/gtksourcesearchcontext.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcesearchsettings.h b/gtksourceview/gtksourcesearchsettings.h
index 628c8403..9c0f3b63 100644
--- a/gtksourceview/gtksourcesearchsettings.h
+++ b/gtksourceview/gtksourcesearchsettings.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcespacedrawer.h b/gtksourceview/gtksourcespacedrawer.h
index ec6161de..b5273e91 100644
--- a/gtksourceview/gtksourcespacedrawer.h
+++ b/gtksourceview/gtksourcespacedrawer.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtksourcestyle.h
index c81aa3d1..6e8ece45 100644
--- a/gtksourceview/gtksourcestyle.h
+++ b/gtksourceview/gtksourcestyle.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
index 6f4dbee8..6e598543 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtksourcestylescheme.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h
index 4c9e6189..b0e94da0 100644
--- a/gtksourceview/gtksourcestyleschemechooser.h
+++ b/gtksourceview/gtksourcestyleschemechooser.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h 
b/gtksourceview/gtksourcestyleschemechooserbutton.h
index c515b26a..1615c5cb 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.h
+++ b/gtksourceview/gtksourcestyleschemechooserbutton.h
@@ -26,7 +26,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
index a77c6c40..3335cf60 100644
--- a/gtksourceview/gtksourcestyleschememanager.h
+++ b/gtksourceview/gtksourcestyleschememanager.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcetag.h b/gtksourceview/gtksourcetag.h
index 5b2b3be1..4953794c 100644
--- a/gtksourceview/gtksourcetag.h
+++ b/gtksourceview/gtksourcetag.h
@@ -27,7 +27,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h
index 0804f66e..ae358abc 100644
--- a/gtksourceview/gtksourcetypes.h
+++ b/gtksourceview/gtksourcetypes.h
@@ -24,7 +24,8 @@
 #endif
 
 #include <glib.h>
-#include <gtksourceview/gtksourceversion.h>
+
+#include "gtksourceversion.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtksourceundomanager.h
index 0fb7de78..4c8655d2 100644
--- a/gtksourceview/gtksourceundomanager.h
+++ b/gtksourceview/gtksourceundomanager.h
@@ -27,7 +27,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceutils.h b/gtksourceview/gtksourceutils.h
index bd3b2f3d..2f4faf9e 100644
--- a/gtksourceview/gtksourceutils.h
+++ b/gtksourceview/gtksourceutils.h
@@ -25,14 +25,14 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourceversion.h>
+
+#include "gtksourceversion.h"
 
 G_BEGIN_DECLS
 
 GTK_SOURCE_AVAILABLE_IN_3_10
-gchar          *gtk_source_utils_unescape_search_text          (const gchar    *text);
-
+gchar *gtk_source_utils_unescape_search_text (const gchar *text);
 GTK_SOURCE_AVAILABLE_IN_3_10
-gchar          *gtk_source_utils_escape_search_text            (const gchar    *text);
+gchar *gtk_source_utils_escape_search_text   (const gchar *text);
 
 G_END_DECLS
diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h
index 41da6425..40ef7e96 100644
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtksourceview.h
@@ -27,7 +27,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+
+#include "gtksourcetypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index 64f7ab16..3a1e99d3 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -146,7 +146,7 @@ core_enums_header = '''
 # error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourceversion.h>
+#include "gtksourceversion.h"
 '''
 
 core_enums = gnome.mkenums_simple('gtksource-enumtypes',
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]