diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-09 11:16:31 -0400 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2023-05-09 16:43:35 +0100 |
| commit | 383c40479274aca86498e14672554dbe9114d2e4 (patch) | |
| tree | 79c04608639aeb5750f1edbeaac8355d69625830 | |
| parent | 33d0cfd4f8baee31a408aa1dd17ca735f761942b (diff) | |
| download | gtk+-383c40479274aca86498e14672554dbe9114d2e4.tar.gz | |
Drop the gdk/gdkversionmacros.h header
It was just added to avoid touching too many files.
Touching them now.
49 files changed, 49 insertions, 50 deletions
@@ -24,7 +24,7 @@ #include "config.h" -#include "gdkversionmacros.h" +#include "version/gdkversionmacros.h" #include "gdkresources.h" @@ -75,7 +75,7 @@ #include <gdk/gdktoplevellayout.h> #include <gdk/gdktoplevelsize.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdkvulkancontext.h> #undef __GDK_H_INSIDE__ diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h index 364a2a941c..3687402cc6 100644 --- a/gdk/gdkapplaunchcontext.h +++ b/gdk/gdkapplaunchcontext.h @@ -24,7 +24,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h index 24af5939d8..37d1d2cb75 100644 --- a/gdk/gdkcairo.h +++ b/gdk/gdkcairo.h @@ -21,7 +21,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdkrgba.h> #include <gdk/gdkpixbuf.h> #include <pango/pangocairo.h> diff --git a/gdk/gdkcairocontext.h b/gdk/gdkcairocontext.h index a230b2e663..d696cd5685 100644 --- a/gdk/gdkcairocontext.h +++ b/gdk/gdkcairocontext.h @@ -24,7 +24,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> #include <cairo.h> diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h index f10c95c32b..11b638b4e0 100644 --- a/gdk/gdkclipboard.h +++ b/gdk/gdkclipboard.h @@ -22,7 +22,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> #include <gio/gio.h> diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h index be10880434..fe756a2225 100644 --- a/gdk/gdkcontentdeserializer.h +++ b/gdk/gdkcontentdeserializer.h @@ -22,7 +22,7 @@ #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h index ff9b116db7..e20c900b6d 100644 --- a/gdk/gdkcontentformats.h +++ b/gdk/gdkcontentformats.h @@ -22,7 +22,7 @@ #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h index 9293a17aea..c291ca9158 100644 --- a/gdk/gdkcontentprovider.h +++ b/gdk/gdkcontentprovider.h @@ -22,7 +22,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> diff --git a/gdk/gdkcontentproviderimpl.h b/gdk/gdkcontentproviderimpl.h index 94c3ffb6fb..8e608411c7 100644 --- a/gdk/gdkcontentproviderimpl.h +++ b/gdk/gdkcontentproviderimpl.h @@ -22,7 +22,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h index 1322d17a51..137d0993cc 100644 --- a/gdk/gdkcontentserializer.h +++ b/gdk/gdkcontentserializer.h @@ -22,7 +22,7 @@ #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index f8eb2d7d9a..e7277487cf 100644 --- a/gdk/gdkcursor.h +++ b/gdk/gdkcursor.h @@ -28,7 +28,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index 28d0c04c8b..5124f49ffb 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -21,7 +21,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> #include <gdk/gdkdevicetool.h> #include <gdk/gdkenums.h> diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h index aa6d56871c..050ec1772a 100644 --- a/gdk/gdkdevicepad.h +++ b/gdk/gdkdevicepad.h @@ -23,7 +23,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h index 0accd67816..29718e95d9 100644 --- a/gdk/gdkdevicetool.h +++ b/gdk/gdkdevicetool.h @@ -23,7 +23,7 @@ #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index 54b514f8cf..a49dc4bba5 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -25,7 +25,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> #include <gdk/gdkevents.h> #include <gdk/gdkseat.h> diff --git a/gdk/gdkdragsurfacesize.h b/gdk/gdkdragsurfacesize.h index 28d23128be..95a343dddc 100644 --- a/gdk/gdkdragsurfacesize.h +++ b/gdk/gdkdragsurfacesize.h @@ -23,7 +23,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h index e414ede92c..be3ec256e1 100644 --- a/gdk/gdkdrawcontext.h +++ b/gdk/gdkdrawcontext.h @@ -24,7 +24,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h index 8f4236007c..edd97badad 100644 --- a/gdk/gdkdrop.h +++ b/gdk/gdkdrop.h @@ -26,7 +26,7 @@ #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index 7b75a3f3d6..ba0a86499f 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -33,7 +33,7 @@ #include <gdk/gdkdrag.h> #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h index c3cfe184a5..e030f3c98c 100644 --- a/gdk/gdkframetimings.h +++ b/gdk/gdkframetimings.h @@ -22,7 +22,7 @@ #endif #include <glib-object.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h index 0f5abe8544..101d4f8868 100644 --- a/gdk/gdkglcontext.h +++ b/gdk/gdkglcontext.h @@ -26,7 +26,7 @@ #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkgltexturebuilder.h b/gdk/gdkgltexturebuilder.h index 042bcc96cb..acac39cd90 100644 --- a/gdk/gdkgltexturebuilder.h +++ b/gdk/gdkgltexturebuilder.h @@ -25,7 +25,7 @@ #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h index dd82c938dd..48158799d6 100644 --- a/gdk/gdkkeys.h +++ b/gdk/gdkkeys.h @@ -28,7 +28,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> G_BEGIN_DECLS diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h index ed199cba08..9d304fd503 100644 --- a/gdk/gdkmonitor.h +++ b/gdk/gdkmonitor.h @@ -25,7 +25,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdkrectangle.h> #include <gdk/gdktypes.h> diff --git a/gdk/gdkpaintable.h b/gdk/gdkpaintable.h index c5c3afc325..27ac5609c2 100644 --- a/gdk/gdkpaintable.h +++ b/gdk/gdkpaintable.h @@ -24,7 +24,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h index 806597df2a..fafae5459a 100644 --- a/gdk/gdkpango.h +++ b/gdk/gdkpango.h @@ -22,7 +22,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkpipeiostreamprivate.h b/gdk/gdkpipeiostreamprivate.h index e88154e038..79b47c3d19 100644 --- a/gdk/gdkpipeiostreamprivate.h +++ b/gdk/gdkpipeiostreamprivate.h @@ -18,7 +18,7 @@ #pragma once -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gio/gio.h> G_BEGIN_DECLS diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h index b05a279935..664c8d24d6 100644 --- a/gdk/gdkpixbuf.h +++ b/gdk/gdkpixbuf.h @@ -31,7 +31,7 @@ #include <cairo.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktexture.h> diff --git a/gdk/gdkpopuplayout.h b/gdk/gdkpopuplayout.h index 34a58c5850..f9e4b3b754 100644 --- a/gdk/gdkpopuplayout.h +++ b/gdk/gdkpopuplayout.h @@ -24,7 +24,7 @@ #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkprofiler.c b/gdk/gdkprofiler.c index b51cd7eb37..9e456efeae 100644 --- a/gdk/gdkprofiler.c +++ b/gdk/gdkprofiler.c @@ -29,7 +29,7 @@ #include <unistd.h> #endif -#include "gdkversionmacros.h" +#include "version/gdkversionmacros.h" #include "gdkframeclockprivate.h" diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h index e3325aee23..8033a2fe09 100644 --- a/gdk/gdkrectangle.h +++ b/gdk/gdkrectangle.h @@ -29,7 +29,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h index b8aca3dab9..716a1f0d04 100644 --- a/gdk/gdkrgba.h +++ b/gdk/gdkrgba.h @@ -29,7 +29,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h index 31e0755bf4..b0c31ad5a6 100644 --- a/gdk/gdksnapshot.h +++ b/gdk/gdksnapshot.h @@ -24,7 +24,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h index 5e215b52d5..39ce04f979 100644 --- a/gdk/gdksurface.h +++ b/gdk/gdksurface.h @@ -28,7 +28,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> #include <gdk/gdkevents.h> #include <gdk/gdkframeclock.h> diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h index c79904420e..3b3f312419 100644 --- a/gdk/gdktexture.h +++ b/gdk/gdktexture.h @@ -22,7 +22,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> #include <gdk-pixbuf/gdk-pixbuf.h> diff --git a/gdk/gdktexturedownloader.h b/gdk/gdktexturedownloader.h index 31d97ef17b..1c439c6d0e 100644 --- a/gdk/gdktexturedownloader.h +++ b/gdk/gdktexturedownloader.h @@ -22,7 +22,7 @@ #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdkenums.h> #include <gdk/gdktypes.h> diff --git a/gdk/gdktoplevellayout.h b/gdk/gdktoplevellayout.h index aa2e1046d7..3e3f2ea118 100644 --- a/gdk/gdktoplevellayout.h +++ b/gdk/gdktoplevellayout.h @@ -24,7 +24,7 @@ #include <gdk/gdkmonitor.h> #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdktoplevelsize.h b/gdk/gdktoplevelsize.h index 536b1a34eb..c5e1b5c6c7 100644 --- a/gdk/gdktoplevelsize.h +++ b/gdk/gdktoplevelsize.h @@ -23,7 +23,7 @@ #endif #include <gdk/gdktypes.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 8cd6eff6e4..e54ae74f0b 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -42,7 +42,7 @@ * (or GTK). One such setting is what windowing API backend is in use. */ #include <gdk/gdkconfig.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gdk/gdkversionmacros.h b/gdk/gdkversionmacros.h deleted file mode 100644 index 934e391c8d..0000000000 --- a/gdk/gdkversionmacros.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <gdk/version/gdkversionmacros.h> -#include <gdk/version/gdk-visibility.h> diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h index d6531a414a..b1b3dc1e52 100644 --- a/gdk/gdkvulkancontext.h +++ b/gdk/gdkvulkancontext.h @@ -24,7 +24,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gdk/gdktypes.h> #ifdef GDK_RENDERING_VULKAN diff --git a/gdk/meson.build b/gdk/meson.build index a07f914b25..77d0fbd293 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -110,7 +110,6 @@ gdk_public_headers = files([ 'gdktoplevelsize.h', 'gdktoplevel.h', 'gdkdragsurface.h', - 'gdkversionmacros.h' ]) install_headers(gdk_public_headers, subdir: 'gtk-4.0/gdk/') @@ -147,7 +146,7 @@ gdk_enums = gnome.mkenums_simple('gdkenumtypes', sources: gdk_public_headers, decorator: 'GDK_AVAILABLE_IN_ALL', body_prefix: '#include "config.h"', - header_prefix: '#include "version/gdkversionmacros.h"\n#include "version/gdk-visibility.h"', + header_prefix: '#include "version/gdkversionmacros.h"\n', install_dir: gtk_includedir / 'gtk-4.0/gdk', install_header: true, ) diff --git a/gdk/version/gdkversionmacros.h.in b/gdk/version/gdkversionmacros.h.in index c457b9262e..b8b4538573 100644 --- a/gdk/version/gdkversionmacros.h.in +++ b/gdk/version/gdkversionmacros.h.in @@ -144,4 +144,6 @@ # error "GDK_VERSION_MIN_REQUIRED must be >= GDK_VERSION_4_0" #endif +#include <gdk/version/gdk-visibility.h> + #endif /* __GDK_VERSION_MACROS_H__ */ diff --git a/gtk/css/gtkcss.h b/gtk/css/gtkcss.h index 6c4082e097..04c16a901d 100644 --- a/gtk/css/gtkcss.h +++ b/gtk/css/gtkcss.h @@ -27,7 +27,7 @@ #define __GTK_CSS_H_INSIDE__ #include <glib.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gtk/css/gtkcssenums.h> #include <gtk/css/gtkcssenumtypes.h> diff --git a/gtk/css/gtkcssenums.h b/gtk/css/gtkcssenums.h index f9584c5498..396a422a0d 100644 --- a/gtk/css/gtkcssenums.h +++ b/gtk/css/gtkcssenums.h @@ -29,7 +29,7 @@ #endif #include <glib.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> /** * GtkCssParserError: diff --git a/gtk/css/gtkcssenumtypes.h.template b/gtk/css/gtkcssenumtypes.h.template index 53471b92c0..90b83748cc 100644 --- a/gtk/css/gtkcssenumtypes.h.template +++ b/gtk/css/gtkcssenumtypes.h.template @@ -7,7 +7,7 @@ #endif #include <glib-object.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS /*** END file-header ***/ diff --git a/gtk/css/gtkcsserror.h b/gtk/css/gtkcsserror.h index b77a3f4002..f2160f19c7 100644 --- a/gtk/css/gtkcsserror.h +++ b/gtk/css/gtkcsserror.h @@ -21,7 +21,7 @@ #pragma once #include <glib.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> G_BEGIN_DECLS diff --git a/gtk/css/gtkcsssection.h b/gtk/css/gtkcsssection.h index 782d44f5f3..163c032902 100644 --- a/gtk/css/gtkcsssection.h +++ b/gtk/css/gtkcsssection.h @@ -22,7 +22,7 @@ #endif #include <gio/gio.h> -#include <gdk/gdkversionmacros.h> +#include <gdk/version/gdkversionmacros.h> #include <gtk/css/gtkcsslocation.h> G_BEGIN_DECLS |