whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deinlined QLocale::operator== 

Some time ago this was a blocker that didn't allow to refactor QLocale
implementation due without making binary incompatible changes. Deinlining those
functions for Qt5, it shouldn't be performance critical code path.

Change-Id: I6cb19e32188a2df223d04be0c613a6176ad8d118
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Denis Dzyubenko 2012-01-02 22:34:50 +01:00 committed by Qt by Nokia
parent 01674860ac
commit e570cad9d7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/tools/qlocale.cpp
View File

@ -775,6 +775,16 @@ QLocale &QLocale::operator=(const QLocale &other)
return *this;
}
bool QLocale::operator==(const QLocale &other) const
{
return d() == other.d() && numberOptions() == other.numberOptions();
}
bool QLocale::operator!=(const QLocale &other) const
{
return d() != other.d() || numberOptions() != other.numberOptions();
}
/*!
\since 4.2

8
src/corelib/tools/qlocale.h
View File

@ -739,8 +739,8 @@ public:
QStringList uiLanguages() const;
inline bool operator==(const QLocale &other) const;
inline bool operator!=(const QLocale &other) const;
bool operator==(const QLocale &other) const;
bool operator!=(const QLocale &other) const;
static QString languageToString(Language language);
static QString countryToString(Country country);
@ -789,10 +789,6 @@ inline QString QLocale::toString(uint i) const
{ return toString(qulonglong(i)); }
inline QString QLocale::toString(float i, char f, int prec) const
{ return toString(double(i), f, prec); }
inline bool QLocale::operator==(const QLocale &other) const
{ return d() == other.d() && numberOptions() == other.numberOptions(); }
inline bool QLocale::operator!=(const QLocale &other) const
{ return d() != other.d() || numberOptions() != other.numberOptions(); }
inline QString QLocale::toCurrencyString(short i, const QString &symbol) const
{ return toCurrencyString(qlonglong(i), symbol); }