GNOME.org
 

[gtksourceview] Move all the main types in gtksourcetypes.h

commit 64e69218a3b6b3a1b5e10683bc4bdb8bc4fefbb2
Author: SÃbastien Wilmet <swilmet gnome org>
Date:   Wed Aug 15 23:33:04 2012 +0200

    Move all the main types in gtksourcetypes.h
    
    This avoids the problem of .h inclusions cycles.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=679424

 gtksourceview/Makefile.am                     |    1 +
 gtksourceview/gtksource.h                     |    1 +
 gtksourceview/gtksourcebuffer.h               |    2 +-
 gtksourceview/gtksourcecompletion-private.h   |    7 +--
 gtksourceview/gtksourcecompletion.h           |    2 +-
 gtksourceview/gtksourcecompletioncontext.h    |    3 +-
 gtksourceview/gtksourcecompletioninfo.h       |    3 +-
 gtksourceview/gtksourcecompletionitem.h       |    2 +-
 gtksourceview/gtksourcecompletionmodel.h      |    2 +-
 gtksourceview/gtksourcecompletionproposal.h   |    2 +-
 gtksourceview/gtksourcecompletionprovider.h   |    2 +-
 gtksourceview/gtksourcecontextengine.h        |    2 +-
 gtksourceview/gtksourceengine.h               |    2 +-
 gtksourceview/gtksourcegutter.h               |    2 +-
 gtksourceview/gtksourcegutterrenderer.h       |    2 +-
 gtksourceview/gtksourcegutterrendererlines.h  |    2 +-
 gtksourceview/gtksourcegutterrenderermarks.h  |    2 +-
 gtksourceview/gtksourcegutterrendererpixbuf.h |    2 +-
 gtksourceview/gtksourcegutterrenderertext.h   |    2 +-
 gtksourceview/gtksourcelanguage.h             |    2 +-
 gtksourceview/gtksourcelanguagemanager.h      |    2 +-
 gtksourceview/gtksourcemark.h                 |    2 +-
 gtksourceview/gtksourcemarkattributes.h       |    2 +-
 gtksourceview/gtksourcepixbufhelper.h         |    3 +-
 gtksourceview/gtksourceprintcompositor.h      |    2 +-
 gtksourceview/gtksourceregex.h                |    3 +-
 gtksourceview/gtksourcestyle.h                |    3 +-
 gtksourceview/gtksourcestylescheme.h          |    2 +-
 gtksourceview/gtksourcestyleschememanager.h   |    2 +-
 gtksourceview/gtksourcetypes.h                |   62 +++++++++++++++++++++++++
 gtksourceview/gtksourceundomanager.h          |    2 +-
 gtksourceview/gtksourceundomanagerdefault.h   |    2 +-
 gtksourceview/gtksourceview.h                 |    3 +-
 gtksourceview/gtktextregion.h                 |    2 +-
 34 files changed, 95 insertions(+), 42 deletions(-)
---
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index cc4498b..484c292 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -42,6 +42,7 @@ libgtksourceview_headers =			\
 	gtksourcestyle.h			\
 	gtksourcestylescheme.h			\
 	gtksourcestyleschememanager.h		\
+	gtksourcetypes.h			\
 	gtksourceundomanager.h			\
 	gtksourceview.h
 
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index 507e0bf..2ca35bc 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_SOURCE_H__
 #define __GTK_SOURCE_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcebuffer.h>
 #include <gtksourceview/gtksourcecompletioncontext.h>
 #include <gtksourceview/gtksourcecompletion.h>
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h
index 136a35a..c4443b2 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtksourcebuffer.h
@@ -26,6 +26,7 @@
 #define __GTK_SOURCE_BUFFER_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcemark.h>
 #include <gtksourceview/gtksourcestylescheme.h>
@@ -40,7 +41,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_BUFFER))
 #define GTK_SOURCE_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_BUFFER, GtkSourceBufferClass))
 
-typedef struct _GtkSourceBuffer			GtkSourceBuffer;
 typedef struct _GtkSourceBufferClass		GtkSourceBufferClass;
 typedef struct _GtkSourceBufferPrivate		GtkSourceBufferPrivate;
 
diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtksourcecompletion-private.h
index 4927e36..492eab1 100644
--- a/gtksourceview/gtksourcecompletion-private.h
+++ b/gtksourceview/gtksourcecompletion-private.h
@@ -23,12 +23,7 @@
 #define __GTK_SOURCE_COMPLETION_PIVATE_H__
 
 #include <gtk/gtk.h>
-
-/* Break the cycle between gtksourceview.h and gtksourcecompletion.h */
-typedef struct _GtkSourceCompletion GtkSourceCompletion;
-
-/* Break the cycle between completionprovider.h and completioncontext.h */
-typedef struct _GtkSourceCompletionProvider GtkSourceCompletionProvider;
+#include <gtksourceview/gtksourcetypes.h>
 
 /* Forward declaration */
 struct _GtkSourceView;
diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h
index 4c905f6..2f97c46 100644
--- a/gtksourceview/gtksourcecompletion.h
+++ b/gtksourceview/gtksourcecompletion.h
@@ -24,12 +24,12 @@
 #define __GTK_SOURCE_COMPLETION_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourceview.h>
 #include <gtksourceview/gtksourcecompletioninfo.h>
 #include <gtksourceview/gtksourcecompletioncontext.h>
 #include <gtksourceview/gtksourcecompletionprovider.h>
 #include <gtksourceview/gtksourcelanguage.h>
-#include "gtksourcecompletion-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h
index eea75c2..a3db455 100644
--- a/gtksourceview/gtksourcecompletioncontext.h
+++ b/gtksourceview/gtksourcecompletioncontext.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include "gtksourcecompletion-private.h"
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_COMPLETION_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTEXT))
 #define GTK_SOURCE_COMPLETION_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass))
 
-typedef struct _GtkSourceCompletionContext		GtkSourceCompletionContext;
 typedef struct _GtkSourceCompletionContextClass		GtkSourceCompletionContextClass;
 typedef struct _GtkSourceCompletionContextPrivate	GtkSourceCompletionContextPrivate;
 
diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h
index 20c2e65..2e237fe 100644
--- a/gtksourceview/gtksourcecompletioninfo.h
+++ b/gtksourceview/gtksourcecompletioninfo.h
@@ -25,6 +25,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -37,8 +38,6 @@ G_BEGIN_DECLS
 
 typedef struct _GtkSourceCompletionInfoPrivate GtkSourceCompletionInfoPrivate;
 
-typedef struct _GtkSourceCompletionInfo GtkSourceCompletionInfo;
-
 struct _GtkSourceCompletionInfo
 {
 	GtkWindow parent;
diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h
index 5f7be57..53715e8 100644
--- a/gtksourceview/gtksourcecompletionitem.h
+++ b/gtksourceview/gtksourcecompletionitem.h
@@ -23,6 +23,7 @@
 #define __GTK_SOURCE_COMPLETION_ITEM_H__
 
 #include <glib-object.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcecompletionproposal.h>
 
 G_BEGIN_DECLS
@@ -35,7 +36,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_COMPLETION_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_ITEM))
 #define GTK_SOURCE_COMPLETION_ITEM_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItemClass))
 
-typedef struct _GtkSourceCompletionItem		GtkSourceCompletionItem;
 typedef struct _GtkSourceCompletionItemClass	GtkSourceCompletionItemClass;
 typedef struct _GtkSourceCompletionItemPrivate	GtkSourceCompletionItemPrivate;
 
diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h
index ccf6155..9774b86 100644
--- a/gtksourceview/gtksourcecompletionmodel.h
+++ b/gtksourceview/gtksourcecompletionmodel.h
@@ -23,6 +23,7 @@
 #define __GTK_SOURCE_COMPLETION_MODEL_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcecompletionprovider.h>
 #include <gtksourceview/gtksourcecompletionproposal.h>
 
@@ -36,7 +37,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_COMPLETION_MODEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_MODEL))
 #define GTK_SOURCE_COMPLETION_MODEL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModelClass))
 
