diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-05-23 03:49:57 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-25 21:49:21 +0200 |
commit | 09f20e75a4556e9c2f24db8606def88770e6f5df (patch) | |
tree | 79ab22178fe6168022aa5297ca69e954b8590ebc /src/corelib/tools | |
parent | c31681ab623297ce767d78d68b04ccf551607ef1 (diff) |
Replace `const QLatin1String &` with `QLatin1String` where appropriate
Task-Id: QTBUG-24502
Change-Id: I360dee4dc68c165de0631ce4cf34e76fd873080e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qhash.cpp | 4 | ||||
-rw-r--r-- | src/corelib/tools/qhash.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qstring.cpp | 74 | ||||
-rw-r--r-- | src/corelib/tools/qstring.h | 82 | ||||
-rw-r--r-- | src/corelib/tools/qstringbuilder.h | 6 |
5 files changed, 81 insertions, 87 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index cc8f5beca5..fb566333ac 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -140,7 +140,7 @@ uint qHash(const QBitArray &bitArray, uint seed) return result; } -uint qHash(const QLatin1String &key, uint seed) +uint qHash(QLatin1String key, uint seed) { return hash(reinterpret_cast<const uchar *>(key.data()), key.size(), seed); } @@ -655,7 +655,7 @@ void QHashData::checkSanity() \fn uint qHash(const QBitArray &key, uint seed = 0) \fn uint qHash(const QString &key, uint seed = 0) \fn uint qHash(const QStringRef &key, uint seed = 0) - \fn uint qHash(const QLatin1String &key, uint seed = 0) + \fn uint qHash(QLatin1String key, uint seed = 0) \relates QHash \since 5.0 diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 3936e36efb..93af8f63d5 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -88,7 +88,7 @@ Q_CORE_EXPORT uint qHash(const QByteArray &key, uint seed = 0); Q_CORE_EXPORT uint qHash(const QString &key, uint seed = 0); Q_CORE_EXPORT uint qHash(const QStringRef &key, uint seed = 0); Q_CORE_EXPORT uint qHash(const QBitArray &key, uint seed = 0); -Q_CORE_EXPORT uint qHash(const QLatin1String &key, uint seed = 0); +Q_CORE_EXPORT uint qHash(QLatin1String key, uint seed = 0); Q_CORE_EXPORT uint qt_hash(const QString &key); #if defined(Q_CC_MSVC) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 39e10466f7..a0a3a28b96 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -117,7 +117,7 @@ static inline int qt_string_count(const QChar *haystack, int haystackLen, Qt::CaseSensitivity cs); static inline int qt_string_count(const QChar *haystack, int haystackLen, QChar needle, Qt::CaseSensitivity cs); -static inline int qt_find_latin1_string(const QChar *hay, int size, const QLatin1String &needle, +static inline int qt_find_latin1_string(const QChar *hay, int size, QLatin1String needle, int from, Qt::CaseSensitivity cs); static inline bool qt_starts_with(const QChar *haystack, int haystackLen, const QChar *needle, int needleLen, Qt::CaseSensitivity cs); @@ -1091,7 +1091,7 @@ QString::QString(int size, Qt::Initialization) d->data()[size] = '\0'; } -/*! \fn QString::QString(const QLatin1String &str) +/*! \fn QString::QString(QLatin1String str) Constructs a copy of the Latin-1 string \a str. @@ -1328,7 +1328,7 @@ QString &QString::operator=(const QString &other) } -/*! \fn QString &QString::operator=(const QLatin1String &str) +/*! \fn QString &QString::operator=(QLatin1String str) \overload operator=() @@ -1404,12 +1404,12 @@ QString &QString::operator=(QChar ch) /*! - \fn QString &QString::insert(int position, const QLatin1String &str) + \fn QString &QString::insert(int position, QLatin1String str) \overload insert() Inserts the Latin-1 string \a str at the given index \a position. */ -QString &QString::insert(int i, const QLatin1String &str) +QString &QString::insert(int i, QLatin1String str) { const uchar *s = (const uchar *)str.latin1(); if (i < 0 || !s || !(*s)) @@ -1512,7 +1512,7 @@ QString &QString::append(const QString &str) Appends the Latin-1 string \a str to this string. */ -QString &QString::append(const QLatin1String &str) +QString &QString::append(QLatin1String str) { const uchar *s = (const uchar *)str.latin1(); if (s) { @@ -1579,7 +1579,7 @@ QString &QString::append(QChar ch) \sa append(), insert() */ -/*! \fn QString &QString::prepend(const QLatin1String &str) +/*! \fn QString &QString::prepend(QLatin1String str) \overload prepend() @@ -2021,9 +2021,7 @@ QString& QString::replace(QChar before, QChar after, Qt::CaseSensitivity cs) \note The text is not rescanned after a replacement. */ -QString &QString::replace(const QLatin1String &before, - const QLatin1String &after, - Qt::CaseSensitivity cs) +QString &QString::replace(QLatin1String before, QLatin1String after, Qt::CaseSensitivity cs) { int alen = after.size(); QVarLengthArray<ushort> a(alen); @@ -2048,9 +2046,7 @@ QString &QString::replace(const QLatin1String &before, \note The text is not rescanned after a replacement. */ -QString &QString::replace(const QLatin1String &before, - const QString &after, - Qt::CaseSensitivity cs) +QString &QString::replace(QLatin1String before, const QString &after, Qt::CaseSensitivity cs) { int blen = before.size(); QVarLengthArray<ushort> b(blen); @@ -2071,9 +2067,7 @@ QString &QString::replace(const QLatin1String &before, \note The text is not rescanned after a replacement. */ -QString &QString::replace(const QString &before, - const QLatin1String &after, - Qt::CaseSensitivity cs) +QString &QString::replace(const QString &before, QLatin1String after, Qt::CaseSensitivity cs) { int alen = after.size(); QVarLengthArray<ushort> a(alen); @@ -2094,7 +2088,7 @@ QString &QString::replace(const QString &before, \note The text is not rescanned after a replacement. */ -QString &QString::replace(QChar c, const QLatin1String &after, Qt::CaseSensitivity cs) +QString &QString::replace(QChar c, QLatin1String after, Qt::CaseSensitivity cs) { int alen = after.size(); QVarLengthArray<ushort> a(alen); @@ -2125,7 +2119,7 @@ bool operator==(const QString &s1, const QString &s2) /*! \overload operator==() */ -bool QString::operator==(const QLatin1String &other) const +bool QString::operator==(QLatin1String other) const { if (d->size != other.size()) return false; @@ -2191,7 +2185,7 @@ bool operator<(const QString &s1, const QString &s2) /*! \overload operator<() */ -bool QString::operator<(const QLatin1String &other) const +bool QString::operator<(QLatin1String other) const { const uchar *c = (uchar *) other.latin1(); if (!c || *c == 0) @@ -2247,7 +2241,7 @@ bool QString::operator<(const QLatin1String &other) const localeAwareCompare(). */ -/*! \fn bool QString::operator<=(const QLatin1String &other) const +/*! \fn bool QString::operator<=(QLatin1String other) const \overload operator<=() */ @@ -2293,7 +2287,7 @@ bool QString::operator<(const QLatin1String &other) const /*! \overload operator>() */ -bool QString::operator>(const QLatin1String &other) const +bool QString::operator>(QLatin1String other) const { const uchar *c = (uchar *) other.latin1(); if (!c || *c == '\0') @@ -2350,7 +2344,7 @@ bool QString::operator>(const QLatin1String &other) const localeAwareCompare(). */ -/*! \fn bool QString::operator>=(const QLatin1String &other) const +/*! \fn bool QString::operator>=(QLatin1String other) const \overload operator>=() */ @@ -2394,7 +2388,7 @@ bool QString::operator>(const QLatin1String &other) const localeAwareCompare(). */ -/*! \fn bool QString::operator!=(const QLatin1String &other) const +/*! \fn bool QString::operator!=(QLatin1String other) const \overload operator!=() */ @@ -2467,7 +2461,7 @@ int QString::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const \sa lastIndexOf(), contains(), count() */ -int QString::indexOf(const QLatin1String &str, int from, Qt::CaseSensitivity cs) const +int QString::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const { return qt_find_latin1_string(unicode(), size(), str, from, cs); } @@ -2677,7 +2671,7 @@ int QString::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) c \sa indexOf(), contains(), count() */ -int QString::lastIndexOf(const QLatin1String &str, int from, Qt::CaseSensitivity cs) const +int QString::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const { const int sl = str.size(); if (sl == 1) @@ -3701,7 +3695,7 @@ bool QString::startsWith(const QString& s, Qt::CaseSensitivity cs) const /*! \overload startsWith() */ -bool QString::startsWith(const QLatin1String& s, Qt::CaseSensitivity cs) const +bool QString::startsWith(QLatin1String s, Qt::CaseSensitivity cs) const { return qt_starts_with(isNull() ? 0 : unicode(), size(), s, cs); } @@ -3775,7 +3769,7 @@ bool QString::endsWith(const QStringRef &s, Qt::CaseSensitivity cs) const /*! \overload endsWith() */ -bool QString::endsWith(const QLatin1String& s, Qt::CaseSensitivity cs) const +bool QString::endsWith(QLatin1String s, Qt::CaseSensitivity cs) const { return qt_ends_with(isNull() ? 0 : unicode(), size(), s, cs); } @@ -4554,7 +4548,7 @@ QString& QString::fill(QChar ch, int size) \sa append(), prepend() */ -/*! \fn QString &QString::operator+=(const QLatin1String &str) +/*! \fn QString &QString::operator+=(QLatin1String str) \overload operator+=() @@ -4780,7 +4774,7 @@ QString& QString::fill(QChar ch, int size) */ /*! - \fn int QString::compare(const QString &s1, const QLatin1String &s2, Qt::CaseSensitivity cs) + \fn int QString::compare(const QString &s1, QLatin1String s2, Qt::CaseSensitivity cs) \since 4.2 \overload compare() @@ -4789,7 +4783,7 @@ QString& QString::fill(QChar ch, int size) */ /*! - \fn int QString::compare(const QLatin1String &s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) + \fn int QString::compare(QLatin1String s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) \since 4.2 \overload compare() @@ -4837,7 +4831,7 @@ int QString::compare_helper(const QChar *data1, int length1, const QChar *data2, Same as compare(*this, \a other, \a cs). */ -int QString::compare(const QLatin1String &other, Qt::CaseSensitivity cs) const +int QString::compare(QLatin1String other, Qt::CaseSensitivity cs) const { return compare_helper(unicode(), length(), other, cs); } @@ -7494,7 +7488,7 @@ QString &QString::setRawData(const QChar *unicode, int size) benefits as the first version of the code, and is faster than converting the Latin-1 strings using QString::fromLatin1(). - Thanks to the QString(const QLatin1String &) constructor, + Thanks to the QString(QLatin1String) constructor, QLatin1String can be used everywhere a QString is expected. For example: @@ -7705,37 +7699,37 @@ QString &QString::setRawData(const QChar *unicode, int size) -/*! \fn bool operator==(const QLatin1String &s1, const QLatin1String &s2) +/*! \fn bool operator==(QLatin1String s1, QLatin1String s2) \relates QLatin1String Returns true if string \a s1 is lexically equal to string \a s2; otherwise returns false. */ -/*! \fn bool operator!=(const QLatin1String &s1, const QLatin1String &s2) +/*! \fn bool operator!=(QLatin1String s1, QLatin1String s2) \relates QLatin1String Returns true if string \a s1 is lexically unequal to string \a s2; otherwise returns false. */ -/*! \fn bool operator<(const QLatin1String &s1, const QLatin1String &s2) +/*! \fn bool operator<(QLatin1String s1, QLatin1String s2) \relates QLatin1String Returns true if string \a s1 is lexically smaller than string \a s2; otherwise returns false. */ -/*! \fn bool operator<=(const QLatin1String &s1, const QLatin1String &s2) +/*! \fn bool operator<=(QLatin1String s1, QLatin1String s2) \relates QLatin1String Returns true if string \a s1 is lexically smaller than or equal to string \a s2; otherwise returns false. */ -/*! \fn bool operator>(const QLatin1String &s1, const QLatin1String &s2) +/*! \fn bool operator>(QLatin1String s1, QLatin1String s2) \relates QLatin1String Returns true if string \a s1 is lexically greater than string \a s2; otherwise returns false. */ -/*! \fn bool operator>=(const QLatin1String &s1, const QLatin1String &s2) +/*! \fn bool operator>=(QLatin1String s1, QLatin1String s2) \relates QLatin1String Returns true if string \a s1 is lexically greater than or equal to @@ -8057,7 +8051,7 @@ bool operator==(const QString &s1,const QStringRef &s2) Returns true if string \a s1 is lexically equal to string reference \a s2; otherwise returns false. */ -bool operator==(const QLatin1String &s1, const QStringRef &s2) +bool operator==(QLatin1String s1, const QStringRef &s2) { if (s1.size() != s2.size()) return false; @@ -8924,7 +8918,7 @@ static inline int qt_string_count(const QChar *unicode, int size, QChar ch, } static inline int qt_find_latin1_string(const QChar *haystack, int size, - const QLatin1String &needle, + QLatin1String needle, int from, Qt::CaseSensitivity cs) { const char *latin1 = needle.latin1(); diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index cc4ed75056..34e3dbde4f 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -226,12 +226,12 @@ public: explicit QString(const QChar *unicode, int size = -1); QString(QChar c); QString(int size, QChar c); - inline QString(const QLatin1String &latin1); + inline QString(QLatin1String latin1); inline QString(const QString &); inline ~QString(); QString &operator=(QChar c); QString &operator=(const QString &); - inline QString &operator=(const QLatin1String &); + inline QString &operator=(QLatin1String latin1); #ifdef Q_COMPILER_RVALUE_REFS inline QString(QString && other) : d(other.d) { other.d = Data::sharedNull(); } inline QString &operator=(QString &&other) @@ -323,11 +323,11 @@ public: int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int indexOf(const QString &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int indexOf(const QLatin1String &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + int indexOf(QLatin1String s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int indexOf(const QStringRef &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(const QString &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int lastIndexOf(const QLatin1String &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + int lastIndexOf(QLatin1String s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(const QStringRef &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -381,11 +381,11 @@ public: bool startsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool startsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - bool startsWith(const QLatin1String &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool endsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool endsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - bool endsWith(const QLatin1String &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; QString leftJustified(int width, QChar fill = QLatin1Char(' '), bool trunc = false) const Q_REQUIRED_RESULT; @@ -402,14 +402,14 @@ public: QString &insert(int i, QChar c); QString &insert(int i, const QChar *uc, int len); inline QString &insert(int i, const QString &s) { return insert(i, s.constData(), s.length()); } - QString &insert(int i, const QLatin1String &s); + QString &insert(int i, QLatin1String s); QString &append(QChar c); QString &append(const QString &s); QString &append(const QStringRef &s); - QString &append(const QLatin1String &s); + QString &append(QLatin1String s); inline QString &prepend(QChar c) { return insert(0, c); } inline QString &prepend(const QString &s) { return insert(0, s); } - inline QString &prepend(const QLatin1String &s) { return insert(0, s); } + inline QString &prepend(QLatin1String s) { return insert(0, s); } inline QString &operator+=(QChar c) { if (d->ref.isShared() || uint(d->size) + 2u > d->alloc) @@ -422,7 +422,7 @@ public: inline QString &operator+=(QChar::SpecialCharacter c) { return append(QChar(c)); } inline QString &operator+=(const QString &s) { return append(s); } inline QString &operator+=(const QStringRef &s) { return append(s); } - inline QString &operator+=(const QLatin1String &s) { return append(s); } + inline QString &operator+=(QLatin1String s) { return append(s); } QString &remove(int i, int len); QString &remove(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive); @@ -432,13 +432,13 @@ public: QString &replace(int i, int len, const QString &after); QString &replace(QChar before, QChar after, Qt::CaseSensitivity cs = Qt::CaseSensitive); QString &replace(const QChar *before, int blen, const QChar *after, int alen, Qt::CaseSensitivity cs = Qt::CaseSensitive); - QString &replace(const QLatin1String &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); - QString &replace(const QLatin1String &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); - QString &replace(const QString &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); + QString &replace(QLatin1String before, QLatin1String after, Qt::CaseSensitivity cs = Qt::CaseSensitive); + QString &replace(QLatin1String before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); + QString &replace(const QString &before, QLatin1String after, Qt::CaseSensitivity cs = Qt::CaseSensitive); QString &replace(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); QString &replace(QChar c, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); - QString &replace(QChar c, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); + QString &replace(QChar c, QLatin1String after, Qt::CaseSensitivity cs = Qt::CaseSensitive); #ifndef QT_NO_REGEXP QString &replace(const QRegExp &rx, const QString &after); inline QString &remove(const QRegExp &rx) @@ -520,15 +520,15 @@ public: inline QString &setUtf16(const ushort *utf16, int size); int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int compare(const QLatin1String &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + int compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; static inline int compare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return s1.compare(s2, cs); } - static inline int compare(const QString& s1, const QLatin1String &s2, + static inline int compare(const QString &s1, QLatin1String s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return s1.compare(s2, cs); } - static inline int compare(const QLatin1String& s1, const QString &s2, + static inline int compare(QLatin1String s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return -s2.compare(s1, cs); } @@ -580,12 +580,12 @@ public: friend inline bool operator<=(const QString &s1, const QString &s2) { return !(s1 > s2); } friend inline bool operator>=(const QString &s1, const QString &s2) { return !(s1 < s2); } - bool operator==(const QLatin1String &s) const; - bool operator<(const QLatin1String &s) const; - bool operator>(const QLatin1String &s) const; - inline bool operator!=(const QLatin1String &s) const { return !operator==(s); } - inline bool operator<=(const QLatin1String &s) const { return !operator>(s); } - inline bool operator>=(const QLatin1String &s) const { return !operator<(s); } + bool operator==(QLatin1String s) const; + bool operator<(QLatin1String s) const; + bool operator>(QLatin1String s) const; + inline bool operator!=(QLatin1String s) const { return !operator==(s); } + inline bool operator<=(QLatin1String s) const { return !operator>(s); } + inline bool operator>=(QLatin1String s) const { return !operator<(s); } // ASCII compatibility #ifndef QT_NO_CAST_FROM_ASCII @@ -732,7 +732,7 @@ public: inline DataPtr &data_ptr() { return d; } }; -inline QString::QString(const QLatin1String &aLatin1) : d(fromLatin1_helper(aLatin1.latin1(), aLatin1.size())) +inline QString::QString(QLatin1String aLatin1) : d(fromLatin1_helper(aLatin1.latin1(), aLatin1.size())) { } inline int QString::length() const { return d->size; } @@ -756,7 +756,7 @@ inline void QString::detach() { if (d->ref.isShared() || (d->offset != sizeof(QStringData))) reallocData(uint(d->size) + 1u); } inline bool QString::isDetached() const { return !d->ref.isShared(); } -inline QString &QString::operator=(const QLatin1String &s) +inline QString &QString::operator=(QLatin1String s) { *this = fromLatin1(s.latin1(), s.size()); return *this; @@ -1018,33 +1018,33 @@ inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, const QString &s2) inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, const QString &s2) { return QString::compare_helper(s2.constData(), s2.size(), s1, -1) >= 0; } -inline QT_ASCII_CAST_WARN bool operator==(const char *s1, const QLatin1String &s2) +inline QT_ASCII_CAST_WARN bool operator==(const char *s1, QLatin1String s2) { return QString::fromUtf8(s1) == s2; } -inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, const QLatin1String &s2) +inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, QLatin1String s2) { return QString::fromUtf8(s1) != s2; } -inline QT_ASCII_CAST_WARN bool operator<(const char *s1, const QLatin1String &s2) +inline QT_ASCII_CAST_WARN bool operator<(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) < s2); } -inline QT_ASCII_CAST_WARN bool operator>(const char *s1, const QLatin1String &s2) +inline QT_ASCII_CAST_WARN bool operator>(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) > s2); } -inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, const QLatin1String &s2) +inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) <= s2); } -inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, const QLatin1String &s2) +inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, QLatin1String s2) { return (QString::fromUtf8(s1) >= s2); } -inline bool operator==(const QLatin1String &s1, const QLatin1String &s2) +inline bool operator==(QLatin1String s1, QLatin1String s2) { return (s1.size() == s2.size() && !memcmp(s1.latin1(), s2.latin1(), s1.size())); } -inline bool operator!=(const QLatin1String &s1, const QLatin1String &s2) +inline bool operator!=(QLatin1String s1, QLatin1String s2) { return (s1.size() != s2.size() || memcmp(s1.latin1(), s2.latin1(), s1.size())); } -inline bool operator<(const QLatin1String &s1, const QLatin1String &s2) +inline bool operator<(QLatin1String s1, QLatin1String s2) { int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size())); return (r < 0) || (r == 0 && s1.size() < s2.size()); } -inline bool operator<=(const QLatin1String &s1, const QLatin1String &s2) +inline bool operator<=(QLatin1String s1, QLatin1String s2) { int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size())); return (r < 0) || (r == 0 && s1.size() <= s2.size()); } -inline bool operator>(const QLatin1String &s1, const QLatin1String &s2) +inline bool operator>(QLatin1String s1, QLatin1String s2) { int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size())); return (r > 0) || (r == 0 && s1.size() > s2.size()); } -inline bool operator>=(const QLatin1String &s1, const QLatin1String &s2) +inline bool operator>=(QLatin1String s1, QLatin1String s2) { int r = memcmp(s1.latin1(), s2.latin1(), qMin(s1.size(), s2.size())); return (r > 0) || (r == 0 && s1.size() >= s2.size()); } #endif // QT_NO_CAST_FROM_ASCII @@ -1305,12 +1305,12 @@ inline bool operator==(const QStringRef &s1,const QString &s2) { return s2 == s1; } inline bool operator!=(const QStringRef &s1,const QString &s2) { return s2 != s1; } -Q_CORE_EXPORT bool operator==(const QLatin1String &s1, const QStringRef &s2); -inline bool operator!=(const QLatin1String &s1,const QStringRef &s2) +Q_CORE_EXPORT bool operator==(QLatin1String s1, const QStringRef &s2); +inline bool operator!=(QLatin1String s1, const QStringRef &s2) { return !(s1 == s2); } -inline bool operator==(const QStringRef &s1,const QLatin1String &s2) +inline bool operator==(const QStringRef &s1, QLatin1String s2) { return s2 == s1; } -inline bool operator!=(const QStringRef &s1,const QLatin1String &s2) +inline bool operator!=(const QStringRef &s1, QLatin1String s2) { return s2 != s1; } Q_CORE_EXPORT bool operator<(const QStringRef &s1,const QStringRef &s2); diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 461430ab9a..2a083c90a0 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -227,13 +227,13 @@ template <> struct QConcatenable<QLatin1String> typedef QLatin1String type; typedef QString ConvertTo; enum { ExactSize = true }; - static int size(const QLatin1String &a) { return a.size(); } - static inline void appendTo(const QLatin1String &a, QChar *&out) + static int size(const QLatin1String a) { return a.size(); } + static inline void appendTo(const QLatin1String a, QChar *&out) { for (const char *s = a.data(); *s; ) *out++ = QLatin1Char(*s++); } - static inline void appendTo(const QLatin1String &a, char *&out) + static inline void appendTo(const QLatin1String a, char *&out) { for (const char *s = a.data(); *s; ) *out++ = *s++; |