[gtksourceviewmm] Include only gtksource.h where possible.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceviewmm] Include only gtksource.h where possible.
Date: Tue, 28 Jun 2016 08:25:00 +0000 (UTC)
commit 0f3817e32a4b989d09e455719bcba891cbe11e1e
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Jun 27 13:45:09 2016 +0200

    Include only gtksource.h where possible.
    
    This is demanded by newer versions of gtksourceview.

 .../extradefs/generate_extra_defs_gtksourceview.cc |   24 +-------------------
 gtksourceview/src/buffer.ccg                       |    2 +-
 gtksourceview/src/buffer.hg                        |    2 +-
 gtksourceview/src/completion.ccg                   |    2 +-
 gtksourceview/src/completionactivation.ccg         |    2 +-
 gtksourceview/src/completioncontext.ccg            |    2 +-
 gtksourceview/src/completioncontext.hg             |    2 +-
 gtksourceview/src/completioninfo.ccg               |    2 +-
 gtksourceview/src/completionitem.ccg               |    2 +-
 gtksourceview/src/completionproposal.hg            |    2 +-
 gtksourceview/src/completionprovider.hg            |    2 +-
 gtksourceview/src/completionwords.ccg              |    2 +
 gtksourceview/src/gutter.ccg                       |    2 +-
 gtksourceview/src/gutterrenderer.ccg               |    2 +-
 gtksourceview/src/gutterrendererpixbuf.ccg         |    2 +-
 gtksourceview/src/gutterrendererpixbuf.hg          |    2 +-
 gtksourceview/src/gutterrenderertext.ccg           |    2 +-
 gtksourceview/src/language.hg                      |    3 +-
 gtksourceview/src/languagemanager.hg               |    3 +-
 gtksourceview/src/mark.ccg                         |    2 +-
 gtksourceview/src/markattributes.ccg               |    2 +-
 gtksourceview/src/markattributes.hg                |    2 +-
 gtksourceview/src/printcompositor.ccg              |    2 +-
 gtksourceview/src/style.ccg                        |    2 +-
 gtksourceview/src/stylescheme.hg                   |    2 +-
 gtksourceview/src/styleschememanager.hg            |    2 +-
 gtksourceview/src/undomanager.hg                   |    2 +-
 gtksourceview/src/view.ccg                         |    3 +-
 28 files changed, 29 insertions(+), 52 deletions(-)
---
diff --git a/codegen/extradefs/generate_extra_defs_gtksourceview.cc 
b/codegen/extradefs/generate_extra_defs_gtksourceview.cc
index 8b47bc3..f39c375 100644
--- a/codegen/extradefs/generate_extra_defs_gtksourceview.cc
+++ b/codegen/extradefs/generate_extra_defs_gtksourceview.cc
@@ -20,29 +20,7 @@
 
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcecompletion.h>
-#include <gtksourceview/gtksourcecompletioncontext.h>
-#include <gtksourceview/gtksourcecompletioninfo.h>
-#include <gtksourceview/gtksourcecompletionitem.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
-#include <gtksourceview/gtksourcecompletionprovider.h>
-#include <gtksourceview/gtksourcegutter.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
-#include <gtksourceview/gtksourcegutterrendererpixbuf.h>
-#include <gtksourceview/gtksourcegutterrenderertext.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourcemark.h>
-#include <gtksourceview/gtksourcemarkattributes.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
-#include <gtksourceview/gtksourcestyle.h>
-#include <gtksourceview/gtksourcestylescheme.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
-#include <gtksourceview/gtksourceundomanager.h>
-#include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourceview-typebuiltins.h>
-
+#include <gtksourceview/gtksource.h>
 #include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
 
 int main (int argc, char *argv[])
diff --git a/gtksourceview/src/buffer.ccg b/gtksourceview/src/buffer.ccg
index b7e98ef..afc82c6 100644
--- a/gtksourceview/src/buffer.ccg
+++ b/gtksourceview/src/buffer.ccg
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksource.h>
 
 #include <glibmm/vectorutils.h>
 
