From d5014234f2ea3424be046419410c95279ff45333 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 5 Mar 2018 18:42:35 +0100 Subject: [PATCH] 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 Reviewed-by: Tobias Hunger --- src/shared/proparser/proitems.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index 58349ddb716..a7566be2205 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(); }