From 93dad2bf91d414a41c6e2c7db6c75171b4917d4d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 2 Oct 2020 10:35:25 +0200 Subject: Switch Q_DECL_DEPRECATED to use C++14 [[deprecated]] As a C++ attribute it must be on the beginning of the line or after the function name however. And for friend declarations can only be on the definition. Change-Id: I456884428f36e1f1c621089c7b1addee13ada0fe Reviewed-by: Qt CI Bot Reviewed-by: Thiago Macieira --- src/corelib/global/qcompilerdetection.h | 19 ++-- src/corelib/global/qglobal.h | 2 +- src/corelib/serialization/qjsonvalue.h | 2 +- src/corelib/text/qbytearray.h | 12 +-- src/corelib/text/qstring.h | 158 ++++++++++++++++---------------- src/corelib/text/qstringbuilder.h | 10 +- src/dbus/qdbusconnection.cpp | 15 --- src/dbus/qdbusconnection.h | 5 - 8 files changed, 103 insertions(+), 120 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index a140e78739..d1ce56fd0a 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1142,18 +1142,21 @@ # define Q_DECL_UNUSED [[maybe_unused]] #endif +#if __has_cpp_attribute(deprecated) +# ifdef Q_DECL_DEPRECATED +# undef Q_DECL_DEPRECATED +# endif +# ifdef Q_DECL_DEPRECATED_X +# undef Q_DECL_DEPRECATED_X +# endif +# define Q_DECL_DEPRECATED [[deprecated]] +# define Q_DECL_DEPRECATED_X(x) [[deprecated(x)]] +#endif + #if defined(__cpp_enumerator_attributes) && __cpp_enumerator_attributes >= 201411 -#if defined(Q_CC_MSVC) -// Can't mark enum values as __declspec(deprecated) with MSVC, also can't move -// everything to [[deprecated]] because MSVC gives a compilation error when marking -// friend methods of a class as [[deprecated("text")]], breaking qstring.h -# define Q_DECL_ENUMERATOR_DEPRECATED [[deprecated]] -# define Q_DECL_ENUMERATOR_DEPRECATED_X(x) [[deprecated(x)]] -#else # define Q_DECL_ENUMERATOR_DEPRECATED Q_DECL_DEPRECATED # define Q_DECL_ENUMERATOR_DEPRECATED_X(x) Q_DECL_DEPRECATED_X(x) #endif -#endif /* * Fallback macros to certain compiler features diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 5ce45869fd..a6ae741dac 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -275,7 +275,7 @@ typedef double qreal; # undef QT_DEPRECATED_VARIABLE # define QT_DEPRECATED_VARIABLE Q_DECL_VARIABLE_DEPRECATED # undef QT_DEPRECATED_CONSTRUCTOR -# define QT_DEPRECATED_CONSTRUCTOR explicit Q_DECL_CONSTRUCTOR_DEPRECATED +# define QT_DEPRECATED_CONSTRUCTOR Q_DECL_CONSTRUCTOR_DEPRECATED explicit #else # undef QT_DEPRECATED # define QT_DEPRECATED diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 2e99103411..a9dd86df19 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -77,7 +77,7 @@ public: QJsonValue(const QString &s); QJsonValue(QLatin1String s); #ifndef QT_NO_CAST_FROM_ASCII - inline QT_ASCII_CAST_WARN QJsonValue(const char *s) + QT_ASCII_CAST_WARN inline QJsonValue(const char *s) : QJsonValue(QString::fromUtf8(s)) {} #endif QJsonValue(const QJsonArray &a); diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index 7162c6cdcb..8f5e1d9f7f 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -332,12 +332,12 @@ public: [[nodiscard]] QByteArray repeated(qsizetype times) const; #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) - inline QT_ASCII_CAST_WARN bool operator==(const QString &s2) const; - inline QT_ASCII_CAST_WARN bool operator!=(const QString &s2) const; - inline QT_ASCII_CAST_WARN bool operator<(const QString &s2) const; - inline QT_ASCII_CAST_WARN bool operator>(const QString &s2) const; - inline QT_ASCII_CAST_WARN bool operator<=(const QString &s2) const; - inline QT_ASCII_CAST_WARN bool operator>=(const QString &s2) const; + QT_ASCII_CAST_WARN inline bool operator==(const QString &s2) const; + QT_ASCII_CAST_WARN inline bool operator!=(const QString &s2) const; + QT_ASCII_CAST_WARN inline bool operator<(const QString &s2) const; + QT_ASCII_CAST_WARN inline bool operator>(const QString &s2) const; + QT_ASCII_CAST_WARN inline bool operator<=(const QString &s2) const; + QT_ASCII_CAST_WARN inline bool operator>=(const QString &s2) const; #endif short toShort(bool *ok = nullptr, int base = 10) const; diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index fc3a0431ff..ea78dd017f 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -229,19 +229,19 @@ public: inline bool operator<=(const QString &s) const noexcept; #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) - inline QT_ASCII_CAST_WARN bool operator==(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator!=(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator<(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator>(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator<=(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator>=(const char *s) const; - - inline QT_ASCII_CAST_WARN bool operator==(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator!=(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator<(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator>(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator<=(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator>=(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator==(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator!=(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator<(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator>(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator<=(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator>=(const char *s) const; + + QT_ASCII_CAST_WARN inline bool operator==(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator!=(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator<(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator>(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator<=(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator>=(const QByteArray &s) const; #endif // !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) private: @@ -808,55 +808,55 @@ public: QString &operator=(char (&)[N]) = delete; #endif #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) - inline QT_ASCII_CAST_WARN QString(const char *ch) + QT_ASCII_CAST_WARN inline QString(const char *ch) : QString(fromUtf8(ch)) {} - inline QT_ASCII_CAST_WARN QString(const QByteArray &a) + QT_ASCII_CAST_WARN inline QString(const QByteArray &a) : QString(fromUtf8(a)) {} - inline QT_ASCII_CAST_WARN QString &operator=(const char *ch) + QT_ASCII_CAST_WARN inline QString &operator=(const char *ch) { return (*this = fromUtf8(ch)); } - inline QT_ASCII_CAST_WARN QString &operator=(const QByteArray &a) + QT_ASCII_CAST_WARN inline QString &operator=(const QByteArray &a) { return (*this = fromUtf8(a)); } // these are needed, so it compiles with STL support enabled - inline QT_ASCII_CAST_WARN QString &prepend(const char *s) + QT_ASCII_CAST_WARN inline QString &prepend(const char *s) { return prepend(QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &prepend(const QByteArray &s) + QT_ASCII_CAST_WARN inline QString &prepend(const QByteArray &s) { return prepend(QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &append(const char *s) + QT_ASCII_CAST_WARN inline QString &append(const char *s) { return append(QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &append(const QByteArray &s) + QT_ASCII_CAST_WARN inline QString &append(const QByteArray &s) { return append(QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &insert(qsizetype i, const char *s) + QT_ASCII_CAST_WARN inline QString &insert(qsizetype i, const char *s) { return insert(i, QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &insert(qsizetype i, const QByteArray &s) + QT_ASCII_CAST_WARN inline QString &insert(qsizetype i, const QByteArray &s) { return insert(i, QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &operator+=(const char *s) + QT_ASCII_CAST_WARN inline QString &operator+=(const char *s) { return append(QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN QString &operator+=(const QByteArray &s) + QT_ASCII_CAST_WARN inline QString &operator+=(const QByteArray &s) { return append(QString::fromUtf8(s)); } - inline QT_ASCII_CAST_WARN bool operator==(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator!=(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator<(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator<=(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator>(const char *s) const; - inline QT_ASCII_CAST_WARN bool operator>=(const char *s) const; - - inline QT_ASCII_CAST_WARN bool operator==(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator!=(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator<(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator>(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator<=(const QByteArray &s) const; - inline QT_ASCII_CAST_WARN bool operator>=(const QByteArray &s) const; - - friend inline QT_ASCII_CAST_WARN bool operator==(const char *s1, const QString &s2); - friend inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, const QString &s2); - friend inline QT_ASCII_CAST_WARN bool operator<(const char *s1, const QString &s2); - friend inline QT_ASCII_CAST_WARN bool operator>(const char *s1, const QString &s2); - friend inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, const QString &s2); - friend inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, const QString &s2); + QT_ASCII_CAST_WARN inline bool operator==(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator!=(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator<(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator<=(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator>(const char *s) const; + QT_ASCII_CAST_WARN inline bool operator>=(const char *s) const; + + QT_ASCII_CAST_WARN inline bool operator==(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator!=(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator<(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator>(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator<=(const QByteArray &s) const; + QT_ASCII_CAST_WARN inline bool operator>=(const QByteArray &s) const; + + friend inline bool operator==(const char *s1, const QString &s2); + friend inline bool operator!=(const char *s1, const QString &s2); + friend inline bool operator<(const char *s1, const QString &s2); + friend inline bool operator>(const char *s1, const QString &s2); + friend inline bool operator<=(const char *s1, const QString &s2); + friend inline bool operator>=(const char *s1, const QString &s2); #endif typedef QChar *iterator; @@ -1252,69 +1252,69 @@ inline bool QString::operator<=(const char *s) const inline bool QString::operator>=(const char *s) const { return QString::compare_helper(constData(), size(), s, -1) >= 0; } -inline QT_ASCII_CAST_WARN bool operator==(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline bool operator==(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) == 0; } -inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline bool operator!=(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) != 0; } -inline QT_ASCII_CAST_WARN bool operator<(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline bool operator<(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) > 0; } -inline QT_ASCII_CAST_WARN bool operator>(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline bool operator>(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) < 0; } -inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline bool operator<=(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) >= 0; } -inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline bool operator>=(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) <= 0; } -inline QT_ASCII_CAST_WARN bool operator==(const char *s1, QLatin1String s2) +QT_ASCII_CAST_WARN inline bool operator==(const char *s1, QLatin1String s2) { return QString::fromUtf8(s1) == s2; } -inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, QLatin1String s2) +QT_ASCII_CAST_WARN inline bool operator!=(const char *s1, QLatin1String s2) { return QString::fromUtf8(s1) != s2; } -inline QT_ASCII_CAST_WARN bool operator<(const char *s1, QLatin1String s2) +QT_ASCII_CAST_WARN inline bool operator<(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) < s2); } -inline QT_ASCII_CAST_WARN bool operator>(const char *s1, QLatin1String s2) +QT_ASCII_CAST_WARN inline bool operator>(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) > s2); } -inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, QLatin1String s2) +QT_ASCII_CAST_WARN inline bool operator<=(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) <= s2); } -inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, QLatin1String s2) +QT_ASCII_CAST_WARN inline bool operator>=(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) >= s2); } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator==(const char *s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator==(const char *s) const { return QString::fromUtf8(s) == *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator!=(const char *s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator!=(const char *s) const { return QString::fromUtf8(s) != *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator<(const char *s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator<(const char *s) const { return QString::fromUtf8(s) > *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator>(const char *s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator>(const char *s) const { return QString::fromUtf8(s) < *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator<=(const char *s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator<=(const char *s) const { return QString::fromUtf8(s) >= *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator>=(const char *s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator>=(const char *s) const { return QString::fromUtf8(s) <= *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator==(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator==(const QByteArray &s) const { return QString::fromUtf8(s) == *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator!=(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator!=(const QByteArray &s) const { return QString::fromUtf8(s) != *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator<(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator<(const QByteArray &s) const { return QString::fromUtf8(s) > *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator>(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator>(const QByteArray &s) const { return QString::fromUtf8(s) < *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator<=(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator<=(const QByteArray &s) const { return QString::fromUtf8(s) >= *this; } -inline QT_ASCII_CAST_WARN bool QLatin1String::operator>=(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QLatin1String::operator>=(const QByteArray &s) const { return QString::fromUtf8(s) <= *this; } -inline QT_ASCII_CAST_WARN bool QString::operator==(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QString::operator==(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), qstrnlen(s.constData(), s.size())) == 0; } -inline QT_ASCII_CAST_WARN bool QString::operator!=(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QString::operator!=(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), qstrnlen(s.constData(), s.size())) != 0; } -inline QT_ASCII_CAST_WARN bool QString::operator<(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QString::operator<(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), s.size()) < 0; } -inline QT_ASCII_CAST_WARN bool QString::operator>(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QString::operator>(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), s.size()) > 0; } -inline QT_ASCII_CAST_WARN bool QString::operator<=(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QString::operator<=(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), s.size()) <= 0; } -inline QT_ASCII_CAST_WARN bool QString::operator>=(const QByteArray &s) const +QT_ASCII_CAST_WARN inline bool QString::operator>=(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), s.size()) >= 0; } inline bool QByteArray::operator==(const QString &s) const @@ -1339,13 +1339,13 @@ inline const QString operator+(const QString &s1, QChar s2) inline const QString operator+(QChar s1, const QString &s2) { QString t(s1); t += s2; return t; } # if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) -inline QT_ASCII_CAST_WARN const QString operator+(const QString &s1, const char *s2) +QT_ASCII_CAST_WARN inline const QString operator+(const QString &s1, const char *s2) { QString t(s1); t += QString::fromUtf8(s2); return t; } -inline QT_ASCII_CAST_WARN const QString operator+(const char *s1, const QString &s2) +QT_ASCII_CAST_WARN inline const QString operator+(const char *s1, const QString &s2) { QString t = QString::fromUtf8(s1); t += s2; return t; } -inline QT_ASCII_CAST_WARN const QString operator+(const QByteArray &ba, const QString &s) +QT_ASCII_CAST_WARN inline const QString operator+(const QByteArray &ba, const QString &s) { QString t = QString::fromUtf8(ba); t += s; return t; } -inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteArray &ba) +QT_ASCII_CAST_WARN inline const QString operator+(const QString &s, const QByteArray &ba) { QString t(s); t += QString::fromUtf8(ba); return t; } # endif // QT_NO_CAST_FROM_ASCII #endif // QT_USE_QSTRINGBUILDER diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index 81e10feef1..4037fecf69 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -178,7 +178,7 @@ template <> struct QConcatenable : private QAbstractConcatenable enum { ExactSize = true }; static qsizetype size(const char) { return 1; } #ifndef QT_NO_CAST_FROM_ASCII - static inline QT_ASCII_CAST_WARN void appendTo(const char c, QChar *&out) + QT_ASCII_CAST_WARN static inline void appendTo(const char c, QChar *&out) { QAbstractConcatenable::convertFromAscii(c, out); } @@ -286,7 +286,7 @@ template struct QConcatenable : private QAbstractConcaten enum { ExactSize = false }; static qsizetype size(const char[N]) { return N - 1; } #ifndef QT_NO_CAST_FROM_ASCII - static inline void QT_ASCII_CAST_WARN appendTo(const char a[N], QChar *&out) + QT_ASCII_CAST_WARN static inline void appendTo(const char a[N], QChar *&out) { QAbstractConcatenable::convertFromAscii(a, N - 1, out); } @@ -310,7 +310,7 @@ template <> struct QConcatenable : private QAbstractConcatenable enum { ExactSize = false }; static qsizetype size(const char *a) { return qstrlen(a); } #ifndef QT_NO_CAST_FROM_ASCII - static inline void QT_ASCII_CAST_WARN appendTo(const char *a, QChar *&out) + QT_ASCII_CAST_WARN static inline void appendTo(const char *a, QChar *&out) { QAbstractConcatenable::convertFromAscii(a, -1, out); } #endif static inline void appendTo(const char *a, char *&out) @@ -351,7 +351,7 @@ template <> struct QConcatenable : private QAbstractConcatenab using ConvertTo = QString; enum { ExactSize = true }; static qsizetype size(const char16_t *a) { return QStringView(a).size(); } - static inline void QT_ASCII_CAST_WARN appendTo(const char16_t *a, QChar *&out) + QT_ASCII_CAST_WARN static inline void appendTo(const char16_t *a, QChar *&out) { if (!a) return; @@ -372,7 +372,7 @@ template <> struct QConcatenable : private QAbstractConcatenable enum { ExactSize = false }; static qsizetype size(const QByteArray &ba) { return ba.size(); } #ifndef QT_NO_CAST_FROM_ASCII - static inline QT_ASCII_CAST_WARN void appendTo(const QByteArray &ba, QChar *&out) + QT_ASCII_CAST_WARN static inline void appendTo(const QByteArray &ba, QChar *&out) { QAbstractConcatenable::convertFromAscii(ba.constData(), ba.size(), out); } diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 78c596bea6..c4f5e2a0fa 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1182,21 +1182,6 @@ QDBusConnection QDBusConnection::systemBus() return QDBusConnection(_q_manager()->busConnection(SystemBus)); } -#if QT_DEPRECATED_SINCE(5,5) -/*! - \deprecated - - Always returns a disconnected, invalid QDBusConnection object. For the old - functionality of determining the sender connection, please use QDBusContext. - - \sa QDBusContext -*/ -QDBusConnection QDBusConnection::sender() -{ - return QDBusConnection(QString()); -} -#endif - /*! \internal */ diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 7304f2a8a2..43bc547894 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -202,11 +202,6 @@ public: static QDBusConnection sessionBus(); static QDBusConnection systemBus(); -#if QT_DEPRECATED_SINCE(5,5) - static QT_DEPRECATED_X("This function no longer works, use QDBusContext instead") - QDBusConnection sender(); -#endif - protected: explicit QDBusConnection(QDBusConnectionPrivate *dd); -- cgit v1.2.3