diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-02-01 16:05:01 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-02-04 03:49:13 +0100 |
| commit | 95b919339b660503ea4f7a080f7b9c8085e83ce6 (patch) | |
| tree | 4b3aed8ab43f52a19cf6a347a092bbc2b755aafa | |
| parent | 09b92c44ca5c75991bbe125bdd9207235a7a1cea (diff) | |
QLocale: Use Q_REMOVED_SINCE instead of explicit version checks
Use Q_REMOVED_SINCE macro for languageToCode()/codeToLanguage()
API changes.
Change-Id: I8cc5279b1272165541c345241af49523c0f25737
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(adapted from commit 6afa04f16c268d97d4d41a5420594aac1f20881f)
| -rw-r--r-- | src/corelib/compat/removed_api.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 22 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.h | 7 |
3 files changed, 14 insertions, 27 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 29cf3fbafd..630cbd5451 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -133,6 +133,18 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char } # endif +#include "qlocale.h" + +QString QLocale::languageToCode(Language language) +{ + return languageToCode(language, QLocale::AnyLanguageCode); +} + +QLocale::Language QLocale::codeToLanguage(QStringView languageCode) noexcept +{ + return codeToLanguage(languageCode, QLocale::AnyLanguageCode); +} + #include "qoperatingsystemversion.h" int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index c6b234ec1b..f0319c7570 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -1430,17 +1430,6 @@ QString QLocale::languageToCode(Language language, LanguageCodeTypes codeTypes) return QLocalePrivate::languageToCode(language, codeTypes); } -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -/*! - \overload - \since 6.1 -*/ -QString QLocale::languageToCode(Language language) -{ - return QLocalePrivate::languageToCode(language); -} -#endif - /*! Returns the QLocale::Language enum corresponding to the two- or three-letter \a languageCode, as defined in the ISO 639 standards. @@ -1461,17 +1450,6 @@ QLocale::Language QLocale::codeToLanguage(QStringView languageCode, return QLocalePrivate::codeToLanguage(languageCode, codeTypes); } -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -/*! - \overload - \since 6.1 -*/ -QLocale::Language QLocale::codeToLanguage(QStringView languageCode) noexcept -{ - return QLocalePrivate::codeToLanguage(languageCode); -} -#endif - /*! \since 6.2 diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index 7f1d47063b..4ae130ee2a 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1104,16 +1104,13 @@ public: }; Q_DECLARE_FLAGS(LanguageCodeTypes, LanguageCodeType) -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +#if QT_REMOVED_SINCE(6, 3) static QString languageToCode(Language language); - static QString languageToCode(Language language, LanguageCodeTypes codeTypes); static Language codeToLanguage(QStringView languageCode) noexcept; - static Language codeToLanguage(QStringView languageCode, LanguageCodeTypes codeTypes) noexcept; -#else +#endif static QString languageToCode(Language language, LanguageCodeTypes codeTypes = AnyLanguageCode); static Language codeToLanguage(QStringView languageCode, LanguageCodeTypes codeTypes = AnyLanguageCode) noexcept; -#endif static QString territoryToCode(Territory territory); static Territory codeToTerritory(QStringView territoryCode) noexcept; #if QT_DEPRECATED_SINCE(6, 6) |