diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-02-01 16:05:01 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-02-03 18:31:44 +0100 |
| commit | 6afa04f16c268d97d4d41a5420594aac1f20881f (patch) | |
| tree | 9d95b0e7548ac9469c8181da3f7c12aa36f95937 /src/corelib/text/qlocale.cpp | |
| parent | b0e8ba783b6c6225fcedf5130726ee43f8ce1aa4 (diff) | |
QLocale: Use Q_CORE_REMOVED_SINCE instead of explicit version checks
Use Q_CORE_REMOVED_SINCE macro for languageToCode()/codeToLanguage()
API changes.
Pick-to: 6.3
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>
Diffstat (limited to 'src/corelib/text/qlocale.cpp')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index dbfdbceac5..4d859d32ee 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 |