Rename gdk-private.h to gdkprivate.h

The extra - does not add any value.

diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c
index bd221f54424682dcfbc27ff410ef2155e4e728e2..9c9e2eda79cb2fb0ae3f004356b3f8da63284885 100644 (file)
--- 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 1f82ef46d70b583b2a3a7635eb48cb5176a42c32..f6dca4d296965197c4eb82f10ecb5ef200e77536 100644 (file)
--- 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>

diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
deleted file mode 100644 (file)
index 3c125a9..0000000
--- a/gdk/gdk-private.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef __GDK__PRIVATE_H__
-#define __GDK__PRIVATE_H__
-
-#include "gdk/gdktypes.h"
-
-/* Private API for use in GTK+ */
-
-GdkDisplay *    gdk_display_open_default        (void);
-
-gboolean        gdk_device_grab_info            (GdkDisplay  *display,
-                                                 GdkDevice   *device,
-                                                 GdkSurface  **grab_surface,
-                                                 gboolean    *owner_events);
-
-void            gdk_pre_parse                   (void);
-
-gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
-
-void gdk_display_set_double_click_time     (GdkDisplay   *display,
-                                            guint         msec);
-void gdk_display_set_double_click_distance (GdkDisplay   *display,
-                                            guint         distance);
-void gdk_display_set_cursor_theme          (GdkDisplay   *display,
-                                            const char   *theme,
-                                            int           size);
-gboolean gdk_running_in_sandbox (void);
-gboolean gdk_should_use_portal (void);
-
-const char *   gdk_get_startup_notification_id (void);
-
-PangoDirection gdk_unichar_direction (gunichar    ch) G_GNUC_CONST;
-PangoDirection gdk_find_base_dir     (const char *text,
-                                      int         len);
-
-typedef struct
-{
-  const char *key;
-  guint value;
-  const char *help;
-  gboolean always_enabled;
-} GdkDebugKey;
-
-guint gdk_parse_debug_var (const char        *variable,
-                           const GdkDebugKey *keys,
-                           guint              nkeys);
-
-/* Backward compatibility shim, to avoid bumping up the minimum
- * required version of GLib; most of our uses of g_memdup() are
- * safe, and those that aren't have been fixed
- */
-#if !GLIB_CHECK_VERSION (2, 67, 3)
-# define g_memdup2(mem,size)    g_memdup((mem),(size))
-#endif
-
-void gdk_source_set_static_name_by_id (guint       tag,
-                                       const char *name);
-
-#if !GLIB_CHECK_VERSION(2, 69, 1)
-#define g_source_set_static_name(source, name) g_source_set_name ((source), (name))
-#endif
-
-#ifndef I_
-#define I_(string) g_intern_static_string (string)
-#endif
-
-#endif /* __GDK__PRIVATE_H__ */

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 12d06ac6066e1b2885b04340c65f3c642fe28aa2..c6371b724fff82ee60d720c885e0843484b20f32 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -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 2600999f2a0694068da76a816765fc8b052fd6dd..e6174c83c42466c57ff78a36b71c38f2c8723f5f 100644 (file)
--- 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 f4d6d316a644159cc99ee517afea0a6da80c07d6..4f1c356226bec927dffcd39a1fd76bb036fe8978 100644 (file)
--- 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 8856e0b39746669f5cd65eca8815b9f40d67b3f4..d11601823cf418f156d15ca7667d831fe84c4fb0 100644 (file)
--- 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 4e25150bfac747988b7ae5ec106f788da30f0be3..6b2f0b720ac06c42b1c42a16c0bab2920268697f 100644 (file)
--- 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 ec5431b03e954bfcd3c263329e6a8244f993f12d..e00be8c2caa22b7d2b2c47869c2ecdfbba204487 100644 (file)
--- 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 747a187f9c4da236a4537c9fd877cc5e4f40563e..627da7373bb17527a48685f7c471cbf70bfdc1e1 100644 (file)
--- 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 d0412f97eab389508323bae306eea3ad6e03e067..40ca763292bb8be56d68d7e4f758ad724c9f36e1 100644 (file)
--- 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 dd2ca5fa38a4d0e2237546a4b2cb843e6d00603f..e44a192ccd7d1947bb12ef1b2f31401ae2b6c91e 100644 (file)
--- 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 c6e64a4fdbe96a111f069ef7c0bb889381531019..adba8b161b18a4a207c67dcba7a920b353807e45 100644 (file)
--- 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 9c69325175f69490aa2d9c791451ba2e17501a1a..8388078086970c2cde2e548a817f2d860189335f 100644 (file)
--- 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/gdkprivate.h b/gdk/gdkprivate.h
new file mode 100644 (file)
index 0000000..3c125a9
--- /dev/null
+++ b/gdk/gdkprivate.h
@@ -0,0 +1,66 @@
+#ifndef __GDK__PRIVATE_H__
+#define __GDK__PRIVATE_H__
+
+#include "gdk/gdktypes.h"
+
+/* Private API for use in GTK+ */
+
+GdkDisplay *    gdk_display_open_default        (void);
+
+gboolean        gdk_device_grab_info            (GdkDisplay  *display,
+                                                 GdkDevice   *device,
+                                                 GdkSurface  **grab_surface,
+                                                 gboolean    *owner_events);
+
+void            gdk_pre_parse                   (void);
+
+gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
+
+void gdk_display_set_double_click_time     (GdkDisplay   *display,
+                                            guint         msec);
+void gdk_display_set_double_click_distance (GdkDisplay   *display,
+                                            guint         distance);
+void gdk_display_set_cursor_theme          (GdkDisplay   *display,
+                                            const char   *theme,
+                                            int           size);
+gboolean gdk_running_in_sandbox (void);
+gboolean gdk_should_use_portal (void);
+
+const char *   gdk_get_startup_notification_id (void);
+
+PangoDirection gdk_unichar_direction (gunichar    ch) G_GNUC_CONST;
+PangoDirection gdk_find_base_dir     (const char *text,
+                                      int         len);
+
+typedef struct
+{
+  const char *key;
+  guint value;
+  const char *help;
+  gboolean always_enabled;
+} GdkDebugKey;
+
+guint gdk_parse_debug_var (const char        *variable,
+                           const GdkDebugKey *keys,
+                           guint              nkeys);
+
+/* Backward compatibility shim, to avoid bumping up the minimum
+ * required version of GLib; most of our uses of g_memdup() are
+ * safe, and those that aren't have been fixed
+ */
+#if !GLIB_CHECK_VERSION (2, 67, 3)
+# define g_memdup2(mem,size)    g_memdup((mem),(size))
+#endif
+
+void gdk_source_set_static_name_by_id (guint       tag,
+                                       const char *name);
+
+#if !GLIB_CHECK_VERSION(2, 69, 1)
+#define g_source_set_static_name(source, name) g_source_set_name ((source), (name))
+#endif
+
+#ifndef I_
+#define I_(string) g_intern_static_string (string)
+#endif
+
+#endif /* __GDK__PRIVATE_H__ */

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 239dbb33aae8ba45946445fabc78a83919ed5744..277ec59513f21a61d8a1b59f298e84ba2e3a14ef 100644 (file)
--- 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 e64905355a456ee0fa3896c4e220c46fd24f7ac0..5e5ce4aa507a1674717fef4daa354b130ecfa056 100644 (file)
--- 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 f3aefc14fbd21988138251b0d5f936c54e7a697e..689b78786d6bead345e15fae767c1033f9a41acf 100644 (file)
--- 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 ba755db0be741ff6f84b46ba7803dea7ee3a59a6..25f4669efb386943245f1b48de64d83bef12f74f 100644 (file)
--- 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 c9e2dd19a6a935c5ffbe80782c8436e95ed126f6..210867eb59e1dd73013c985ff943d1e52e385877 100644 (file)
--- 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 f0a539512b3e5666666c75a52d70e8f3aca531c9..a60fb558c934f198f31f76df48082ff69b8ee7c7 100644 (file)
--- 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 b555002dd48a3f2ca34cdc3a608d595a11aec9dc..a9fe5f5b977af751e9daacd131f51fe45ae2171c 100644 (file)
--- 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 2cca02e49940d8a8ba81343b3b3401e5634e0fe3..1fce61f8a7659f8e547cd5227e69d5434787db1f 100644 (file)
--- 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 1e7bf8531fd0428944e5345d116632637d639a4e..cd314b6d67764e805b9991f814228ef4da5587b2 100644 (file)
--- 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 ab185ad49a4e3afee663ebee902e3b0678e619fe..c1881bfb428e80fdbea35970401663908a304381 100644 (file)
--- 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 a7a51c535f1c26c4757e0d5478974365662162ef..745e841f1affbc2e3edc109da0a91de70c0025bf 100644 (file)
--- 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 7107fbe19238e3bf37cc49f68112182c83a00f9f..b546fa001293a269a7b494e12afdac824aa218b5 100644 (file)
--- 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 f21dd2cc0e4687a449fa1437eee30d5f259d05e3..2c5aaa05ff811ce39b64d37088fbf69c4d5ebaa0 100644 (file)
--- 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 4419f36d7483b6c59c455f0b833e4ce0a336e605..58be9680a2a33a977fe5c7e186b90bdfe84e3093 100644 (file)
--- 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 c2370c05095a5c3b50aae5b1311822b85d84ba5a..6792cc400455b0a6f83ec7b71196e7ce63a6d723 100644 (file)
--- 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 68bfbed814618cb68f748a7405b6543c62b09a61..a7bda515d9058e9631e1ee0c8a7ca45c74b7ea47 100644 (file)
--- 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 6f88df09583d49fdd89ee457111507d649100f3a..f85aca6506a9a712cf12bbff53590ab8c4a4190b 100644 (file)
--- 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 c21c478ec5be99b6eb5b80bc74bd61938bd7f346..add9bc963ca2c05875a9a1e2705ef1573a8948e2 100644 (file)
--- 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 6f28074a9546c44615ca4c88dbc56822b151eec6..9d2404544bfce9ac80ce483a7b0d0515ab4630d1 100644 (file)
--- 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 b81755481c7519486f675423fc6c69e990d1bdfd..02047e265e6bd6b3824dcb27f346a63b791c16d0 100644 (file)
--- 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 a068b009290347c71c22b8d4bfd6e41e755d29c8..426c14fd0f5e562ff4684a0ee94d1702fc64ee9c 100644 (file)
--- 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 cfa0e3474ec265a08b962b5f7c2ba116e8f65b44..5a9c9a6886cff331c790d521d3b26c31e48d59c4 100644 (file)
--- 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 2e1a2870ee6ffccb549116bf9a29172263874539..2b82ea4978759530622d12ac381a760db716f753 100644 (file)
--- 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 33a2afb83c31863dc0dc4f9b655d2edd1939ed75..c41301065e470fe5c79d1c91383975bcadc8425d 100644 (file)
--- 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 93bb4312b450e29b2903deb5b0cad8dde6465fa4..904735783603f8b15415206eda36ae5a92f3c7c7 100644 (file)
--- 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 e21ba9b5b6f98f404b3703cfa089f5264af22ef5..86c84d3fd4d39e401b086d2a7859dd930e06a924 100644 (file)
--- 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 cda64af2fae2f10c51e35b70dd0afb1b3d5300fb..f3f183c3efe23dcf84e397f9abdab40d35baf9f7 100644 (file)
--- 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 ef5158313f42a883f7502d3829dffce8d3960830..36505cd24e2bdb15d2a723a81b3763d6912fc81e 100644 (file)
--- 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 ca351e0b965bc4dec9c6d999fd28fbc6eb7aec6a..14fb06fdc902cf7fe2de5fe7889ddf98e4f0953f 100644 (file)
--- 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 dcf2b69f5294024ab9b7806467bd2a1f90575d9b..363135d807e6787073caa9e5363d041a0e793a39 100644 (file)
--- 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 d8b11020160967f55ae0102e42c0cff9d6ce642a..ed1853b57804abf484c0c328542ac388180b6c5b 100644 (file)
--- 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 aeeba2ac6f6d401af39ba3dd56df89582dadc0e8..4ece91ffbe7a7f9d45abc1518fb9107b7d733ce0 100644 (file)
--- 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 6cfc39d494939635e28c1ab22bd785150b747493..cdf100e4fee1e4e007735c73a77c32a2d94a7722 100644 (file)
--- 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