-typedef struct _GtkSourceCompletionModel	GtkSourceCompletionModel;
 typedef struct _GtkSourceCompletionModelClass	GtkSourceCompletionModelClass;
 typedef struct _GtkSourceCompletionModelPrivate	GtkSourceCompletionModelPrivate;
 
diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtksourcecompletionproposal.h
index 12725a9..1e33b65 100644
--- a/gtksourceview/gtksourcecompletionproposal.h
+++ b/gtksourceview/gtksourcecompletionproposal.h
@@ -25,6 +25,7 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -33,7 +34,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_COMPLETION_PROPOSAL(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_PROPOSAL))
 #define GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE(obj)	(G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_SOURCE_TYPE_COMPLETION_PROPOSAL, GtkSourceCompletionProposalIface))
 
-typedef struct _GtkSourceCompletionProposal		GtkSourceCompletionProposal;
 typedef struct _GtkSourceCompletionProposalIface	GtkSourceCompletionProposalIface;
 
 struct _GtkSourceCompletionProposalIface
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h
index 0d04f42..3819e12 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtksourcecompletionprovider.h
@@ -31,7 +31,7 @@
 #include <gtksourceview/gtksourcecompletioninfo.h>
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcecompletioncontext.h>
-#include "gtksourcecompletion-private.h"
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h
index 4755f59..7b8b5cf 100644
--- a/gtksourceview/gtksourcecontextengine.h
+++ b/gtksourceview/gtksourcecontextengine.h
@@ -23,6 +23,7 @@
 #ifndef __GTK_SOURCE_CONTEXT_ENGINE_H__
 #define __GTK_SOURCE_CONTEXT_ENGINE_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourceengine.h>
 #include <gtksourceview/gtksourcelanguage.h>
 
@@ -38,7 +39,6 @@ G_BEGIN_DECLS
 typedef struct _GtkSourceContextData          GtkSourceContextData;
 typedef struct _GtkSourceContextReplace       GtkSourceContextReplace;
 typedef struct _GtkSourceContextClass         GtkSourceContextClass;
-typedef struct _GtkSourceContextEngine        GtkSourceContextEngine;
 typedef struct _GtkSourceContextEngineClass   GtkSourceContextEngineClass;
 typedef struct _GtkSourceContextEnginePrivate GtkSourceContextEnginePrivate;
 
diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h
index 8b4cb18..abc515f 100644
--- a/gtksourceview/gtksourceengine.h
+++ b/gtksourceview/gtksourceengine.h
@@ -23,6 +23,7 @@
 #define __GTK_SOURCE_ENGINE_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcestylescheme.h>
 
 G_BEGIN_DECLS
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_ENGINE))
 #define GTK_SOURCE_ENGINE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_ENGINE, GtkSourceEngineClass))
 
-typedef struct _GtkSourceEngine		GtkSourceEngine;
 typedef struct _GtkSourceEngineClass	GtkSourceEngineClass;
 
 struct _GtkSourceEngine
diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h
index a27d18b..e906348 100644
--- a/gtksourceview/gtksourcegutter.h
+++ b/gtksourceview/gtksourcegutter.h
@@ -26,6 +26,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrenderer.h>
 
 G_BEGIN_DECLS
@@ -37,7 +38,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_GUTTER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER))
 #define GTK_SOURCE_GUTTER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutterClass))
 
-typedef struct _GtkSourceGutter			GtkSourceGutter;
 typedef struct _GtkSourceGutterClass	GtkSourceGutterClass;
 typedef struct _GtkSourceGutterPrivate	GtkSourceGutterPrivate;
 
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index ea6952f..fe59568 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -25,6 +25,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -36,7 +37,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_GUTTER_RENDERER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER))
 #define GTK_SOURCE_GUTTER_RENDERER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRendererClass))
 
-typedef struct _GtkSourceGutterRenderer		GtkSourceGutterRenderer;
 typedef struct _GtkSourceGutterRendererClass	GtkSourceGutterRendererClass;
 typedef struct _GtkSourceGutterRendererPrivate	GtkSourceGutterRendererPrivate;
 
diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtksourcegutterrendererlines.h
index bc4bf90..e1c7a95 100644
--- a/gtksourceview/gtksourcegutterrendererlines.h
+++ b/gtksourceview/gtksourcegutterrendererlines.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_SOURCE_GUTTER_RENDERER_LINES_H__
 #define __GTK_SOURCE_GUTTER_RENDERER_LINES_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrenderertext.h>
 #include <gtk/gtk.h>
 
@@ -35,7 +36,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_GUTTER_RENDERER_LINES_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES))
 #define GTK_SOURCE_GUTTER_RENDERER_LINES_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesClass))
 
-typedef struct _GtkSourceGutterRendererLines		GtkSourceGutterRendererLines;
 typedef struct _GtkSourceGutterRendererLinesClass	GtkSourceGutterRendererLinesClass;
 typedef struct _GtkSourceGutterRendererLinesPrivate	GtkSourceGutterRendererLinesPrivate;
 
diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h
index 71cc35d..bf303d8 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.h
+++ b/gtksourceview/gtksourcegutterrenderermarks.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_SOURCE_GUTTER_RENDERER_MARKS_H__
 #define __GTK_SOURCE_GUTTER_RENDERER_MARKS_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrendererpixbuf.h>
 #include <gtk/gtk.h>
 
@@ -35,7 +36,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_GUTTER_RENDERER_MARKS_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS))
 #define GTK_SOURCE_GUTTER_RENDERER_MARKS_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksClass))
 
-typedef struct _GtkSourceGutterRendererMarks		GtkSourceGutterRendererMarks;
 typedef struct _GtkSourceGutterRendererMarksClass	GtkSourceGutterRendererMarksClass;
 typedef struct _GtkSourceGutterRendererMarksPrivate	GtkSourceGutterRendererMarksPrivate;
 
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h
index 6c88678..f7bec3d 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.h
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H__
 #define __GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrenderer.h>
 
 G_BEGIN_DECLS
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF))
 #define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass))
 
-typedef struct _GtkSourceGutterRendererPixbuf		GtkSourceGutterRendererPixbuf;
 typedef struct _GtkSourceGutterRendererPixbufClass	GtkSourceGutterRendererPixbufClass;
 typedef struct _GtkSourceGutterRendererPixbufPrivate	GtkSourceGutterRendererPixbufPrivate;
 
diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h
index 50c188d..e199a24 100644
--- a/gtksourceview/gtksourcegutterrenderertext.h
+++ b/gtksourceview/gtksourcegutterrenderertext.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_SOURCE_GUTTER_RENDERER_TEXT_H__
 #define __GTK_SOURCE_GUTTER_RENDERER_TEXT_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrenderer.h>
 
 G_BEGIN_DECLS
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_GUTTER_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT))
 #define GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass))
 
-typedef struct _GtkSourceGutterRendererText		GtkSourceGutterRendererText;
 typedef struct _GtkSourceGutterRendererTextClass	GtkSourceGutterRendererTextClass;
 typedef struct _GtkSourceGutterRendererTextPrivate	GtkSourceGutterRendererTextPrivate;
 
diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h
index d3db704..1baf5f1 100644
--- a/gtksourceview/gtksourcelanguage.h
+++ b/gtksourceview/gtksourcelanguage.h
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -36,7 +37,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_LANGUAGE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguageClass))
 
 
-typedef struct _GtkSourceLanguage		GtkSourceLanguage;
 typedef struct _GtkSourceLanguageClass		GtkSourceLanguageClass;
 typedef struct _GtkSourceLanguagePrivate	GtkSourceLanguagePrivate;
 
diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
index 85acc6e..00f3880 100644
--- a/gtksourceview/gtksourcelanguagemanager.h
+++ b/gtksourceview/gtksourcelanguagemanager.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_SOURCE_LANGUAGE_MANAGER_H__
 #define __GTK_SOURCE_LANGUAGE_MANAGER_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcelanguage.h>
 
 G_BEGIN_DECLS
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_LANGUAGE_MANAGER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass))
 
 
-typedef struct _GtkSourceLanguageManager	GtkSourceLanguageManager;
 typedef struct _GtkSourceLanguageManagerClass	GtkSourceLanguageManagerClass;
 typedef struct _GtkSourceLanguageManagerPrivate GtkSourceLanguageManagerPrivate;
 
diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h
index 8e23996..02e16e9 100644
--- a/gtksourceview/gtksourcemark.h
+++ b/gtksourceview/gtksourcemark.h
@@ -23,6 +23,7 @@
 #define __GTKSOURCEMARK_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -33,7 +34,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_MARK_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_MARK))
 #define GTK_SOURCE_MARK_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_MARK, GtkSourceMarkClass))
 
-typedef struct _GtkSourceMark GtkSourceMark;
 typedef struct _GtkSourceMarkClass GtkSourceMarkClass;
 
 typedef struct _GtkSourceMarkPrivate GtkSourceMarkPrivate;
diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h
index ac9cfac..9d711a0 100644
--- a/gtksourceview/gtksourcemarkattributes.h
+++ b/gtksourceview/gtksourcemarkattributes.h
@@ -24,6 +24,7 @@
 #define __GTK_SOURCE_MARK_ATTRIBUTES_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcemark.h>
 
 G_BEGIN_DECLS
@@ -36,7 +37,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_MARK_ATTRIBUTES_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_MARK_ATTRIBUTES))
 #define GTK_SOURCE_MARK_ATTRIBUTES_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_MARK_ATTRIBUTES, GtkSourceMarkAttributesClass))
 
-typedef struct _GtkSourceMarkAttributes		GtkSourceMarkAttributes;
 typedef struct _GtkSourceMarkAttributesClass	GtkSourceMarkAttributesClass;
 typedef struct _GtkSourceMarkAttributesPrivate	GtkSourceMarkAttributesPrivate;
 
diff --git a/gtksourceview/gtksourcepixbufhelper.h b/gtksourceview/gtksourcepixbufhelper.h
index 330724e..c513fbb 100644
--- a/gtksourceview/gtksourcepixbufhelper.h
+++ b/gtksourceview/gtksourcepixbufhelper.h
@@ -23,8 +23,7 @@
 #define __GTK_SOURCE_PIXBUF_HELPER_H__
 
 #include <gtk/gtk.h>
-
-typedef struct _GtkSourcePixbufHelper GtkSourcePixbufHelper;
+#include <gtksourceview/gtksourcetypes.h>
 
 GtkSourcePixbufHelper *gtk_source_pixbuf_helper_new (void);
 void gtk_source_pixbuf_helper_free (GtkSourcePixbufHelper *helper);
diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h
index eeb37f9..5a67f72 100644
--- a/gtksourceview/gtksourceprintcompositor.h
+++ b/gtksourceview/gtksourceprintcompositor.h
@@ -24,6 +24,7 @@
 #define __GTK_SOURCE_PRINT_COMPOSITOR_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourceview.h>
 
 G_BEGIN_DECLS
@@ -35,7 +36,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_PRINT_COMPOSITOR))
 #define GTK_SOURCE_PRINT_COMPOSITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass))
 
-typedef struct _GtkSourcePrintCompositor         GtkSourcePrintCompositor;
 typedef struct _GtkSourcePrintCompositorClass    GtkSourcePrintCompositorClass;
 typedef struct _GtkSourcePrintCompositorPrivate  GtkSourcePrintCompositorPrivate;
 
diff --git a/gtksourceview/gtksourceregex.h b/gtksourceview/gtksourceregex.h
index 4500031..cc92901 100644
--- a/gtksourceview/gtksourceregex.h
+++ b/gtksourceview/gtksourceregex.h
@@ -24,11 +24,10 @@
 #define __GTK_SOURCE_REGEX_H__
 
 #include <glib.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GtkSourceRegex GtkSourceRegex;
-
 GtkSourceRegex	*_gtk_source_regex_new		(const gchar         *pattern,
 						 GRegexCompileFlags   flags,
 						 GError             **error);
diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtksourcestyle.h
index 826ea25..d41dd47 100644
--- a/gtksourceview/gtksourcestyle.h
+++ b/gtksourceview/gtksourcestyle.h
@@ -23,6 +23,7 @@
 #define __GTK_SOURCE_STYLE_H__
 
 #include <glib-object.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -30,8 +31,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_STYLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE, GtkSourceStyle))
 #define GTK_SOURCE_IS_STYLE(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE))
 
-typedef struct _GtkSourceStyle GtkSourceStyle;
-
 GType		 gtk_source_style_get_type	(void) G_GNUC_CONST;
 
 GtkSourceStyle	*gtk_source_style_copy		(const GtkSourceStyle *style);
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
index 48123af..3d49d25 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtksourcestylescheme.h
@@ -23,6 +23,7 @@
 #define __GTK_SOURCE_STYLE_SCHEME_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcestyle.h>
 
 G_BEGIN_DECLS
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_STYLE_SCHEME_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME))
 #define GTK_SOURCE_STYLE_SCHEME_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleSchemeClass))
 
-typedef struct _GtkSourceStyleScheme             GtkSourceStyleScheme;
 typedef struct _GtkSourceStyleSchemePrivate      GtkSourceStyleSchemePrivate;
 typedef struct _GtkSourceStyleSchemeClass        GtkSourceStyleSchemeClass;
 
diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
index eda7ea2..4240ba3 100644
--- a/gtksourceview/gtksourcestyleschememanager.h
+++ b/gtksourceview/gtksourcestyleschememanager.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_SOURCE_STYLE_SCHEME_MANAGER_H__
 #define __GTK_SOURCE_STYLE_SCHEME_MANAGER_H__
 
+#include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcestylescheme.h>
 
 G_BEGIN_DECLS
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_STYLE_SCHEME_MANAGER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass))
 
 
-typedef struct _GtkSourceStyleSchemeManager		GtkSourceStyleSchemeManager;
 typedef struct _GtkSourceStyleSchemeManagerClass	GtkSourceStyleSchemeManagerClass;
 typedef struct _GtkSourceStyleSchemeManagerPrivate	GtkSourceStyleSchemeManagerPrivate;
 
diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h
new file mode 100644
index 0000000..5298e03
--- /dev/null
+++ b/gtksourceview/gtksourcetypes.h
@@ -0,0 +1,62 @@
+/*
+ * gtksourcetypes.h
+ * This file is part of GtkSourceView
+ *
+ * Copyright (C) 2012 - SÃbastien Wilmet <swilmet gnome org>
+ *
+ * GtkSourceView is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * GtkSourceView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __GTK_SOURCE_TYPES_H__
+#define __GTK_SOURCE_TYPES_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GtkSourceBuffer			GtkSourceBuffer;
+typedef struct _GtkSourceCompletionContext	GtkSourceCompletionContext;
+typedef struct _GtkSourceCompletion		GtkSourceCompletion;
+typedef struct _GtkSourceCompletionInfo		GtkSourceCompletionInfo;
+typedef struct _GtkSourceCompletionItem		GtkSourceCompletionItem;
+typedef struct _GtkSourceCompletionModel	GtkSourceCompletionModel;
+typedef struct _GtkSourceCompletionProposal	GtkSourceCompletionProposal;
+typedef struct _GtkSourceCompletionProvider	GtkSourceCompletionProvider;
+typedef struct _GtkSourceContextEngine		GtkSourceContextEngine;
+typedef struct _GtkSourceEngine			GtkSourceEngine;
+typedef struct _GtkSourceGutter			GtkSourceGutter;
+typedef struct _GtkSourceGutterRenderer		GtkSourceGutterRenderer;
+typedef struct _GtkSourceGutterRendererLines	GtkSourceGutterRendererLines;
+typedef struct _GtkSourceGutterRendererMarks	GtkSourceGutterRendererMarks;
+typedef struct _GtkSourceGutterRendererPixbuf	GtkSourceGutterRendererPixbuf;
+typedef struct _GtkSourceGutterRendererText	GtkSourceGutterRendererText;
+typedef struct _GtkSourceLanguage		GtkSourceLanguage;
+typedef struct _GtkSourceLanguageManager	GtkSourceLanguageManager;
+typedef struct _GtkSourceMarkAttributes		GtkSourceMarkAttributes;
+typedef struct _GtkSourceMark			GtkSourceMark;
+typedef struct _GtkSourcePixbufHelper		GtkSourcePixbufHelper;
+typedef struct _GtkSourcePrintCompositor	GtkSourcePrintCompositor;
+typedef struct _GtkSourceRegex			GtkSourceRegex;
+typedef struct _GtkSourceStyle			GtkSourceStyle;
+typedef struct _GtkSourceStyleScheme		GtkSourceStyleScheme;
+typedef struct _GtkSourceStyleSchemeManager	GtkSourceStyleSchemeManager;
+typedef struct _GtkSourceUndoManagerDefault	GtkSourceUndoManagerDefault;
+typedef struct _GtkSourceUndoManager		GtkSourceUndoManager;
+typedef struct _GtkSourceView			GtkSourceView;
+typedef struct _GtkTextRegion			GtkTextRegion;
+
+G_END_DECLS
+
+#endif /* __GTK_SOURCE_TYPES_H__ */
diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtksourceundomanager.h
index 459e934..490499c 100644
--- a/gtksourceview/gtksourceundomanager.h
+++ b/gtksourceview/gtksourceundomanager.h
@@ -26,6 +26,7 @@
 #define __GTK_SOURCE_UNDO_MANAGER_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_UNDO_MANAGER(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
 #define GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerIface))
 
