diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-30 14:24:21 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-30 12:59:58 +0000 |
| commit | 3203ac3f4e245427902bd912cb0c644c7e870657 (patch) | |
| tree | 9c5bf3dc0b22d59bc683a5cbccadc2a82e27644b /src/dbus | |
| parent | c7b003ea3b8b4b7124d4971df7d910f2bc3fc4fa (diff) | |
Use QDebugStateSaver to restore space setting in stream operators.
Returning dbg.space() breaks formatting on streams that already
have nospace() set.
Change-Id: I55e38b018679a67eb40be6b4664505483a3a7d8e
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbuserror.cpp | 3 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 6 | ||||
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index 0cfb0aa7c2..2b13f90fac 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -395,8 +395,9 @@ QString QDBusError::errorString(ErrorType error) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QDBusError &msg) { + QDebugStateSaver saver(dbg); dbg.nospace() << "QDBusError(" << msg.name() << ", " << msg.message() << ')'; - return dbg.space(); + return dbg; } #endif diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 74d6a11dee..6edf08ebbe 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -91,18 +91,20 @@ static inline QString dbusInterfaceString() static inline QDebug operator<<(QDebug dbg, const QThread *th) { + QDebugStateSaver saver(dbg); dbg.nospace() << "QThread(ptr=" << (const void*)th; if (th && !th->objectName().isEmpty()) dbg.nospace() << ", name=" << th->objectName(); else if (th) dbg.nospace() << ", name=" << th->metaObject()->className(); dbg.nospace() << ')'; - return dbg.space(); + return dbg; } #if QDBUS_THREAD_DEBUG static inline QDebug operator<<(QDebug dbg, const QDBusConnectionPrivate *conn) { + QDebugStateSaver saver(dbg); dbg.nospace() << "QDBusConnection(" << "ptr=" << (const void*)conn << ", name=" << conn->name @@ -113,7 +115,7 @@ static inline QDebug operator<<(QDebug dbg, const QDBusConnectionPrivate *conn) else dbg.nospace() << conn->thread(); dbg.nospace() << ')'; - return dbg.space(); + return dbg; } void qdbusDefaultThreadDebug(int action, int condition, QDBusConnectionPrivate *conn) diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 491e1273e7..b92e7f5cd7 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -785,6 +785,7 @@ static void debugVariantList(QDebug dbg, const QVariantList &list) QDebug operator<<(QDebug dbg, const QDBusMessage &msg) { + QDebugStateSaver saver(dbg); dbg.nospace() << "QDBusMessage(type=" << msg.type() << ", service=" << msg.service(); if (msg.type() == QDBusMessage::MethodCallMessage || @@ -799,7 +800,7 @@ QDebug operator<<(QDebug dbg, const QDBusMessage &msg) << ", contents=("; debugVariantList(dbg, msg.arguments()); dbg.nospace() << ") )"; - return dbg.space(); + return dbg; } #endif |