Add a verbosity setting to QDebug.

Add setters for an int verbosity to QDebug. The streaming operators
can check on the setting and output more information accordingly.

[ChangeLog][QtCore][QDebug] How verbose a single debug output should be
can now be fine-tuned by setting a verbosity on the debug stream.

Change-Id: I77001fcf1ef090a580d1a137bb5a667fc1bf1e1b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 33 insertions, 1 deletions

diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 32344f1e26..1b7d410beb 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -49,6 +49,7 @@ private slots:
     void debugWithBool() const;
     void debugSpaceHandling() const;
     void debugNoQuotes() const;
+    void verbosity() const;
     void stateSaver() const;
     void veryLongWarningMessage() const;
     void qDebugQChar() const;
@@ -192,7 +193,11 @@ public:
 QDebug operator<< (QDebug s, const MyLine& line)
 {
     const QDebugStateSaver saver(s);
-    s.nospace() << "MyLine(" << line.p1 << ", " << line.p2 << ")";
+    s.nospace();
+    s << "MyLine(" << line.p1 << ", "<< line.p2;
+    if (s.verbosity() > 2)
+        s << ", Manhattan length=" << (qAbs(line.p2.v1 - line.p1.v1) + qAbs(line.p2.v2 - line.p1.v2));
+    s << ')';
     return s;
 }
 
@@ -255,6 +260,33 @@ void tst_QDebug::debugNoQuotes() const
     QCOMPARE(s_msg, QString::fromLatin1("'H' \"Hello\" \"Hello\" H Hello Hello"));
 }
 
+void tst_QDebug::verbosity() const
+{
+    MyLine line(MyPoint(10, 11), MyPoint (12, 13));
+    QString output;
+    QDebug d(&output);
+    d.nospace();
+    d << line << '\n';
+    const int oldVerbosity = d.verbosity();
+    d.setVerbosity(0);
+    QCOMPARE(d.verbosity(), 0);
+    d.setVerbosity(7);
+    QCOMPARE(d.verbosity(), 7);
+    const int newVerbosity = oldVerbosity  + 2;
+    d.setVerbosity(newVerbosity);
+    QCOMPARE(d.verbosity(), newVerbosity);
+    d << line << '\n';
+    d.setVerbosity(oldVerbosity );
+    QCOMPARE(d.verbosity(), oldVerbosity );
+    d << line;
+    const QStringList lines = output.split(QLatin1Char('\n'));
+    QCOMPARE(lines.size(), 3);
+    // Verbose should be longer
+    QVERIFY2(lines.at(1).size() > lines.at(0).size(), qPrintable(lines.join(QLatin1Char(','))));
+    // Switching back to brief produces same output
+    QCOMPARE(lines.at(0).size(), lines.at(2).size());
+}
+
 void tst_QDebug::stateSaver() const
 {
     MessageHandlerSetter mhs(myMessageHandler);