From 2f0016eb081fa78731bab9411b3e78731a07bb8b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 7 Apr 2020 18:12:58 +0100 Subject: [PATCH] Rename gdkx11keys.h The header is now private, so it should follow the same naming scheme for private GDK-X11 headers. --- gdk/x11/gdkdevicemanager-xi2.c | 2 +- gdk/x11/gdkdisplay-x11.c | 8 +++++--- gdk/x11/gdkkeys-x11.c | 3 ++- gdk/x11/{gdkx11keys.h => gdkkeys-x11.h} | 0 4 files changed, 8 insertions(+), 5 deletions(-) rename gdk/x11/{gdkx11keys.h => gdkkeys-x11.h} (100%) diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index d3c690bb19..d6a80ba96b 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -19,12 +19,12 @@ #include "gdkx11devicemanager-xi2.h" #include "gdkx11device-xi2.h" -#include "gdkx11keys.h" #include "gdkdeviceprivate.h" #include "gdkdevicetoolprivate.h" #include "gdkdisplayprivate.h" #include "gdkeventtranslator.h" +#include "gdkkeys-x11.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" #include "gdkintl.h" diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 97dfcae5e9..2857869343 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -26,7 +26,6 @@ #include "gdkdisplay-x11.h" #include "gdkdisplayprivate.h" -#include "gdkx11keys.h" #include "gdkasync.h" #include "gdkdisplay.h" @@ -39,12 +38,15 @@ #include "gdkkeysprivate.h" #include "gdkmarshalers.h" #include "xsettings-client.h" + +#include "gdkcairocontext-x11.h" #include "gdkclipboard-x11.h" +#include "gdkglcontext-x11.h" +#include "gdkkeys-x11.h" #include "gdkprivate-x11.h" #include "gdkscreen-x11.h" -#include "gdkcairocontext-x11.h" -#include "gdkglcontext-x11.h" #include "gdkvulkancontext-x11.h" + #include "gdk-private.h" #include diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 1276c00eb7..f3c777390d 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -24,7 +24,8 @@ #include "config.h" -#include "gdkx11keys.h" +#include "gdkkeys-x11.h" + #include "gdkkeysprivate.h" #include "gdkkeysyms.h" #include "gdkprivate-x11.h" diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkkeys-x11.h similarity index 100% rename from gdk/x11/gdkx11keys.h rename to gdk/x11/gdkkeys-x11.h