-typedef struct _GtkSourceUndoManager        	GtkSourceUndoManager;
 typedef struct _GtkSourceUndoManagerIface      	GtkSourceUndoManagerIface;
 
 struct _GtkSourceUndoManagerIface
diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtksourceundomanagerdefault.h
index b396b90..be4f5dc 100644
--- a/gtksourceview/gtksourceundomanagerdefault.h
+++ b/gtksourceview/gtksourceundomanagerdefault.h
@@ -26,6 +26,7 @@
 #define __GTK_SOURCE_UNDO_MANAGER_DEFAULT_H__
 
 #include <glib-object.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -36,7 +37,6 @@ G_BEGIN_DECLS
 #define GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT))
 #define GTK_SOURCE_UNDO_MANAGER_DEFAULT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefaultClass))
 
-typedef struct _GtkSourceUndoManagerDefault        	GtkSourceUndoManagerDefault;
 typedef struct _GtkSourceUndoManagerDefaultClass 	GtkSourceUndoManagerDefaultClass;
 typedef struct _GtkSourceUndoManagerDefaultPrivate 	GtkSourceUndoManagerDefaultPrivate;
 
diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h
index 2fe67e6..205323b 100644
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtksourceview.h
@@ -29,7 +29,7 @@
 #include <gtksourceview/gtksourcebuffer.h>
 #include <gtksourceview/gtksourcegutter.h>
 #include <gtksourceview/gtksourcemarkattributes.h>
-#include "gtksourcecompletion-private.h"
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
@@ -53,7 +53,6 @@ typedef enum
 	GTK_SOURCE_VIEW_GUTTER_POSITION_MARKS = -20
 } GtkSourceViewGutterPosition;
 
-typedef struct _GtkSourceView GtkSourceView;
 typedef struct _GtkSourceViewClass GtkSourceViewClass;
 
 typedef struct _GtkSourceViewPrivate GtkSourceViewPrivate;
diff --git a/gtksourceview/gtktextregion.h b/gtksourceview/gtktextregion.h
index 8784d05..dc5d6fe 100644
--- a/gtksourceview/gtktextregion.h
+++ b/gtksourceview/gtktextregion.h
@@ -23,10 +23,10 @@
 #define __GTK_TEXT_REGION_H__
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksourcetypes.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GtkTextRegion		GtkTextRegion;
 typedef struct _GtkTextRegionIterator	GtkTextRegionIterator;
 
 struct _GtkTextRegionIterator {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]