From 981c1fe15f68106b88d89b5e31c8a932b95bb635 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 27 Feb 2020 11:36:54 +0100 Subject: [PATCH] QDebug::toString(): use nospace() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intended use cases for toString() are the situations where you can't use operator<<, such as QVERIFY2, Q_ASSERT_X, etc., which means that it will often be used as an argument to e.g. QString::arg(), where the user has control over the structure of the message. For that reason, adding an extra space to the end is not necessary and just gets in the way. This amends 658b9697f9d85d4ed294810b4f60bafdbdd8e247. Change-Id: I0695e6809026a0f92ed783899da80de4fa2a1684 Reviewed-by: Mårten Nordheim --- src/corelib/doc/src/includes/qdebug-toString.qdocinc | 2 ++ src/corelib/io/qdebug.h | 4 ++-- tests/auto/corelib/io/qdebug/tst_qdebug.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/corelib/doc/src/includes/qdebug-toString.qdocinc b/src/corelib/doc/src/includes/qdebug-toString.qdocinc index 4602a105113..db1e1ab4537 100644 --- a/src/corelib/doc/src/includes/qdebug-toString.qdocinc +++ b/src/corelib/doc/src/includes/qdebug-toString.qdocinc @@ -5,3 +5,5 @@ This function is useful for cases where you need the textual representation of an object for debugging, but cannot use \c {operator<<}. For example: \snippet code/src_corelib_io_qdebug.cpp toString + +The string is streamed using \l nospace(). diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 48b7538c8ef..e14d31f38ab 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -179,7 +179,7 @@ public: { QString buffer; QDebug stream(&buffer); - stream << object; + stream.nospace() << object; return buffer; } @@ -188,7 +188,7 @@ public: { QString buffer; QDebug stream(&buffer); - stream << object; + stream.nospace() << object; return buffer; } }; diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp index 7b9e614cf74..4260accfd07 100644 --- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp +++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp @@ -748,7 +748,7 @@ void tst_QDebug::toString() const MyPoint point(3, 4); QString expectedString; QDebug stream(&expectedString); - stream << point; + stream.nospace() << point; QCOMPARE(QDebug::toString(point), expectedString); } @@ -758,7 +758,7 @@ void tst_QDebug::toString() const qobject.setObjectName("test"); QString expectedString; QDebug stream(&expectedString); - stream << &qobject; + stream.nospace() << &qobject; QCOMPARE(QDebug::toString(&qobject), expectedString); } }