[gtk+] gdk: Include gio.h in gdktypes.h
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Include gio.h in gdktypes.h
- Date: Sun, 10 Dec 2017 00:59:39 +0000 (UTC)
commit 815cd0ed687f581f8693ad0c24f14377c0bdeb74
Author: Benjamin Otte <otte redhat com>
Date: Tue Dec 5 15:44:00 2017 +0100
gdk: Include gio.h in gdktypes.h
It's where we include all our external dependencies.
This way, we don't have to include it in all headers again and again.
gdk/gdkapplaunchcontext.h | 1 -
gdk/gdkapplaunchcontextprivate.h | 1 -
gdk/gdkcontentdeserializer.h | 1 -
gdk/gdkcontentprovider.h | 1 -
gdk/gdkcontentserializer.h | 1 -
gdk/gdkinternals.h | 1 -
gdk/gdktypes.h | 3 ++-
7 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 9c9d739..a99ebef 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -25,7 +25,6 @@
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#include <gio/gio.h>
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkapplaunchcontextprivate.h b/gdk/gdkapplaunchcontextprivate.h
index bfb3925..9a2bb71 100644
--- a/gdk/gdkapplaunchcontextprivate.h
+++ b/gdk/gdkapplaunchcontextprivate.h
@@ -18,7 +18,6 @@
#ifndef __GDK_APP_LAUNCH_CONTEXT_PRIVATE_H__
#define __GDK_APP_LAUNCH_CONTEXT_PRIVATE_H__
-#include <gio/gio.h>
#include "gdkapplaunchcontext.h"
#include "gdktypes.h"
diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h
index 671d540..b08d498 100644
--- a/gdk/gdkcontentdeserializer.h
+++ b/gdk/gdkcontentdeserializer.h
@@ -25,7 +25,6 @@
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
-#include <gio/gio.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h
index 1ce1962..b33f266 100644
--- a/gdk/gdkcontentprovider.h
+++ b/gdk/gdkcontentprovider.h
@@ -25,7 +25,6 @@
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
-#include <gio/gio.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h
index 428ddad..8b6dcf7 100644
--- a/gdk/gdkcontentserializer.h
+++ b/gdk/gdkcontentserializer.h
@@ -25,7 +25,6 @@
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
-#include <gio/gio.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 85d51a0..097b02c 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -27,7 +27,6 @@
#ifndef __GDK_INTERNALS_H__
#define __GDK_INTERNALS_H__
-#include <gio/gio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkwindowimpl.h"
#include "gdkdisplay.h"
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index c362634..533bdfa 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -32,9 +32,10 @@
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
-#include <pango/pango.h>
#include <glib-object.h>
+#include <gio/gio.h>
#include <cairo.h>
+#include <pango/pango.h>
/* The system specific file gdkconfig.h contains such configuration
* settings that are needed not only when compiling GDK (or GTK)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]