diff options
author | Alexander Larsson <alexl@redhat.com> | 2018-03-20 11:46:11 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2018-03-20 11:46:11 +0100 |
commit | 890080ebf7a12199d5500fbbf6a0daf06cc2d35f (patch) | |
tree | 477903a53b4cfe06172df68207f50e614bd89319 /gdk/x11 | |
parent | 391727bd0dff0f1d2d937f125bb08a541da02348 (diff) | |
download | gtk+-890080ebf7a12199d5500fbbf6a0daf06cc2d35f.tar.gz |
GdkWindow -> GdkSurface: File renames
Rename all *window.[ch] source files.
This is an automatic operation, done by the following commands:
for i in $(git ls-files gdk | grep window); do
git mv $i $(echo $i | sed s/window/surface/);
git sed -f g $(basename $i) $(basename $i | sed s/window/surface/) ;
done
git checkout NEWS* po-properties po
Diffstat (limited to 'gdk/x11')
-rw-r--r-- | gdk/x11/gdkdevice-core-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdisplay-x11.h | 2 | ||||
-rw-r--r-- | gdk/x11/gdkeventsource.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkeventtranslator.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkgeometry-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkglcontext-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkglcontext-x11.h | 2 | ||||
-rw-r--r-- | gdk/x11/gdkprivate-x11.h | 2 | ||||
-rw-r--r-- | gdk/x11/gdkselectioninputstream-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkselectionoutputstream-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdksurface-x11.c (renamed from gdk/x11/gdkwindow-x11.c) | 6 | ||||
-rw-r--r-- | gdk/x11/gdksurface-x11.h (renamed from gdk/x11/gdkwindow-x11.h) | 2 | ||||
-rw-r--r-- | gdk/x11/gdkvulkancontext-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkx.h | 2 | ||||
-rw-r--r-- | gdk/x11/gdkx11surface.h (renamed from gdk/x11/gdkx11window.h) | 0 | ||||
-rw-r--r-- | gdk/x11/meson.build | 4 | ||||
-rw-r--r-- | gdk/x11/xsettings-client.c | 2 |
17 files changed, 19 insertions, 19 deletions
diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c index 6bbdda6693..055fa593ac 100644 --- a/gdk/x11/gdkdevice-core-x11.c +++ b/gdk/x11/gdkdevice-core-x11.c @@ -22,7 +22,7 @@ #include "gdkdeviceprivate.h" #include "gdkinternals.h" -#include "gdkwindow.h" +#include "gdksurface.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" #include "gdkasync.h" diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h index ed08da2ff1..c4cc9e61b7 100644 --- a/gdk/x11/gdkdisplay-x11.h +++ b/gdk/x11/gdkdisplay-x11.h @@ -24,7 +24,7 @@ #include "gdkdisplayprivate.h" #include "gdkkeys.h" -#include "gdkwindow.h" +#include "gdksurface.h" #include "gdkinternals.h" #include "gdkx11devicemanager.h" #include "gdkx11display.h" diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index 2a26669c1a..168e33cfb8 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -20,7 +20,7 @@ #include "gdkeventsource.h" #include "gdkinternals.h" -#include "gdkwindow-x11.h" +#include "gdksurface-x11.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" #include "xsettings-client.h" diff --git a/gdk/x11/gdkeventtranslator.c b/gdk/x11/gdkeventtranslator.c index 96c2ed9957..579c59ae23 100644 --- a/gdk/x11/gdkeventtranslator.c +++ b/gdk/x11/gdkeventtranslator.c @@ -18,7 +18,7 @@ #include "config.h" #include "gdkeventtranslator.h" -#include "gdkwindow-x11.h" +#include "gdksurface-x11.h" typedef GdkEventTranslatorIface GdkEventTranslatorInterface; G_DEFINE_INTERFACE (GdkEventTranslator, _gdk_x11_event_translator, G_TYPE_OBJECT); diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index 208704c360..d75acffbd6 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -22,7 +22,7 @@ #include "gdkprivate-x11.h" #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" -#include "gdkwindow-x11.h" +#include "gdksurface-x11.h" typedef struct _GdkSurfaceQueueItem GdkSurfaceQueueItem; diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index 682df01b39..0405d0588a 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -28,7 +28,7 @@ #include "gdkx11display.h" #include "gdkx11glcontext.h" #include "gdkx11screen.h" -#include "gdkx11window.h" +#include "gdkx11surface.h" #include "gdkvisual-x11.h" #include "gdkx11property.h" #include <X11/Xatom.h> diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h index 61dbadef1f..89d1131fcc 100644 --- a/gdk/x11/gdkglcontext-x11.h +++ b/gdk/x11/gdkglcontext-x11.h @@ -30,7 +30,7 @@ #include "gdkglcontextprivate.h" #include "gdkdisplayprivate.h" #include "gdkvisual-x11.h" -#include "gdkwindow.h" +#include "gdksurface.h" #include "gdkinternals.h" G_BEGIN_DECLS diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index 90d6ecaafe..e784b1f1b7 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -32,7 +32,7 @@ #include "gdkcursor.h" #include "gdkinternals.h" #include "gdkx.h" -#include "gdkwindow-x11.h" +#include "gdksurface-x11.h" #include "gdkscreen-x11.h" #include <X11/Xlib.h> diff --git a/gdk/x11/gdkselectioninputstream-x11.c b/gdk/x11/gdkselectioninputstream-x11.c index c3ae895344..55f83b4975 100644 --- a/gdk/x11/gdkselectioninputstream-x11.c +++ b/gdk/x11/gdkselectioninputstream-x11.c @@ -27,7 +27,7 @@ #include "gdkintl.h" #include "gdkx11display.h" #include "gdkx11property.h" -#include "gdkx11window.h" +#include "gdkx11surface.h" typedef struct GdkX11SelectionInputStreamPrivate GdkX11SelectionInputStreamPrivate; diff --git a/gdk/x11/gdkselectionoutputstream-x11.c b/gdk/x11/gdkselectionoutputstream-x11.c index 106c6b780c..5f35cdf6be 100644 --- a/gdk/x11/gdkselectionoutputstream-x11.c +++ b/gdk/x11/gdkselectionoutputstream-x11.c @@ -29,7 +29,7 @@ #include "gdktextlistconverter-x11.h" #include "gdkx11display.h" #include "gdkx11property.h" -#include "gdkx11window.h" +#include "gdkx11surface.h" typedef struct _GdkX11PendingSelectionNotify GdkX11PendingSelectionNotify; typedef struct _GdkX11SelectionOutputStreamPrivate GdkX11SelectionOutputStreamPrivate; diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdksurface-x11.c index c78c5c1840..21f1d14bf1 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -25,10 +25,10 @@ #include "config.h" -#include "gdkwindow-x11.h" +#include "gdksurface-x11.h" -#include "gdkwindow.h" -#include "gdkwindowimpl.h" +#include "gdksurface.h" +#include "gdksurfaceimpl.h" #include "gdkvisual-x11.h" #include "gdkinternals.h" #include "gdkdeviceprivate.h" diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdksurface-x11.h index b824240ffc..15993af589 100644 --- a/gdk/x11/gdkwindow-x11.h +++ b/gdk/x11/gdksurface-x11.h @@ -26,7 +26,7 @@ #define __GDK_SURFACE_X11_H__ #include "gdk/x11/gdkprivate-x11.h" -#include "gdk/gdkwindowimpl.h" +#include "gdk/gdksurfaceimpl.h" #include <X11/Xlib.h> diff --git a/gdk/x11/gdkvulkancontext-x11.c b/gdk/x11/gdkvulkancontext-x11.c index 0e88ec6d63..b27c407bd4 100644 --- a/gdk/x11/gdkvulkancontext-x11.c +++ b/gdk/x11/gdkvulkancontext-x11.c @@ -28,7 +28,7 @@ #include "gdkinternals.h" #include "gdkdisplay-x11.h" -#include "gdkwindow-x11.h" +#include "gdksurface-x11.h" G_DEFINE_TYPE (GdkX11VulkanContext, gdk_x11_vulkan_context, GDK_TYPE_VULKAN_CONTEXT) diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 153b4a501e..9fa9cb0711 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -48,7 +48,7 @@ #include <gdk/x11/gdkx11screen.h> #include <gdk/x11/gdkx11selection.h> #include <gdk/x11/gdkx11utils.h> -#include <gdk/x11/gdkx11window.h> +#include <gdk/x11/gdkx11surface.h> #include <gdk/x11/gdkx-autocleanups.h> diff --git a/gdk/x11/gdkx11window.h b/gdk/x11/gdkx11surface.h index d2fc1e4a60..d2fc1e4a60 100644 --- a/gdk/x11/gdkx11window.h +++ b/gdk/x11/gdkx11surface.h diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build index 53213818fb..3912031c18 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -26,7 +26,7 @@ gdk_x11_sources = files([ 'gdktextlistconverter-x11.c', 'gdkvisual-x11.c', 'gdkvulkancontext-x11.c', - 'gdkwindow-x11.c', + 'gdksurface-x11.c', 'gdkxftdefaults.c', 'gdkxid.c', 'xsettings-client.c', @@ -50,7 +50,7 @@ gdk_x11_public_headers = files([ 'gdkx11screen.h', 'gdkx11selection.h', 'gdkx11utils.h', - 'gdkx11window.h', + 'gdkx11surface.h', ]) install_headers(gdk_x11_public_headers, subdir: 'gtk-4.0/gdk/x11/') diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c index 5713882320..9adfcf27d4 100644 --- a/gdk/x11/xsettings-client.c +++ b/gdk/x11/xsettings-client.c @@ -28,7 +28,7 @@ #include <gdk/x11/gdkx11display.h> #include <gdk/x11/gdkx11property.h> #include <gdk/x11/gdkx11screen.h> -#include <gdk/x11/gdkx11window.h> +#include <gdk/x11/gdkx11surface.h> #include <gdk/x11/gdkprivate-x11.h> #include <gdk/x11/gdkdisplay-x11.h> #include <gdk/x11/gdkscreen-x11.h> |