From 494882adadb33ffb7a7a9b2fa9356362df87d3bf Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 14 Jan 2014 11:11:00 +0100 Subject: fix conditionals in DayTimeDuration::stringValue() Task-number: QTBUG-35479 Change-Id: If385bd85f5c20871a0248c828626deea2d72e0a2 Reviewed-by: Friedemann Kleint Reviewed-by: Peter Hartmann --- src/xmlpatterns/data/qdaytimeduration.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xmlpatterns/data/qdaytimeduration.cpp b/src/xmlpatterns/data/qdaytimeduration.cpp index c21e352..5f273d7 100644 --- a/src/xmlpatterns/data/qdaytimeduration.cpp +++ b/src/xmlpatterns/data/qdaytimeduration.cpp @@ -145,8 +145,7 @@ QString DayTimeDuration::stringValue() const retval.append(QLatin1Char('D')); } - if(!m_hours && !m_minutes && !m_seconds && !m_seconds) - { + if (!m_hours && !m_minutes && !m_seconds && !m_mseconds) { if(!m_days) return QLatin1String("PT0S"); else @@ -167,8 +166,7 @@ QString DayTimeDuration::stringValue() const retval.append(QLatin1Char('M')); } - if(m_seconds || m_seconds) - { + if (m_seconds || m_mseconds) { retval.append(QString::number(m_seconds)); if(m_mseconds) -- cgit v1.2.1 From 0f62c3b6d48928710e2ac5c73cd4b69b8f423a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 15 Jan 2014 17:09:39 +0100 Subject: Minor optimization, use QStringRef over QString That way we avoid some unnecessary memory allocations Change-Id: I597443393671d57b1a47b37eb15c3eca54ee4168 Reviewed-by: Mitch Curtis --- tools/xmlpatterns/qapplicationargumentparser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 9bf407b..031e088 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -464,7 +464,7 @@ QString QApplicationArgumentParserPrivate::lineWrap(const QString &input, return input; int from = wrapFinder.toPreviousBoundary(); - output.append(input.left(from)); + output.append(input.leftRef(from)); while(true) { @@ -476,7 +476,7 @@ QString QApplicationArgumentParserPrivate::lineWrap(const QString &input, output.append(QLatin1Char('\n')); output.append(indent); - output.append(input.mid(from, currentWidthPos - from).trimmed()); + output.append(input.midRef(from, currentWidthPos - from).trimmed().toString()); from += (currentWidthPos - from); } else @@ -484,7 +484,7 @@ QString QApplicationArgumentParserPrivate::lineWrap(const QString &input, /* Append the remains. */ output.append(QLatin1Char('\n')); output.append(indent); - output.append(input.mid(from).trimmed()); + output.append(input.midRef(from).trimmed().toString()); break; } } -- cgit v1.2.1 From ecf06489d90385cf2ca67dc5f70529f76421beae Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 15 Jan 2014 23:03:01 +0100 Subject: Bump MODULE_VERSION to 5.2.2 Change-Id: Ibf702ab35725578d4f72f4959b1bcca9d8332ce0 Reviewed-by: Thiago Macieira --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d080298..1069628 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.2.1 +MODULE_VERSION = 5.2.2 -- cgit v1.2.1