diff options
Diffstat (limited to 'src/corelib/global/qtdeprecationmarkers.h')
| -rw-r--r-- | src/corelib/global/qtdeprecationmarkers.h | 117 |
1 files changed, 92 insertions, 25 deletions
diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h index 2fd382ad0d..6df5ebce6d 100644 --- a/src/corelib/global/qtdeprecationmarkers.h +++ b/src/corelib/global/qtdeprecationmarkers.h @@ -4,8 +4,14 @@ #ifndef QTDEPRECATIONMARKERS_H #define QTDEPRECATIONMARKERS_H +#include <QtCore/qtconfigmacros.h> #include <QtCore/qtversionchecks.h> -#include <QtCore/qtnamespacemacros.h> +#include <QtCore/qcompilerdetection.h> // for Q_DECL_DEPRECATED + +#if 0 +#pragma qt_class(QtDeprecationMarkers) +#pragma qt_sync_stop_processing +#endif QT_BEGIN_NAMESPACE @@ -34,18 +40,30 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_CONSTRUCTOR # undef Q_DECL_ENUMERATOR_DEPRECATED # define Q_DECL_ENUMERATOR_DEPRECATED +# undef Q_DECL_ENUMERATOR_DEPRECATED_X +# define Q_DECL_ENUMERATOR_DEPRECATED_X(ignored) +#endif + +// If the deprecated macro is defined, use its value +#if !defined(QT_DISABLE_DEPRECATED_UP_TO) && defined(QT_DISABLE_DEPRECATED_BEFORE) +# define QT_DISABLE_DEPRECATED_UP_TO QT_DISABLE_DEPRECATED_BEFORE #endif -#ifndef QT_DEPRECATED_WARNINGS_SINCE -# ifdef QT_DISABLE_DEPRECATED_BEFORE -# define QT_DEPRECATED_WARNINGS_SINCE QT_DISABLE_DEPRECATED_BEFORE +// If the deprecated macro is defined, use its value +#if !defined(QT_WARN_DEPRECATED_UP_TO) && defined(QT_DEPRECATED_WARNINGS_SINCE) +# define QT_WARN_DEPRECATED_UP_TO QT_DEPRECATED_WARNINGS_SINCE +#endif + +#ifndef QT_WARN_DEPRECATED_UP_TO +# ifdef QT_DISABLE_DEPRECATED_UP_TO +# define QT_WARN_DEPRECATED_UP_TO QT_DISABLE_DEPRECATED_UP_TO # else -# define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION +# define QT_WARN_DEPRECATED_UP_TO QT_VERSION # endif #endif -#ifndef QT_DISABLE_DEPRECATED_BEFORE -#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(5, 0, 0) +#ifndef QT_DISABLE_DEPRECATED_UP_TO +#define QT_DISABLE_DEPRECATED_UP_TO QT_VERSION_CHECK(5, 0, 0) #endif /* @@ -61,19 +79,19 @@ QT_BEGIN_NAMESPACE */ #ifdef QT_DEPRECATED -#define QT_DEPRECATED_SINCE(major, minor) (QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_BEFORE) +#define QT_DEPRECATED_SINCE(major, minor) (QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_UP_TO) #else #define QT_DEPRECATED_SINCE(major, minor) 0 #endif /* QT_DEPRECATED_VERSION(major, minor) and QT_DEPRECATED_VERSION_X(major, minor, text) - outputs a deprecation warning if QT_DEPRECATED_WARNINGS_SINCE is equal or greater + outputs a deprecation warning if QT_WARN_DEPRECATED_UP_TO is equal to or greater than the version specified as major, minor. This makes it possible to deprecate a - function without annoying a user who needs to stick at a specified minimum version - and therefore can't use the new function. + function without annoying a user who needs to stay compatible with a specified minimum + version and therefore can't use the new function. */ -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 12, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 12, 0) # define QT_DEPRECATED_VERSION_X_5_12(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_12 QT_DEPRECATED #else @@ -81,7 +99,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_12 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 13, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 13, 0) # define QT_DEPRECATED_VERSION_X_5_13(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_13 QT_DEPRECATED #else @@ -89,7 +107,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_13 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 14, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 14, 0) # define QT_DEPRECATED_VERSION_X_5_14(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_14 QT_DEPRECATED #else @@ -97,7 +115,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_14 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 15, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 15, 0) # define QT_DEPRECATED_VERSION_X_5_15(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_15 QT_DEPRECATED #else @@ -105,7 +123,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_15 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 0, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 0, 0) # define QT_DEPRECATED_VERSION_X_6_0(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_0 QT_DEPRECATED #else @@ -113,7 +131,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_0 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 1, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 1, 0) # define QT_DEPRECATED_VERSION_X_6_1(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_1 QT_DEPRECATED #else @@ -121,7 +139,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_1 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 2, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 2, 0) # define QT_DEPRECATED_VERSION_X_6_2(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_2 QT_DEPRECATED #else @@ -129,7 +147,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_2 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 3, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 3, 0) # define QT_DEPRECATED_VERSION_X_6_3(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_3 QT_DEPRECATED #else @@ -137,7 +155,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_3 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 4, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 4, 0) # define QT_DEPRECATED_VERSION_X_6_4(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_4 QT_DEPRECATED #else @@ -145,7 +163,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_4 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 5, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 5, 0) # define QT_DEPRECATED_VERSION_X_6_5(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_5 QT_DEPRECATED #else @@ -153,7 +171,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_5 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 6, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 6, 0) # define QT_DEPRECATED_VERSION_X_6_6(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_6 QT_DEPRECATED #else @@ -161,7 +179,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_6 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 7, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 7, 0) # define QT_DEPRECATED_VERSION_X_6_7(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_7 QT_DEPRECATED #else @@ -169,7 +187,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_7 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 8, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 8, 0) # define QT_DEPRECATED_VERSION_X_6_8(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_8 QT_DEPRECATED #else @@ -177,6 +195,30 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_8 #endif +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 9, 0) +# define QT_DEPRECATED_VERSION_X_6_9(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_9 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_9(text) +# define QT_DEPRECATED_VERSION_6_9 +#endif + +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 10, 0) +# define QT_DEPRECATED_VERSION_X_6_10(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_10 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_10(text) +# define QT_DEPRECATED_VERSION_6_10 +#endif + +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 11, 0) +# define QT_DEPRECATED_VERSION_X_6_11(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_11 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_11(text) +# define QT_DEPRECATED_VERSION_6_11 +#endif + #define QT_DEPRECATED_VERSION_X_5(minor, text) QT_DEPRECATED_VERSION_X_5_##minor(text) #define QT_DEPRECATED_VERSION_X(major, minor, text) QT_DEPRECATED_VERSION_X_##major##_##minor(text) @@ -186,7 +228,7 @@ QT_BEGIN_NAMESPACE /* QT_IF_DEPRECATED_SINCE(major, minor, whenTrue, whenFalse) expands to \a whenTrue if the specified (\a major, \a minor) version is less than or - equal to the deprecation version defined by QT_DISABLE_DEPRECATED_BEFORE, + equal to the deprecation version defined by QT_DISABLE_DEPRECATED_UP_TO, and to \a whenFalse otherwise. Currently used for QT_INLINE_SINCE(maj, min), but can also be helpful for @@ -267,6 +309,24 @@ QT_BEGIN_NAMESPACE # define QT_IF_DEPRECATED_SINCE_6_8(whenTrue, whenFalse) whenTrue #endif +#if QT_DEPRECATED_SINCE(6, 9) +# define QT_IF_DEPRECATED_SINCE_6_9(whenTrue, whenFalse) whenFalse +#else +# define QT_IF_DEPRECATED_SINCE_6_9(whenTrue, whenFalse) whenTrue +#endif + +#if QT_DEPRECATED_SINCE(6, 10) +# define QT_IF_DEPRECATED_SINCE_6_10(whenTrue, whenFalse) whenFalse +#else +# define QT_IF_DEPRECATED_SINCE_6_10(whenTrue, whenFalse) whenTrue +#endif + +#if QT_DEPRECATED_SINCE(6, 11) +# define QT_IF_DEPRECATED_SINCE_6_11(whenTrue, whenFalse) whenFalse +#else +# define QT_IF_DEPRECATED_SINCE_6_11(whenTrue, whenFalse) whenTrue +#endif + #ifdef __cplusplus // A tag to help mark stuff deprecated (cf. QStringViewLiteral) namespace QtPrivate { @@ -275,6 +335,13 @@ constexpr inline Deprecated_t Deprecated = {}; } #endif +#ifdef QT_ASCII_CAST_WARNINGS +# define QT_ASCII_CAST_WARN \ + Q_DECL_DEPRECATED_X("Use fromUtf8, QStringLiteral, or QLatin1StringView") +#else +# define QT_ASCII_CAST_WARN +#endif + QT_END_NAMESPACE #endif // QTDEPRECATIONMARKERS_H |