diff options
47 files changed, 46 insertions, 46 deletions
diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c index bd221f5442..9c9e2eda79 100644 --- a/gdk/broadway/gdkbroadway-server.c +++ b/gdk/broadway/gdkbroadway-server.c @@ -13,7 +13,7 @@ #include "gdkbroadway-server.h" #include "gdkprivate-broadway.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <gdk/gdktextureprivate.h> diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c index 1f82ef46d7..f6dca4d296 100644 --- a/gdk/broadway/gdkdisplay-broadway.c +++ b/gdk/broadway/gdkdisplay-broadway.c @@ -32,7 +32,7 @@ #include "gdkdevice-broadway.h" #include "gdkdeviceprivate.h" #include <gdk/gdktextureprivate.h> -#include "gdk-private.h" +#include "gdkprivate.h" #include <glib.h> #include <glib/gprintf.h> @@ -33,7 +33,7 @@ #include "gdkdisplay.h" #include "gdkglcontextprivate.h" #include "gdkintl.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <glib/gprintf.h> #include <string.h> diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c index 2600999f2a..e6174c83c4 100644 --- a/gdk/gdkclipboard.c +++ b/gdk/gdkclipboard.c @@ -29,7 +29,7 @@ #include "gdkintl.h" #include "gdkpipeiostreamprivate.h" #include "gdktexture.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <gobject/gvaluecollector.h> diff --git a/gdk/gdkcontentprovider.c b/gdk/gdkcontentprovider.c index f4d6d316a6..4f1c356226 100644 --- a/gdk/gdkcontentprovider.c +++ b/gdk/gdkcontentprovider.c @@ -23,7 +23,7 @@ #include "gdkclipboard.h" #include "gdkcontentformats.h" #include "gdkintl.h" -#include "gdk-private.h" +#include "gdkprivate.h" /** * GdkContentProvider: diff --git a/gdk/gdkcontentproviderimpl.c b/gdk/gdkcontentproviderimpl.c index 8856e0b397..d11601823c 100644 --- a/gdk/gdkcontentproviderimpl.c +++ b/gdk/gdkcontentproviderimpl.c @@ -27,7 +27,7 @@ #include "gdkintl.h" #include "gdkcontentproviderimpl.h" -#include "gdk-private.h" +#include "gdkprivate.h" #define GDK_TYPE_CONTENT_PROVIDER_VALUE (gdk_content_provider_value_get_type ()) #define GDK_CONTENT_PROVIDER_VALUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_CONTENT_PROVIDER_VALUE, GdkContentProviderValue)) diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 4e25150bfa..6b2f0b720a 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -25,7 +25,7 @@ #include "gdkdisplayprivate.h" #include "gdkintl.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkapplaunchcontext.h" #include "gdkclipboardprivate.h" diff --git a/gdk/gdkdragsurface.c b/gdk/gdkdragsurface.c index ec5431b03e..e00be8c2ca 100644 --- a/gdk/gdkdragsurface.c +++ b/gdk/gdkdragsurface.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkdragsurfaceprivate.h" #include "gdkintl.h" diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 747a187f9c..627da7373b 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -31,7 +31,7 @@ #include "gdkintl.h" #include "gdkkeysprivate.h" #include "gdkkeysyms.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <gobject/gvaluecollector.h> diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index d0412f97ea..40ca763292 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -28,7 +28,7 @@ #include "gdkdebugprivate.h" #include "gdkframeclockprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkprofilerprivate.h" #ifdef G_OS_WIN32 diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index dd2ca5fa38..e44a192ccd 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -83,7 +83,7 @@ #include "gdkmemorytextureprivate.h" #include "gdkprofilerprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" #ifdef GDK_WINDOWING_WIN32 # include "gdk/win32/gdkwin32.h" diff --git a/gdk/gdkpaintable.c b/gdk/gdkpaintable.c index c6e64a4fdb..adba8b161b 100644 --- a/gdk/gdkpaintable.c +++ b/gdk/gdkpaintable.c @@ -22,7 +22,7 @@ #include "gdkpaintable.h" #include "gdksnapshotprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" /* HACK: So we don't need to include any (not-yet-created) GSK or GTK headers */ void gtk_snapshot_push_debug (GdkSnapshot *snapshot, diff --git a/gdk/gdkpopup.c b/gdk/gdkpopup.c index 9c69325175..8388078086 100644 --- a/gdk/gdkpopup.c +++ b/gdk/gdkpopup.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkintl.h" #include "gdkpopupprivate.h" diff --git a/gdk/gdk-private.h b/gdk/gdkprivate.h index 3c125a9a2c..3c125a9a2c 100644 --- a/gdk/gdk-private.h +++ b/gdk/gdkprivate.h diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 239dbb33aa..277ec59513 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -29,7 +29,7 @@ #include "gdksurface.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkcontentprovider.h" #include "gdkdeviceprivate.h" #include "gdkdisplayprivate.h" diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c index e64905355a..5e5ce4aa50 100644 --- a/gdk/gdktoplevel.c +++ b/gdk/gdktoplevel.c @@ -24,7 +24,7 @@ #include "gdkdisplay.h" #include "gdkenumtypes.h" #include "gdkintl.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <graphene-gobject.h> #include <math.h> diff --git a/gdk/macos/gdkdisplaylinksource.c b/gdk/macos/gdkdisplaylinksource.c index f3aefc14fb..689b78786d 100644 --- a/gdk/macos/gdkdisplaylinksource.c +++ b/gdk/macos/gdkdisplaylinksource.c @@ -29,7 +29,7 @@ #include "gdkdebugprivate.h" #include "gdkmacoseventsource-private.h" #include "gdkmacosmonitor-private.h" -#include "gdk-private.h" +#include "gdkprivate.h" static gint64 host_to_frame_clock_time (gint64 val); diff --git a/gdk/macos/gdkmacosclipboard.c b/gdk/macos/gdkmacosclipboard.c index ba755db0be..25f4669efb 100644 --- a/gdk/macos/gdkmacosclipboard.c +++ b/gdk/macos/gdkmacosclipboard.c @@ -23,7 +23,7 @@ #include "gdkmacosclipboard-private.h" #include "gdkmacosutils-private.h" -#include "gdk-private.h" +#include "gdkprivate.h" struct _GdkMacosClipboard { diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c index c9e2dd19a6..210867eb59 100644 --- a/gdk/macos/gdkmacosdrag.c +++ b/gdk/macos/gdkmacosdrag.c @@ -30,7 +30,7 @@ #include "gdk/gdkeventsprivate.h" #include "gdk/gdkintl.h" #include "gdk/gdkseatprivate.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #define BIG_STEP 20 #define SMALL_STEP 1 diff --git a/gdk/macos/gdkmacoseventsource.c b/gdk/macos/gdkmacoseventsource.c index f0a539512b..a60fb558c9 100644 --- a/gdk/macos/gdkmacoseventsource.c +++ b/gdk/macos/gdkmacoseventsource.c @@ -32,7 +32,7 @@ #include "gdkmacosdisplay-private.h" #include "gdk/gdkeventsprivate.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" /* * This file implementations integration between the GLib main loop and diff --git a/gdk/macos/gdkmacosseat.c b/gdk/macos/gdkmacosseat.c index b555002dd4..a9fe5f5b97 100644 --- a/gdk/macos/gdkmacosseat.c +++ b/gdk/macos/gdkmacosseat.c @@ -28,7 +28,7 @@ #include "gdkmacosdevice.h" #include "gdkmacosseat-private.h" -#include "gdk-private.h" +#include "gdkprivate.h" typedef struct { diff --git a/gdk/wayland/gdkclipboard-wayland.c b/gdk/wayland/gdkclipboard-wayland.c index 2cca02e499..1fce61f8a7 100644 --- a/gdk/wayland/gdkclipboard-wayland.c +++ b/gdk/wayland/gdkclipboard-wayland.c @@ -23,7 +23,7 @@ #include "gdkcontentformats.h" #include "gdkintl.h" #include "gdkprivate-wayland.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <glib-unix.h> #include <gio/gunixinputstream.h> diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 1e7bf8531f..cd314b6d67 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -36,7 +36,7 @@ #include "gdksurfaceprivate.h" #include "gdktypes.h" #include "gdkwayland.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "pointer-gestures-unstable-v1-client-protocol.h" #include "tablet-unstable-v2-client-protocol.h" diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index ab185ad49a..c1881bfb42 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -56,7 +56,7 @@ #include "wm-button-layout-translation.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" /* Keep g_assert() defined even if we disable it globally, * as we use it in many places as a handy mechanism to check diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c index a7a51c535f..745e841f1a 100644 --- a/gdk/wayland/gdkglcontext-wayland.c +++ b/gdk/wayland/gdkglcontext-wayland.c @@ -31,7 +31,7 @@ #include "gdkwaylandsurface.h" #include "gdkprivate-wayland.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdksurfaceprivate.h" #include "gdkprofilerprivate.h" diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c index 7107fbe192..b546fa0012 100644 --- a/gdk/wayland/gdkkeys-wayland.c +++ b/gdk/wayland/gdkkeys-wayland.c @@ -36,7 +36,7 @@ #include "gdkwayland.h" #include "gdkprivate-wayland.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkkeysprivate.h" #include <xkbcommon/xkbcommon.h> diff --git a/gdk/wayland/gdkprimary-wayland.c b/gdk/wayland/gdkprimary-wayland.c index f21dd2cc0e..2c5aaa05ff 100644 --- a/gdk/wayland/gdkprimary-wayland.c +++ b/gdk/wayland/gdkprimary-wayland.c @@ -23,7 +23,7 @@ #include "gdkcontentformats.h" #include "gdkintl.h" #include "gdkprivate-wayland.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <glib-unix.h> #include <gio/gunixinputstream.h> diff --git a/gdk/win32/gdkclipboard-win32.c b/gdk/win32/gdkclipboard-win32.c index 4419f36d74..58be9680a2 100644 --- a/gdk/win32/gdkclipboard-win32.c +++ b/gdk/win32/gdkclipboard-win32.c @@ -24,7 +24,7 @@ #include "gdkintl.h" #include "gdkprivate-win32.h" #include "gdkhdataoutputstream-win32.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #include <string.h> diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c index c2370c0509..6792cc4004 100644 --- a/gdk/win32/gdkclipdrop-win32.c +++ b/gdk/win32/gdkclipdrop-win32.c @@ -287,7 +287,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server #include "gdk/gdkdebugprivate.h" #include "gdk/gdkdragprivate.h" #include "gdk/gdkintl.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0]) #define HIDA_GetPIDLItem(pida, i) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[i+1]) diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 68bfbed814..a7bda515d9 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -30,7 +30,7 @@ #include "gdkeventsprivate.h" #include "gdkseatprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <fcntl.h> #include <io.h> diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 6f88df0958..f85aca6506 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -65,7 +65,7 @@ #include "gdkdisplay-win32.h" //#include "gdkselection-win32.h" #include "gdkdragprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <windowsx.h> diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c index c21c478ec5..add9bc963c 100644 --- a/gdk/x11/gdkapplaunchcontext-x11.c +++ b/gdk/x11/gdkapplaunchcontext-x11.c @@ -25,7 +25,7 @@ #include "gdkintl.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <glib.h> #ifdef HAVE_DESKTOPAPPINFO diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c index 6f28074a95..9d2404544b 100644 --- a/gdk/x11/gdkasync.c +++ b/gdk/x11/gdkasync.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. #include "gdkasync.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <X11/Xlibint.h> diff --git a/gdk/x11/gdkclipboard-x11.c b/gdk/x11/gdkclipboard-x11.c index b81755481c..02047e265e 100644 --- a/gdk/x11/gdkclipboard-x11.c +++ b/gdk/x11/gdkclipboard-x11.c @@ -26,7 +26,7 @@ #include "gdkselectioninputstream-x11.h" #include "gdkselectionoutputstream-x11.h" #include "gdktextlistconverter-x11.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #include <string.h> #include <X11/Xatom.h> diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index a068b00929..426c14fd0f 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -26,7 +26,7 @@ #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <stdlib.h> #include <X11/Xlib.h> diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index cfa0e3474e..5a9c9a6886 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -47,7 +47,7 @@ #include "gdkscreen-x11.h" #include "gdkvulkancontext-x11.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <glib.h> #include <glib/gprintf.h> diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index 2e1a2870ee..2b82ea4978 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -26,7 +26,7 @@ #include "gdkx11dnd.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkasync.h" #include "gdkclipboardprivate.h" #include "gdkclipboard-x11.h" diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c index 33a2afb83c..c41301065e 100644 --- a/gdk/x11/gdkdrop-x11.c +++ b/gdk/x11/gdkdrop-x11.c @@ -26,7 +26,7 @@ #include "gdkdropprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include "gdkasync.h" #include "gdkclipboardprivate.h" #include "gdkclipboard-x11.h" diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 93bb4312b4..9047357836 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -30,7 +30,7 @@ #include "gdkkeysyms.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <stdio.h> #include <stdlib.h> diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index e21ba9b5b6..86c84d3fd4 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -42,7 +42,7 @@ #include "gdktextureprivate.h" #include "gdkseatprivate.h" -#include "gdk-private.h" +#include "gdkprivate.h" #include <graphene.h> #include <stdlib.h> diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c index cda64af2fa..f3f183c3ef 100644 --- a/gsk/gskdebug.c +++ b/gsk/gskdebug.c @@ -1,7 +1,7 @@ #include "config.h" #include "gskdebugprivate.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" static const GdkDebugKey gsk_debug_keys[] = { { "renderer", GSK_DEBUG_RENDERER, "General renderer information" }, diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c index ef5158313f..36505cd24e 100644 --- a/gsk/gskrendernodeimpl.c +++ b/gsk/gskrendernodeimpl.c @@ -29,7 +29,7 @@ #include "gdk/gdktextureprivate.h" #include "gdk/gdkmemoryformatprivate.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #include <hb-ot.h> diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index ca351e0b96..14fb06fdc9 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -25,7 +25,7 @@ #include "config.h" #include "gdk/gdk.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #include "gdk/gdkprofilerprivate.h" #include "gsk/gskprivate.h" #include "gsk/gskrendernodeprivate.h" diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index dcf2b69f52..363135d807 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -27,7 +27,7 @@ #include <glib-object.h> #include <gdk/gdk.h> -#include <gdk/gdk-private.h> +#include <gdk/gdkprivate.h> #include <gdk/gdkdebugprivate.h> #include "gtkcsstypesprivate.h" diff --git a/gtk/gtkroot.c b/gtk/gtkroot.c index d8b1102016..ed1853b578 100644 --- a/gtk/gtkroot.c +++ b/gtk/gtkroot.c @@ -24,7 +24,7 @@ #include "gtknativeprivate.h" #include "gtkcssnodeprivate.h" #include "gtkwidgetprivate.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #include "gtkprivate.h" #include "gtkintl.h" diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index aeeba2ac6f..4ece91ffbe 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -30,7 +30,7 @@ #include "gtkversion.h" #include "gtkwidgetprivate.h" -#include "gdk/gdk-private.h" +#include "gdk/gdkprivate.h" #include <string.h> diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 6cfc39d494..cdf100e4fe 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -67,7 +67,7 @@ #include "gtktextmarkprivate.h" #include "gtktextsegment.h" #include "gtkpango.h" -#include "gdk-private.h" +#include "gdkprivate.h" /* * Types |