From d6d3841e71473d3e9253b3088bc4094a7546600e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Oct 2014 17:03:48 +0200 Subject: Improve QDebug formatting of QtSql classes. Fix quoting/spaces, introduce QDebugStateSaver, add missing fields of QSqlField. Task-number: QTBUG-39388 Change-Id: Id397f9e79f4d4d2bb5c903cd96bf2c27f8e1b7c3 Reviewed-by: Kai Koehne --- src/sql/kernel/qsqldatabase.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/sql/kernel/qsqldatabase.cpp') diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 31f0e2dc9e5..dbc95dc5a8a 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1503,15 +1503,18 @@ QSql::NumericalPrecisionPolicy QSqlDatabase::numericalPrecisionPolicy() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QSqlDatabase &d) { + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg.noquote(); if (!d.isValid()) { - dbg.nospace() << "QSqlDatabase(invalid)"; - return dbg.space(); + dbg << "QSqlDatabase(invalid)"; + return dbg; } - dbg.nospace() << "QSqlDatabase(driver=\"" << d.driverName() << "\", database=\"" - << d.databaseName() << "\", host=\"" << d.hostName() << "\", port=" << d.port() - << ", user=\"" << d.userName() << "\", open=" << d.isOpen() << ")"; - return dbg.space(); + dbg << "QSqlDatabase(driver=\"" << d.driverName() << "\", database=\"" + << d.databaseName() << "\", host=\"" << d.hostName() << "\", port=" << d.port() + << ", user=\"" << d.userName() << "\", open=" << d.isOpen() << ')'; + return dbg; } #endif -- cgit v1.2.3