diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-05 18:42:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-14 15:34:47 +0000 |
| commit | d5014234f2ea3424be046419410c95279ff45333 (patch) | |
| tree | 0eeff23b716bc52078d6958ffe94633b92dd96e3 /src | |
| parent | c86ea1c8ceba95b3d6d5cc566af1dfe3801b3dee (diff) | |
optimize operator+ ProString vs. char*
we have all necessary overloads now.
Change-Id: Ic4472eba15d4234e968fcb9443d0f79011aa43fd
(cherry picked from qtbase/f137957e0887a9321b69b9ba83ed6ccaedee57bb)
(cherry picked from qtbase/14505bbfea220a39c2158480db8ba788707ff332)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/proparser/proitems.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index 58349ddb71..a7566be220 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -206,9 +206,9 @@ inline QString operator+(const QString &one, const ProString &two) { return one + two.toQStringRef(); } inline QString operator+(const ProString &one, const char *two) - { return one + ProString(two); } // XXX optimize + { return one.toQStringRef() + QLatin1String(two); } inline QString operator+(const char *one, const ProString &two) - { return ProString(one) + two; } // XXX optimize + { return QLatin1String(one) + two.toQStringRef(); } inline QString &operator+=(QString &that, const ProString &other) { return that += other.toQStringRef(); } |