diff --git a/gtksourceview/src/buffer.hg b/gtksourceview/src/buffer.hg
index 9e39af1..7e76894 100644
--- a/gtksourceview/src/buffer.hg
+++ b/gtksourceview/src/buffer.hg
@@ -29,7 +29,7 @@
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(gtkmm/private/textbuffer_p.h)
-_PINCLUDE(gtksourceview/gtksourceview-typebuiltins.h)
+_PINCLUDE(gtksourceview/gtksource.h)
 
 namespace Gsv
 {
diff --git a/gtksourceview/src/completion.ccg b/gtksourceview/src/completion.ccg
index d2cce7c..ae9fc01 100644
--- a/gtksourceview/src/completion.ccg
+++ b/gtksourceview/src/completion.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcecompletion.h>
+#include <gtksourceview/gtksource.h>
 
 #include <glibmm/vectorutils.h>
 
diff --git a/gtksourceview/src/completionactivation.ccg b/gtksourceview/src/completionactivation.ccg
index 7c6f4e1..1baf624 100644
--- a/gtksourceview/src/completionactivation.ccg
+++ b/gtksourceview/src/completionactivation.ccg
@@ -17,5 +17,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourceview-typebuiltins.h>
+#include <gtksourceview/gtksource.h>
 
diff --git a/gtksourceview/src/completioncontext.ccg b/gtksourceview/src/completioncontext.ccg
index 051e0c5..20af3de 100644
--- a/gtksourceview/src/completioncontext.ccg
+++ b/gtksourceview/src/completioncontext.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcecompletioncontext.h>
+#include <gtksourceview/gtksource.h>
 
 #include <glibmm/vectorutils.h>
 
diff --git a/gtksourceview/src/completioncontext.hg b/gtksourceview/src/completioncontext.hg
index 1c31f14..3a54299 100644
--- a/gtksourceview/src/completioncontext.hg
+++ b/gtksourceview/src/completioncontext.hg
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include <gtksourceview/gtksourceview-typebuiltins.h>
+#include <gtksourceview/gtksource.h>
 
 #include <glibmm/object.h>
 
diff --git a/gtksourceview/src/completioninfo.ccg b/gtksourceview/src/completioninfo.ccg
index 087c3b0..4364165 100644
--- a/gtksourceview/src/completioninfo.ccg
+++ b/gtksourceview/src/completioninfo.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcecompletioninfo.h>
+#include <gtksourceview/gtksource.h>
 
 namespace Gsv
 {
diff --git a/gtksourceview/src/completionitem.ccg b/gtksourceview/src/completionitem.ccg
index c55a985..1326af5 100644
--- a/gtksourceview/src/completionitem.ccg
+++ b/gtksourceview/src/completionitem.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcecompletionitem.h>
+#include <gtksourceview/gtksource.h>
 #include <gtkmm/stock.h>
 #include <gtk/gtk.h>
 
diff --git a/gtksourceview/src/completionproposal.hg b/gtksourceview/src/completionproposal.hg
index 62a8a57..0ff8879 100644
--- a/gtksourceview/src/completionproposal.hg
+++ b/gtksourceview/src/completionproposal.hg
@@ -20,7 +20,7 @@
 #include <glibmm/interface.h>
 #include <glibmm/ustring.h>
 #include <gdkmm/pixbuf.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
+#include <gtksourceview/gtksource.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/interface_p.h)
diff --git a/gtksourceview/src/completionprovider.hg b/gtksourceview/src/completionprovider.hg
index c4942df..9580752 100644
--- a/gtksourceview/src/completionprovider.hg
+++ b/gtksourceview/src/completionprovider.hg
@@ -18,7 +18,7 @@
  */
 
 #include <glibmm/interface.h>
-#include <gtksourceview/gtksourcecompletionprovider.h>
+#include <gtksourceview/gtksource.h>
 
 #include <gtksourceviewmm/completionactivation.h>
 #include <gtksourceviewmm/completioncontext.h>
diff --git a/gtksourceview/src/completionwords.ccg b/gtksourceview/src/completionwords.ccg
index f880e23..c10663b 100644
--- a/gtksourceview/src/completionwords.ccg
+++ b/gtksourceview/src/completionwords.ccg
@@ -17,4 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+// TODO: Include only gtksource.h when we want to depend on a newer gtksourceview:
+// https://git.gnome.org/browse/gtksourceview/commit/?id=94322d442698026dfee0f33eb83d06f2647701ab
 #include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
diff --git a/gtksourceview/src/gutter.ccg b/gtksourceview/src/gutter.ccg
index b260929..f0fc7c3 100644
--- a/gtksourceview/src/gutter.ccg
+++ b/gtksourceview/src/gutter.ccg
@@ -17,5 +17,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcegutter.h>
+#include <gtksourceview/gtksource.h>
 
diff --git a/gtksourceview/src/gutterrenderer.ccg b/gtksourceview/src/gutterrenderer.ccg
index f45fb04..d5311c1 100644
--- a/gtksourceview/src/gutterrenderer.ccg
+++ b/gtksourceview/src/gutterrenderer.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcegutterrenderer.h>
+#include <gtksourceview/gtksource.h>
 
 namespace Gsv
 {
diff --git a/gtksourceview/src/gutterrendererpixbuf.ccg b/gtksourceview/src/gutterrendererpixbuf.ccg
index 5e8206f..763a526 100644
--- a/gtksourceview/src/gutterrendererpixbuf.ccg
+++ b/gtksourceview/src/gutterrendererpixbuf.ccg
@@ -17,5 +17,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcegutterrendererpixbuf.h>
+#include <gtksourceview/gtksource.h>
 
diff --git a/gtksourceview/src/gutterrendererpixbuf.hg b/gtksourceview/src/gutterrendererpixbuf.hg
index 8f4b365..646adf2 100644
--- a/gtksourceview/src/gutterrendererpixbuf.hg
+++ b/gtksourceview/src/gutterrendererpixbuf.hg
@@ -32,7 +32,7 @@ _PINCLUDE(gtksourceviewmm/private/gutterrenderer_p.h)
 #include <glibmm.h>
 #undef G_DEPRECATED
 #define G_DEPRECATED
-#include <gtksourceview/gtksourcemarkattributes.h>
+#include <gtksourceview/gtksource.h>
 #m4 _POP()
 
 namespace Gsv
diff --git a/gtksourceview/src/gutterrenderertext.ccg b/gtksourceview/src/gutterrenderertext.ccg
index f25e16d..1d0f8c7 100644
--- a/gtksourceview/src/gutterrenderertext.ccg
+++ b/gtksourceview/src/gutterrenderertext.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcegutterrenderertext.h>
+#include <gtksourceview/gtksource.h>
 
 namespace Gsv
 {
diff --git a/gtksourceview/src/language.hg b/gtksourceview/src/language.hg
index 74e05be..038d7e1 100644
--- a/gtksourceview/src/language.hg
+++ b/gtksourceview/src/language.hg
@@ -35,8 +35,7 @@ namespace Gsv
 
 class LanguageManager ;
 
-_CC_INCLUDE(gtksourceview/gtksourcelanguage.h)
-_CC_INCLUDE(gtksourceview/gtksourceview-typebuiltins.h)
+_CC_INCLUDE(gtksourceview/gtksource.h)
 
 /** Object representing a syntax highlighted language.
  *
diff --git a/gtksourceview/src/languagemanager.hg b/gtksourceview/src/languagemanager.hg
index 9f73426..22fd271 100644
--- a/gtksourceview/src/languagemanager.hg
+++ b/gtksourceview/src/languagemanager.hg
@@ -33,8 +33,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Gsv
 {
-_CC_INCLUDE(gtksourceview/gtksourcelanguagemanager.h)
-_CC_INCLUDE(gtksourceview/gtksourceview-typebuiltins.h)
+_CC_INCLUDE(gtksourceview/gtksource.h)
 
 /** Class which provides access to SourceLanguages.
  *
diff --git a/gtksourceview/src/mark.ccg b/gtksourceview/src/mark.ccg
index bbb7c70..6ecf083 100644
--- a/gtksourceview/src/mark.ccg
+++ b/gtksourceview/src/mark.ccg
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcemark.h>
+#include <gtksourceview/gtksource.h>
 
 namespace Gsv
 {
diff --git a/gtksourceview/src/markattributes.ccg b/gtksourceview/src/markattributes.ccg
index b3f45c0..e1e8c8a 100644
--- a/gtksourceview/src/markattributes.ccg
+++ b/gtksourceview/src/markattributes.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcemarkattributes.h>
+#include <gtksourceview/gtksource.h>
 
 #include <giomm/icon.h>
 #include <gdkmm/pixbuf.h>
diff --git a/gtksourceview/src/markattributes.hg b/gtksourceview/src/markattributes.hg
index 14d2fc1..99bdd49 100644
--- a/gtksourceview/src/markattributes.hg
+++ b/gtksourceview/src/markattributes.hg
@@ -32,7 +32,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 #include <glibmm.h>
 #undef G_DEPRECATED
 #define G_DEPRECATED
-#include <gtksourceview/gtksourcemarkattributes.h>
+#include <gtksourceview/gtksource.h>
 #m4 _POP()
 
 namespace Gio
diff --git a/gtksourceview/src/printcompositor.ccg b/gtksourceview/src/printcompositor.ccg
index 585a7a8..67613ea 100644
--- a/gtksourceview/src/printcompositor.ccg
+++ b/gtksourceview/src/printcompositor.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourceprintcompositor.h>
+#include <gtksourceview/gtksource.h>
 
 namespace Gsv
 {
diff --git a/gtksourceview/src/style.ccg b/gtksourceview/src/style.ccg
index 7c99d51..1b5ebe7 100644
--- a/gtksourceview/src/style.ccg
+++ b/gtksourceview/src/style.ccg
@@ -18,4 +18,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceview/gtksourcestyle.h>
+#include <gtksourceview/gtksource.h>
diff --git a/gtksourceview/src/stylescheme.hg b/gtksourceview/src/stylescheme.hg
index a3eb6a7..c75874b 100644
--- a/gtksourceview/src/stylescheme.hg
+++ b/gtksourceview/src/stylescheme.hg
@@ -22,7 +22,7 @@
 
 #include <vector>
 
-#include <gtksourceview/gtksourcestylescheme.h>
+#include <gtksourceview/gtksource.h>
 
 #include <glibmm/object.h>
 
diff --git a/gtksourceview/src/styleschememanager.hg b/gtksourceview/src/styleschememanager.hg
index b8126bc..b2d7389 100644
--- a/gtksourceview/src/styleschememanager.hg
+++ b/gtksourceview/src/styleschememanager.hg
@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include <gtksourceview/gtksourcestyleschememanager.h>
+#include <gtksourceview/gtksource.h>
 
 #include <gtksourceviewmm/stylescheme.h>
 
diff --git a/gtksourceview/src/undomanager.hg b/gtksourceview/src/undomanager.hg
index ea995bc..5bc5143 100644
--- a/gtksourceview/src/undomanager.hg
+++ b/gtksourceview/src/undomanager.hg
@@ -20,7 +20,7 @@
 #include <glibmm/interface.h>
 #include <glibmm/ustring.h>
 #include <gdkmm/pixbuf.h>
-#include <gtksourceview/gtksourceundomanager.h>
+#include <gtksourceview/gtksource.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/interface_p.h)
diff --git a/gtksourceview/src/view.ccg b/gtksourceview/src/view.ccg
index 38c0d8c..6a470cd 100644
--- a/gtksourceview/src/view.ccg
+++ b/gtksourceview/src/view.ccg
@@ -19,8 +19,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourceview-typebuiltins.h>
+#include <gtksourceview/gtksource.h>
 
 #include <gtksourceviewmm/view.h>
 #include <gtksourceviewmm/markattributes.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]