diff options
| author | Benjamin Otte <otte@redhat.com> | 2021-09-24 21:11:00 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2021-09-24 21:45:15 +0200 |
| commit | 60188116076c28420960209a5de0a2b205507ce3 (patch) | |
| tree | b0562b4995b43f04bd37fdfe0a9c12a31ae5ae31 | |
| parent | bb649d7d66af11f9c5e685f5d4ebbbf8fb62b0a5 (diff) | |
| download | gtk+-wip/otte/gdk-headers.tar.gz | |
gdk: Remove gdkinternals.hwip/otte/gdk-headers
| -rw-r--r-- | gdk/gdkcairo.c | 4 | ||||
| -rw-r--r-- | gdk/gdkcairoprivate.h | 2 | ||||
| -rw-r--r-- | gdk/gdkinternals.h | 2 | ||||
| -rw-r--r-- | gdk/gdksurface.c | 7 | ||||
| -rw-r--r-- | gtk/inspector/logs.c | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c index d728fec56f..ef8f5d2fb5 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -17,9 +17,7 @@ #include "config.h" -#include "gdkcairo.h" - -#include "gdkinternals.h" +#include "gdkcairoprivate.h" #include <math.h> diff --git a/gdk/gdkcairoprivate.h b/gdk/gdkcairoprivate.h index 2d1f22d11c..654dec25fa 100644 --- a/gdk/gdkcairoprivate.h +++ b/gdk/gdkcairoprivate.h @@ -18,6 +18,8 @@ #ifndef __GDK_CAIRO_PRIVATE_H__ #define __GDK_CAIRO_PRIVATE_H__ +#include "gdkcairo.h" + #include <gdk-pixbuf/gdk-pixbuf.h> #include <cairo.h> diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index d3559e46c5..1041f113df 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -27,7 +27,6 @@ #ifndef __GDK_INTERNALS_H__ #define __GDK_INTERNALS_H__ -#include <gdk-pixbuf/gdk-pixbuf.h> #include "gdkenumtypes.h" #include "gdkeventsprivate.h" #include "gdksurfaceprivate.h" @@ -36,7 +35,6 @@ #include "gdkdeviceprivate.h" #include "gdkseatprivate.h" #include "gdkdisplayprivate.h" -#include "gdkcairoprivate.h" #include "gdkglcontextprivate.h" #include "gdkdebug.h" diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 3f2b5189ff..d2031eaf8f 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -30,27 +30,24 @@ #include "gdksurface.h" #include "gdk-private.h" +#include "gdkcontentprovider.h" #include "gdkdeviceprivate.h" #include "gdkdisplayprivate.h" #include "gdkdragsurfaceprivate.h" #include "gdkeventsprivate.h" #include "gdkframeclockidleprivate.h" #include "gdkglcontextprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkmarshalers.h" #include "gdkpopupprivate.h" #include "gdkrectangle.h" #include "gdktoplevelprivate.h" +#include "gdkvulkancontext.h" #include <math.h> #include <epoxy/gl.h> -#ifdef GDK_WINDOWING_WAYLAND -#include "wayland/gdkwayland.h" -#endif - /** * GdkSurface: * diff --git a/gtk/inspector/logs.c b/gtk/inspector/logs.c index b8f22b9504..79f0f7e904 100644 --- a/gtk/inspector/logs.c +++ b/gtk/inspector/logs.c @@ -36,12 +36,12 @@ #include "gtkprivate.h" #include "gtkroot.h" #include "gtkdebug.h" -#include "gdkinternals.h" #include "gtknative.h" #include "gskdebugprivate.h" #include "gskrendererprivate.h" #include "gtkboxlayout.h" +#include "gdk/gdkdebug.h" struct _GtkInspectorLogs { |