From 64f5afe608edd43953e87914de029a366c2d39b4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Jul 2018 13:39:09 +0200 Subject: [PATCH] dnd: Rename headers Rename gdkdnd.h to gdkdrag.h, to go along with gdkdrop.h This commit includes the necessary updates to the X11, Wayland and Broadway backends. Other backends have to be updated separately. --- gdk/broadway/gdkdnd-broadway.c | 2 +- gdk/gdk.h | 2 +- gdk/{gdkdnd.c => gdkdrag.c} | 2 +- gdk/{gdkdnd.h => gdkdrag.h} | 0 gdk/{gdkdndprivate.h => gdkdragprivate.h} | 2 +- gdk/gdkevents.c | 2 +- gdk/gdkevents.h | 2 +- gdk/gdkeventsprivate.h | 2 +- gdk/gdkinternals.h | 2 +- gdk/meson.build | 4 ++-- gdk/wayland/gdkdnd-wayland.c | 2 +- gdk/wayland/gdkselection-wayland.c | 1 - gdk/x11/gdkdnd-x11.c | 2 +- gdk/x11/gdkdrop-x11.c | 2 +- 14 files changed, 13 insertions(+), 14 deletions(-) rename gdk/{gdkdnd.c => gdkdrag.c} (99%) rename gdk/{gdkdnd.h => gdkdrag.h} (100%) rename gdk/{gdkdndprivate.h => gdkdragprivate.h} (99%) diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c index 5e0830c15e..1db76f43d3 100644 --- a/gdk/broadway/gdkdnd-broadway.c +++ b/gdk/broadway/gdkdnd-broadway.c @@ -24,7 +24,7 @@ #include "config.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" #include "gdkinternals.h" #include "gdkproperty.h" diff --git a/gdk/gdk.h b/gdk/gdk.h index 3362f9aefc..a537ed341f 100644 --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/gdk/gdkdnd.c b/gdk/gdkdrag.c similarity index 99% rename from gdk/gdkdnd.c rename to gdk/gdkdrag.c index 8cdd208285..2e8efb8e71 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdrag.c @@ -24,7 +24,7 @@ #include "config.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" #include "gdkdisplay.h" #include "gdksurface.h" #include "gdkintl.h" diff --git a/gdk/gdkdnd.h b/gdk/gdkdrag.h similarity index 100% rename from gdk/gdkdnd.h rename to gdk/gdkdrag.h diff --git a/gdk/gdkdndprivate.h b/gdk/gdkdragprivate.h similarity index 99% rename from gdk/gdkdndprivate.h rename to gdk/gdkdragprivate.h index b3f75ea069..01a87ef632 100644 --- a/gdk/gdkdndprivate.h +++ b/gdk/gdkdragprivate.h @@ -18,7 +18,7 @@ #ifndef __GDK_DND_PRIVATE_H__ #define __GDK_DND_PRIVATE_H__ -#include "gdkdnd.h" +#include "gdkdrag.h" G_BEGIN_DECLS diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 7d810d9fda..e648110212 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -28,7 +28,7 @@ #include "gdkeventsprivate.h" #include "gdkinternals.h" #include "gdkdisplayprivate.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" #include "gdkdropprivate.h" #include "gdk-private.h" diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index e8577af1a1..f496502ad2 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/gdk/gdkeventsprivate.h b/gdk/gdkeventsprivate.h index b706c6f383..a7ab6a88ab 100644 --- a/gdk/gdkeventsprivate.h +++ b/gdk/gdkeventsprivate.h @@ -26,7 +26,7 @@ #define __GDK_EVENTS_PRIVATE_H__ #include -#include +#include #include #include diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index f77ed09e6f..69b5f844f1 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -32,7 +32,7 @@ #include "gdkdisplay.h" #include "gdkeventsprivate.h" #include "gdkenumtypes.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" G_BEGIN_DECLS diff --git a/gdk/meson.build b/gdk/meson.build index 4a2e24073c..d68307392b 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -15,7 +15,7 @@ gdk_public_sources = files([ 'gdkdevicetool.c', 'gdkdisplay.c', 'gdkdisplaymanager.c', - 'gdkdnd.c', + 'gdkdrag.c', 'gdkdrawcontext.c', 'gdkdrop.c', 'gdkevents.c', @@ -65,7 +65,7 @@ gdk_public_headers = files([ 'gdkdevicetool.h', 'gdkdisplay.h', 'gdkdisplaymanager.h', - 'gdkdnd.h', + 'gdkdrag.h', 'gdkdrawcontext.h', 'gdkdrop.h', 'gdkevents.h', diff --git a/gdk/wayland/gdkdnd-wayland.c b/gdk/wayland/gdkdnd-wayland.c index 5b9792028b..4288693766 100644 --- a/gdk/wayland/gdkdnd-wayland.c +++ b/gdk/wayland/gdkdnd-wayland.c @@ -17,7 +17,7 @@ #include "config.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" #include "gdkinternals.h" #include "gdkproperty.h" diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c index 39380537a2..9683a5a8ed 100644 --- a/gdk/wayland/gdkselection-wayland.c +++ b/gdk/wayland/gdkselection-wayland.c @@ -28,7 +28,6 @@ #include "gdkprivate-wayland.h" #include "gdkdisplay-wayland.h" #include "gdkcontentformatsprivate.h" -#include "gdkdndprivate.h" #include "gdkproperty.h" #include diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 8377636a4e..383cc09e47 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -32,7 +32,7 @@ #include "gdkclipboard-x11.h" #include "gdkdeviceprivate.h" #include "gdkdisplay-x11.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" #include "gdkinternals.h" #include "gdkintl.h" #include "gdkproperty.h" diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c index c07f423fd5..6a71b55cf3 100644 --- a/gdk/x11/gdkdrop-x11.c +++ b/gdk/x11/gdkdrop-x11.c @@ -32,7 +32,7 @@ #include "gdkclipboard-x11.h" #include "gdkdeviceprivate.h" #include "gdkdisplay-x11.h" -#include "gdkdndprivate.h" +#include "gdkdragprivate.h" #include "gdkinternals.h" #include "gdkintl.h" #include "gdkproperty.h"