1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLocale: Use Q_CORE_REMOVED_SINCE instead of explicit version checks

Browse Source 
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>
This commit is contained in:
Ievgenii Meshcheriakov 2022-02-01 16:05:01 +01:00 committed by Marc Mutz
parent b0e8ba783b
commit 6afa04f16c
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/compat/removed_api.cpp
View File

@ -133,6 +133,18 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char
} }
# endif # 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" #include "qoperatingsystemversion.h"
int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,

22
src/corelib/text/qlocale.cpp
View File

@ -1430,17 +1430,6 @@ QString QLocale::languageToCode(Language language, LanguageCodeTypes codeTypes)
return QLocalePrivate::languageToCode(language, 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 Returns the QLocale::Language enum corresponding to the two- or three-letter
\a languageCode, as defined in the ISO 639 standards. \a languageCode, as defined in the ISO 639 standards.
@ -1461,17 +1450,6 @@ QLocale::Language QLocale::codeToLanguage(QStringView languageCode,
return QLocalePrivate::codeToLanguage(languageCode, codeTypes); 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 \since 6.2

7
src/corelib/text/qlocale.h
View File

@ -1104,16 +1104,13 @@ public:
}; };
Q_DECLARE_FLAGS(LanguageCodeTypes, LanguageCodeType) Q_DECLARE_FLAGS(LanguageCodeTypes, LanguageCodeType)
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_CORE_REMOVED_SINCE(6, 3)
static QString languageToCode(Language language); static QString languageToCode(Language language);
static QString languageToCode(Language language, LanguageCodeTypes codeTypes);
static Language codeToLanguage(QStringView languageCode) noexcept; static Language codeToLanguage(QStringView languageCode) noexcept;
static Language codeToLanguage(QStringView languageCode, LanguageCodeTypes codeTypes) noexcept; #endif
#else
static QString languageToCode(Language language, LanguageCodeTypes codeTypes = AnyLanguageCode); static QString languageToCode(Language language, LanguageCodeTypes codeTypes = AnyLanguageCode);
static Language codeToLanguage(QStringView languageCode, static Language codeToLanguage(QStringView languageCode,
LanguageCodeTypes codeTypes = AnyLanguageCode) noexcept; LanguageCodeTypes codeTypes = AnyLanguageCode) noexcept;
#endif
static QString territoryToCode(Territory territory); static QString territoryToCode(Territory territory);
static Territory codeToTerritory(QStringView territoryCode) noexcept; static Territory codeToTerritory(QStringView territoryCode) noexcept;
#if QT_DEPRECATED_SINCE(6, 6) #if QT_DEPRECATED_SINCE(6, 6)