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>

diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index d2bb752..595f178 100644 (file)
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -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
 

diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 55dd55b..dca3dd7 100644 (file)
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -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); }