[gtksourceview] Clean headers includes
- From: SÃbastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Clean headers includes
- Date: Sun, 25 Nov 2012 15:08:46 +0000 (UTC)
commit 61876d018619c4f8c743a52ad476ce8102b144f6
Author: SÃbastien Wilmet <swilmet gnome org>
Date: Thu Nov 22 23:40:06 2012 +0100
Clean headers includes
The types are now located in gtksourcetypes.h, so some headers includes
were useless. But when removing them, it was sometimes necessary to
re-include them in the .c files.
gtksourceview/gtksource.h | 1 +
gtksourceview/gtksourcebuffer.c | 3 +++
gtksourceview/gtksourcebuffer.h | 4 ----
gtksourceview/gtksourcecompletion.c | 18 ++++++++++++------
gtksourceview/gtksourcecompletion.h | 5 -----
gtksourceview/gtksourcecompletioncontext.h | 1 -
gtksourceview/gtksourcecompletioninfo.h | 1 -
gtksourceview/gtksourcecompletionitem.c | 4 ++--
gtksourceview/gtksourcecompletionitem.h | 2 +-
gtksourceview/gtksourcecompletionmodel.c | 1 +
gtksourceview/gtksourcecompletionmodel.h | 2 --
gtksourceview/gtksourcecompletionprovider.c | 4 +++-
gtksourceview/gtksourcecompletionprovider.h | 6 ------
gtksourceview/gtksourcecompletionutils.c | 1 +
gtksourceview/gtksourcecontextengine.c | 2 ++
gtksourceview/gtksourcecontextengine.h | 1 -
gtksourceview/gtksourceengine.c | 2 +-
gtksourceview/gtksourceengine.h | 1 -
gtksourceview/gtksourcegutter.h | 3 ---
gtksourceview/gtksourcegutterrenderer.h | 2 --
gtksourceview/gtksourcegutterrenderermarks.c | 2 ++
gtksourceview/gtksourcelanguage.h | 2 --
gtksourceview/gtksourcelanguagemanager.h | 1 -
gtksourceview/gtksourcemarkattributes.c | 1 +
gtksourceview/gtksourcemarkattributes.h | 1 -
gtksourceview/gtksourceprintcompositor.c | 2 ++
gtksourceview/gtksourceprintcompositor.h | 1 -
gtksourceview/gtksourcestylescheme.h | 1 -
gtksourceview/gtksourcestyleschememanager.h | 1 +
gtksourceview/gtksourceview.c | 3 +++
gtksourceview/gtksourceview.h | 4 ----
tests/test-languagemanager.c | 2 +-
tests/test-printcompositor.c | 2 +-
tests/test-widget.c | 8 ++------
34 files changed, 40 insertions(+), 55 deletions(-)
---
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index 2ca35bc..31a5919 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -42,5 +42,6 @@
#include <gtksourceview/gtksourcestyleschememanager.h>
#include <gtksourceview/gtksourceundomanager.h>
#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksourceview-typebuiltins.h>
#endif /* __GTK_SOURCE_H__ */
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index d26a22f..af23e56 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -31,14 +31,17 @@
#include <gtk/gtk.h>
#include "gtksourceview-i18n.h"
+#include "gtksourcelanguage.h"
#include "gtksourcelanguage-private.h"
#include "gtksourcebuffer.h"
#include "gtksourceundomanager.h"
#include "gtksourceview-marshal.h"
+#include "gtksourcestylescheme.h"
#include "gtksourcestyleschememanager.h"
#include "gtksourcestyle-private.h"
#include "gtksourceundomanagerdefault.h"
#include "gtksourceview-typebuiltins.h"
+#include "gtksourcemark.h"
/**
* SECTION:buffer
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h
index c4443b2..80b365e 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtksourcebuffer.h
@@ -27,10 +27,6 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcemark.h>
-#include <gtksourceview/gtksourcestylescheme.h>
-#include <gtksourceview/gtksourceundomanager.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 0d925f5..303685c 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -27,17 +27,23 @@
*
*/
+#include <stdarg.h>
+#include <string.h>
#include <gdk/gdkkeysyms.h>
-#include "gtksourcecompletionutils.h"
+
#include "gtksourceview-marshal.h"
-#include <gtksourceview/gtksourcecompletion.h>
#include "gtksourceview-i18n.h"
+
+#include "gtksourceview.h"
+#include "gtksourcebuffer.h"
+#include "gtksourcecompletion.h"
+#include "gtksourcecompletionutils.h"
#include "gtksourcecompletionmodel.h"
-#include <string.h>
-#include <gtksourceview/gtksourceview.h>
-#include "gtksourcecompletion-private.h"
#include "gtksourcecompletioncontext.h"
-#include <stdarg.h>
+#include "gtksourcecompletioninfo.h"
+#include "gtksourcecompletionproposal.h"
+#include "gtksourcecompletionprovider.h"
+#include "gtksourcecompletion-private.h"
#define WINDOW_WIDTH 350
#define WINDOW_HEIGHT 200
diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h
index 2f97c46..116b76e 100644
--- a/gtksourceview/gtksourcecompletion.h
+++ b/gtksourceview/gtksourcecompletion.h
@@ -25,11 +25,6 @@
#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>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h
index a3db455..38fccd7 100644
--- a/gtksourceview/gtksourcecompletioncontext.h
+++ b/gtksourceview/gtksourcecompletioncontext.h
@@ -22,7 +22,6 @@
#ifndef __GTK_SOURCE_COMPLETION_CONTEXT_H__
#define __GTK_SOURCE_COMPLETION_CONTEXT_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h
index 2e237fe..d12325b 100644
--- a/gtksourceview/gtksourcecompletioninfo.h
+++ b/gtksourceview/gtksourcecompletioninfo.h
@@ -23,7 +23,6 @@
#ifndef __GTK_SOURCE_COMPLETION_INFO_H__
#define __GTK_SOURCE_COMPLETION_INFO_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c
index 5560fb2..85a07de 100644
--- a/gtksourceview/gtksourcecompletionitem.c
+++ b/gtksourceview/gtksourcecompletionitem.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <gtksourceview/gtksourcecompletionitem.h>
-
+#include "gtksourcecompletionitem.h"
+#include "gtksourcecompletionproposal.h"
#include "gtksourcecompletionutils.h"
#include "gtksourceview-i18n.h"
diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h
index 53715e8..bd62c97 100644
--- a/gtksourceview/gtksourcecompletionitem.h
+++ b/gtksourceview/gtksourcecompletionitem.h
@@ -23,8 +23,8 @@
#define __GTK_SOURCE_COMPLETION_ITEM_H__
#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcecompletionmodel.c b/gtksourceview/gtksourcecompletionmodel.c
index 4366d06..733c6b2 100644
--- a/gtksourceview/gtksourcecompletionmodel.c
+++ b/gtksourceview/gtksourcecompletionmodel.c
@@ -22,6 +22,7 @@
#include "gtksourcecompletionmodel.h"
#include "gtksourceview-i18n.h"
#include "gtksourcecompletionprovider.h"
+#include "gtksourcecompletionproposal.h"
#define GTK_SOURCE_COMPLETION_MODEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModelPrivate))
diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h
index 10c4b97..f6c365d 100644
--- a/gtksourceview/gtksourcecompletionmodel.h
+++ b/gtksourceview/gtksourcecompletionmodel.h
@@ -24,8 +24,6 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcecompletionprovider.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcecompletionprovider.c b/gtksourceview/gtksourcecompletionprovider.c
index 73a4a04..16b3317 100644
--- a/gtksourceview/gtksourcecompletionprovider.c
+++ b/gtksourceview/gtksourcecompletionprovider.c
@@ -30,7 +30,9 @@
*
*/
-#include <gtksourceview/gtksourcecompletionprovider.h>
+#include "gtksourcecompletionprovider.h"
+#include "gtksourcecompletionproposal.h"
+#include "gtksourcecompletioninfo.h"
typedef GtkSourceCompletionProviderIface GtkSourceCompletionProviderInterface;
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h
index 3819e12..64da830 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtksourcecompletionprovider.h
@@ -23,13 +23,7 @@
#ifndef __GTK_SOURCE_COMPLETION_PROVIDER_H__
#define __GTK_SOURCE_COMPLETION_PROVIDER_H__
-#include <glib.h>
-#include <glib-object.h>
#include <gtk/gtk.h>
-
-#include <gtksourceview/gtksourcecompletionproposal.h>
-#include <gtksourceview/gtksourcecompletioninfo.h>
-#include <gtksourceview/gtksourcelanguage.h>
#include <gtksourceview/gtksourcecompletioncontext.h>
#include <gtksourceview/gtksourcetypes.h>
diff --git a/gtksourceview/gtksourcecompletionutils.c b/gtksourceview/gtksourcecompletionutils.c
index 24029f9..a605ad0 100644
--- a/gtksourceview/gtksourcecompletionutils.c
+++ b/gtksourceview/gtksourcecompletionutils.c
@@ -22,6 +22,7 @@
#include <string.h>
#include "gtksourcecompletionutils.h"
+#include "gtksourcebuffer.h"
/**
* gtk_source_completion_utils_is_separator:
diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c
index 810133e..907ab3c 100644
--- a/gtksourceview/gtksourcecontextengine.c
+++ b/gtksourceview/gtksourcecontextengine.c
@@ -25,11 +25,13 @@
#include "gtksourceview-i18n.h"
#include "gtksourcecontextengine.h"
#include "gtktextregion.h"
+#include "gtksourcelanguage.h"
#include "gtksourcelanguage-private.h"
#include "gtksourcebuffer.h"
#include "gtksourceregex.h"
#include "gtksourcestyle-private.h"
#include "gtksourceview-utils.h"
+#include "gtksourcestylescheme.h"
#undef ENABLE_DEBUG
#undef ENABLE_PROFILE
diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h
index 7b8b5cf..c5ac131 100644
--- a/gtksourceview/gtksourcecontextengine.h
+++ b/gtksourceview/gtksourcecontextengine.h
@@ -25,7 +25,6 @@
#include <gtksourceview/gtksourcetypes.h>
#include <gtksourceview/gtksourceengine.h>
-#include <gtksourceview/gtksourcelanguage.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourceengine.c b/gtksourceview/gtksourceengine.c
index faad39d..be8efb9 100644
--- a/gtksourceview/gtksourceengine.c
+++ b/gtksourceview/gtksourceengine.c
@@ -25,7 +25,7 @@
#include "gtksourcebuffer.h"
#include "gtksourceengine.h"
-
+#include "gtksourcestylescheme.h"
G_DEFINE_TYPE (GtkSourceEngine, _gtk_source_engine, G_TYPE_OBJECT)
diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h
index abc515f..e3b8a82 100644
--- a/gtksourceview/gtksourceengine.h
+++ b/gtksourceview/gtksourceengine.h
@@ -24,7 +24,6 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcestylescheme.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h
index e906348..f0973cd 100644
--- a/gtksourceview/gtksourcegutter.h
+++ b/gtksourceview/gtksourcegutter.h
@@ -23,11 +23,8 @@
#ifndef __GTK_SOURCE_GUTTER_H__
#define __GTK_SOURCE_GUTTER_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-#include <gdk/gdk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index fe59568..a045da6 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -22,9 +22,7 @@
#ifndef __GTK_SOURCE_GUTTER_RENDERER_H__
#define __GTK_SOURCE_GUTTER_RENDERER_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-#include <gdk/gdk.h>
#include <gtksourceview/gtksourcetypes.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcegutterrenderermarks.c b/gtksourceview/gtksourcegutterrenderermarks.c
index bd90bfd..2190753 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.c
+++ b/gtksourceview/gtksourcegutterrenderermarks.c
@@ -21,7 +21,9 @@
#include "gtksourcegutterrenderermarks.h"
#include "gtksourceview.h"
+#include "gtksourcebuffer.h"
#include "gtksourcemarkattributes.h"
+#include "gtksourcemark.h"
#define COMPOSITE_ALPHA 225
diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h
index 1baf5f1..bab8cb2 100644
--- a/gtksourceview/gtksourcelanguage.h
+++ b/gtksourceview/gtksourcelanguage.h
@@ -22,8 +22,6 @@
#ifndef __GTK_SOURCE_LANGUAGE_H__
#define __GTK_SOURCE_LANGUAGE_H__
-#include <glib.h>
-#include <glib-object.h>
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
index 00f3880..5687621 100644
--- a/gtksourceview/gtksourcelanguagemanager.h
+++ b/gtksourceview/gtksourcelanguagemanager.h
@@ -23,7 +23,6 @@
#define __GTK_SOURCE_LANGUAGE_MANAGER_H__
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcelanguage.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c
index a9087ed..cbd3e2a 100644
--- a/gtksourceview/gtksourcemarkattributes.c
+++ b/gtksourceview/gtksourcemarkattributes.c
@@ -21,6 +21,7 @@
*/
#include "gtksourcemarkattributes.h"
+#include "gtksourcemark.h"
#include "gtksourceview-i18n.h"
#include "gtksourcepixbufhelper.h"
#include "gtksourceview-marshal.h"
diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h
index 9d711a0..e51b1bb 100644
--- a/gtksourceview/gtksourcemarkattributes.h
+++ b/gtksourceview/gtksourcemarkattributes.h
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcemark.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtksourceprintcompositor.c
index 5026b38..f7e648d 100644
--- a/gtksourceview/gtksourceprintcompositor.c
+++ b/gtksourceview/gtksourceprintcompositor.c
@@ -32,6 +32,8 @@
#include "gtksourceview-i18n.h"
#include "gtksourceprintcompositor.h"
+#include "gtksourceview.h"
+#include "gtksourcebuffer.h"
/**
* SECTION:printcompositor
diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h
index 5a67f72..5bd18c5 100644
--- a/gtksourceview/gtksourceprintcompositor.h
+++ b/gtksourceview/gtksourceprintcompositor.h
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourceview.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
index 3d49d25..fd66129 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtksourcestylescheme.h
@@ -24,7 +24,6 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcestyle.h>
G_BEGIN_DECLS
diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
index 4240ba3..7e0bfd4 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 <glib-object.h>
#include <gtksourceview/gtksourcetypes.h>
#include <gtksourceview/gtksourcestylescheme.h>
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index bb3bbed..53c5fd6 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -37,7 +37,10 @@
#include "gtksourceview-marshal.h"
#include "gtksourceview-typebuiltins.h"
#include "gtksourcemark.h"
+#include "gtksourcemarkattributes.h"
#include "gtksourceview.h"
+#include "gtksourcestylescheme.h"
+#include "gtksourcecompletionprovider.h"
#include "gtksourcecompletion-private.h"
#include "gtksourcecompletionutils.h"
#include "gtksourcegutter-private.h"
diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h
index 77e8ca8..4ca73cd 100644
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtksourceview.h
@@ -25,10 +25,6 @@
#define __GTK_SOURCE_VIEW_H__
#include <gtk/gtk.h>
-
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcegutter.h>
-#include <gtksourceview/gtksourcemarkattributes.h>
#include <gtksourceview/gtksourcetypes.h>
G_BEGIN_DECLS
diff --git a/tests/test-languagemanager.c b/tests/test-languagemanager.c
index 07fdc13..dc34a8b 100644
--- a/tests/test-languagemanager.c
+++ b/tests/test-languagemanager.c
@@ -2,7 +2,7 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksource.h>
static void
test_get_default (void)
diff --git a/tests/test-printcompositor.c b/tests/test-printcompositor.c
index cb8f930..c227fd8 100644
--- a/tests/test-printcompositor.c
+++ b/tests/test-printcompositor.c
@@ -2,7 +2,7 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
+#include <gtksourceview/gtksource.h>
static void
test_buffer_ref (void)
diff --git a/tests/test-widget.c b/tests/test-widget.c
index 256bb1e..da64cf9 100644
--- a/tests/test-widget.c
+++ b/tests/test-widget.c
@@ -30,12 +30,8 @@
#include <stdlib.h>
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
-#include <gtksourceview/gtksourceview-typebuiltins.h>
+#include <gtksourceview/gtksource.h>
+
#ifdef TEST_XML_MEM
#include <libxml/xmlreader.h>
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]