From 2ab27a3400134c05175454d4bdba63d7cc379268 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 29 Jul 2009 17:47:03 +0200
Subject: [PATCH] Make debug output optional.

---
 tests/manual/trk/launcher.cpp    | 11 +++++++----
 tests/manual/trk/trklauncher.pro |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/manual/trk/launcher.cpp b/tests/manual/trk/launcher.cpp
index 8111a58a30b..9d71a5f0ad1 100644
--- a/tests/manual/trk/launcher.cpp
+++ b/tests/manual/trk/launcher.cpp
@@ -201,10 +201,10 @@ Adapter::~Adapter()
 bool Adapter::startServer()
 {
     if (!openTrkPort(m_trkServerName)) {
-        logMessage("Unable to connect to TRK server");
+        qDebug("Unable to connect to TRK server");
         return false;
     }
-
+    qDebug("Connecting");
     sendTrkInitialPing();
     sendTrkMessage(TrkConnect); // Connect
     sendTrkMessage(TrkSupported, CB(handleSupportMask));
@@ -228,7 +228,8 @@ void Adapter::installAndRun()
 }
 void Adapter::logMessage(const QString &msg)
 {
-    qDebug() << "ADAPTER: " << qPrintable(msg);
+    if (DEBUG)
+        qDebug() << "ADAPTER: " << qPrintable(msg);
 }
 
 bool Adapter::openTrkPort(const QString &port)
@@ -536,7 +537,6 @@ void Adapter::handleFileCreation(const TrkResult &result)
     // we don't do any error handling yet, which is bad
     const char *data = result.data.data();
     uint copyFileHandle = extractInt(data + 2);
-    qDebug() << copyFileHandle;
     QFile file(m_copySrcFileName);
     file.open(QIODevice::ReadOnly);
     QByteArray src = file.readAll();
@@ -675,6 +675,7 @@ void Adapter::cleanUp()
 
 void Adapter::copyFileToRemote()
 {
+    qDebug("Copying file");
     QByteArray ba;
     appendByte(&ba, 0x10);
     appendString(&ba, m_copyDstFileName.toLocal8Bit(), TargetByteOrder, false);
@@ -683,6 +684,7 @@ void Adapter::copyFileToRemote()
 
 void Adapter::installRemotePackageSilently(const QString &fileName)
 {
+    qDebug("Installing file");
     QByteArray ba;
     appendByte(&ba, 'C');
     appendString(&ba, fileName.toLocal8Bit(), TargetByteOrder, false);
@@ -691,6 +693,7 @@ void Adapter::installRemotePackageSilently(const QString &fileName)
 
 void Adapter::startInferiorIfNeeded()
 {
+    qDebug("Starting");
     if (m_session.pid != 0) {
         qDebug() << "Process already 'started'";
         return;
diff --git a/tests/manual/trk/trklauncher.pro b/tests/manual/trk/trklauncher.pro
index 90f4155516b..d953f0abca3 100644
--- a/tests/manual/trk/trklauncher.pro
+++ b/tests/manual/trk/trklauncher.pro
@@ -2,6 +2,7 @@ TEMPLATE = app
 QT = core network
 QT -= gui
 
+DEFINES += DEBUG=0
 win32:CONFIG += console
 win32:DEFINES += USE_NATIVE