GNOME.org
 

[gtksourceview] Move some private types in gtksourcetypes-private.h

commit e52ac6f69e244c7aa27bc084a2220f41ee9b3905
Author: SÃbastien Wilmet <swilmet gnome org>
Date:   Thu Dec 27 14:17:49 2012 +0100

    Move some private types in gtksourcetypes-private.h
    
    Some private types were present in gtksourcetypes.h.
    Another solution would have been to move these types in their respective
    headers, but we lose the benefit of having one header with all the
    types (to avoid header inclusions cycles).
    
    The lists of headers in the Makefile.am files have been sorted, and
    gtksourcetypes-private.h has been added.

 docs/reference/Makefile.am                   |   23 ++++++++-------
 gtksourceview/Makefile.am                    |   11 ++++---
 gtksourceview/gtksourcecompletionmodel.h     |    4 +-
 gtksourceview/gtksourcecontextengine.h       |    5 ++-
 gtksourceview/gtksourceengine.h              |    3 +-
 gtksourceview/gtksourcegutterrendererlines.h |    5 ++-
 gtksourceview/gtksourcegutterrenderermarks.h |    5 ++-
 gtksourceview/gtksourcepixbufhelper.h        |    2 +-
 gtksourceview/gtksourceregex.h               |    2 +-
 gtksourceview/gtksourcetypes-private.h       |   40 ++++++++++++++++++++++++++
 gtksourceview/gtksourcetypes.h               |    7 ----
 gtksourceview/gtksourceundomanagerdefault.h  |    2 +-
 12 files changed, 74 insertions(+), 35 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 5adfb1d..e523956 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -21,29 +21,30 @@ CFILE_GLOB = $(top_srcdir)/gtksourceview/*.c
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES =					\
 	config.h				\
-	gtksourceview-marshal.h			\
-	gtksourceview-typebuiltins.h		\
 	gtksourcecompletionmodel.h		\
 	gtksourcecompletion-private.h		\
 	gtksourcecompletionutils.h		\
+	gtksourcecompletionwordsbuffer.h	\
+	gtksourcecompletionwordslibrary.h	\
+	gtksourcecompletionwordsproposal.h	\
+	gtksourcecompletionwordsutils.h		\
 	gtksourcecontextengine.h		\
 	gtksourceengine.h			\
 	gtksourcegutter-private.h		\
+	gtksourcegutterrendererlines.h		\
+	gtksourcegutterrenderermarks.h		\
+	gtksourcegutterrenderer-private.h	\
 	gtksourcelanguage-private.h		\
+	gtksourcepixbufhelper.h			\
 	gtksourceregex.h			\
 	gtksourcestyle-private.h		\
+	gtksourcetypes-private.h		\
 	gtksourceundomanagerdefault.h		\
 	gtksourceview-i18n.h			\
+	gtksourceview-marshal.h			\
+	gtksourceview-typebuiltins.h		\
 	gtksourceview-utils.h			\
-	gtktextregion.h				\
-	gtksourcepixbufhelper.h			\
-	gtksourcegutterrendererlines.h		\
-	gtksourcegutterrenderermarks.h		\
-	gtksourcegutterrenderer-private.h	\
-	gtksourcecompletionwordsbuffer.h	\
-	gtksourcecompletionwordslibrary.h	\
-	gtksourcecompletionwordsproposal.h	\
-	gtksourcecompletionwordsutils.h
+	gtktextregion.h
 
 update-sections: $(HFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 484c292..d8bc0e1 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -53,17 +53,18 @@ NOINST_H_FILES = \
 	gtksourcecontextengine.h		\
 	gtksourceengine.h			\
 	gtksourcegutter-private.h		\
+	gtksourcegutterrendererlines.h		\
+	gtksourcegutterrenderermarks.h		\
+	gtksourcegutterrenderer-private.h	\
 	gtksourcelanguage-private.h		\
+	gtksourcepixbufhelper.h			\
 	gtksourceregex.h			\
 	gtksourcestyle-private.h		\
+	gtksourcetypes-private.h		\
 	gtksourceundomanagerdefault.h		\
 	gtksourceview-i18n.h			\
 	gtksourceview-utils.h			\
-	gtktextregion.h				\
-	gtksourcepixbufhelper.h			\
-	gtksourcegutterrendererlines.h		\
-	gtksourcegutterrenderermarks.h		\
-	gtksourcegutterrenderer-private.h
+	gtktextregion.h
 
 libgtksourceview_c_files = \
 	gtksourcebuffer.c 		\
diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h
index 7b1c4d5..874bdaf 100644
--- a/gtksourceview/gtksourcecompletionmodel.h
+++ b/gtksourceview/gtksourcecompletionmodel.h
@@ -23,7 +23,8 @@
 #define __GTK_SOURCE_COMPLETION_MODEL_H__
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include "gtksourcetypes.h"
+#include "gtksourcetypes-private.h"
 
 G_BEGIN_DECLS
 
@@ -35,7 +36,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/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h
index ca1b753..dfb915f 100644
--- a/gtksourceview/gtksourcecontextengine.h
+++ b/gtksourceview/gtksourcecontextengine.h
@@ -23,8 +23,9 @@
 #ifndef __GTK_SOURCE_CONTEXT_ENGINE_H__
 #define __GTK_SOURCE_CONTEXT_ENGINE_H__
 
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourceengine.h>
+#include "gtksourceengine.h"
+#include "gtksourcetypes.h"
+#include "gtksourcetypes-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h
index 325cd6f..045a3f1 100644
--- a/gtksourceview/gtksourceengine.h
+++ b/gtksourceview/gtksourceengine.h
@@ -23,7 +23,8 @@
 #define __GTK_SOURCE_ENGINE_H__
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include "gtksourcetypes.h"
+#include "gtksourcetypes-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtksourcegutterrendererlines.h
index 299db30..e9ea223 100644
--- a/gtksourceview/gtksourcegutterrendererlines.h
+++ b/gtksourceview/gtksourcegutterrendererlines.h
@@ -22,9 +22,10 @@
 #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>
+#include "gtksourcetypes.h"
+#include "gtksourcetypes-private.h"
+#include "gtksourcegutterrenderertext.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h
index 4caa640..f0fabf7 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.h
+++ b/gtksourceview/gtksourcegutterrenderermarks.h
@@ -22,9 +22,10 @@
 #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>
+#include "gtksourcetypes.h"
+#include "gtksourcetypes-private.h"
+#include "gtksourcegutterrendererpixbuf.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcepixbufhelper.h b/gtksourceview/gtksourcepixbufhelper.h
index e44c5d6..d8961bf 100644
--- a/gtksourceview/gtksourcepixbufhelper.h
+++ b/gtksourceview/gtksourcepixbufhelper.h
@@ -23,7 +23,7 @@
 #define __GTK_SOURCE_PIXBUF_HELPER_H__
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include "gtksourcetypes-private.h"
 
 G_GNUC_INTERNAL
 GtkSourcePixbufHelper *gtk_source_pixbuf_helper_new (void);
diff --git a/gtksourceview/gtksourceregex.h b/gtksourceview/gtksourceregex.h
index a987118..630878a 100644
--- a/gtksourceview/gtksourceregex.h
+++ b/gtksourceview/gtksourceregex.h
@@ -24,7 +24,7 @@
 #define __GTK_SOURCE_REGEX_H__
 
 #include <glib.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include "gtksourcetypes-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h
new file mode 100644
index 0000000..475b294
--- /dev/null
+++ b/gtksourceview/gtksourcetypes-private.h
@@ -0,0 +1,40 @@
+/*
+ * gtksourcetypes-private.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_PRIVATE_H__
+#define __GTK_SOURCE_TYPES_PRIVATE_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GtkSourceCompletionModel	GtkSourceCompletionModel;
+typedef struct _GtkSourceContextEngine		GtkSourceContextEngine;
+typedef struct _GtkSourceEngine			GtkSourceEngine;
+typedef struct _GtkSourceGutterRendererLines	GtkSourceGutterRendererLines;
+typedef struct _GtkSourceGutterRendererMarks	GtkSourceGutterRendererMarks;
+typedef struct _GtkSourcePixbufHelper		GtkSourcePixbufHelper;
+typedef struct _GtkSourceRegex			GtkSourceRegex;
+typedef struct _GtkSourceUndoManagerDefault	GtkSourceUndoManagerDefault;
+
+G_END_DECLS
+
+#endif /* __GTK_SOURCE_TYPES_PRIVATE_H__ */
diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h
index 2c689e3..9a25813 100644
--- a/gtksourceview/gtksourcetypes.h
+++ b/gtksourceview/gtksourcetypes.h
@@ -33,25 +33,18 @@ typedef struct _GtkSourceCompletionInfo		GtkSourceCompletionInfo;
 typedef struct _GtkSourceCompletionItem		GtkSourceCompletionItem;
 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;
 
diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtksourceundomanagerdefault.h
index e6dd837..66a6cf6 100644
--- a/gtksourceview/gtksourceundomanagerdefault.h
+++ b/gtksourceview/gtksourceundomanagerdefault.h
@@ -26,7 +26,7 @@
 #define __GTK_SOURCE_UNDO_MANAGER_DEFAULT_H__
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include "gtksourcetypes-private.h"
 
 G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]