Make debug output optional.

This commit is contained in:
con
2009-07-29 17:47:03 +02:00
parent 2c1b85f05c
commit 2ab27a3400
2 changed files with 8 additions and 4 deletions

View File

@@ -201,10 +201,10 @@ Adapter::~Adapter()
bool Adapter::startServer() bool Adapter::startServer()
{ {
if (!openTrkPort(m_trkServerName)) { if (!openTrkPort(m_trkServerName)) {
logMessage("Unable to connect to TRK server"); qDebug("Unable to connect to TRK server");
return false; return false;
} }
qDebug("Connecting");
sendTrkInitialPing(); sendTrkInitialPing();
sendTrkMessage(TrkConnect); // Connect sendTrkMessage(TrkConnect); // Connect
sendTrkMessage(TrkSupported, CB(handleSupportMask)); sendTrkMessage(TrkSupported, CB(handleSupportMask));
@@ -228,6 +228,7 @@ void Adapter::installAndRun()
} }
void Adapter::logMessage(const QString &msg) void Adapter::logMessage(const QString &msg)
{ {
if (DEBUG)
qDebug() << "ADAPTER: " << qPrintable(msg); qDebug() << "ADAPTER: " << qPrintable(msg);
} }
@@ -536,7 +537,6 @@ void Adapter::handleFileCreation(const TrkResult &result)
// we don't do any error handling yet, which is bad // we don't do any error handling yet, which is bad
const char *data = result.data.data(); const char *data = result.data.data();
uint copyFileHandle = extractInt(data + 2); uint copyFileHandle = extractInt(data + 2);
qDebug() << copyFileHandle;
QFile file(m_copySrcFileName); QFile file(m_copySrcFileName);
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
QByteArray src = file.readAll(); QByteArray src = file.readAll();
@@ -675,6 +675,7 @@ void Adapter::cleanUp()
void Adapter::copyFileToRemote() void Adapter::copyFileToRemote()
{ {
qDebug("Copying file");
QByteArray ba; QByteArray ba;
appendByte(&ba, 0x10); appendByte(&ba, 0x10);
appendString(&ba, m_copyDstFileName.toLocal8Bit(), TargetByteOrder, false); appendString(&ba, m_copyDstFileName.toLocal8Bit(), TargetByteOrder, false);
@@ -683,6 +684,7 @@ void Adapter::copyFileToRemote()
void Adapter::installRemotePackageSilently(const QString &fileName) void Adapter::installRemotePackageSilently(const QString &fileName)
{ {
qDebug("Installing file");
QByteArray ba; QByteArray ba;
appendByte(&ba, 'C'); appendByte(&ba, 'C');
appendString(&ba, fileName.toLocal8Bit(), TargetByteOrder, false); appendString(&ba, fileName.toLocal8Bit(), TargetByteOrder, false);
@@ -691,6 +693,7 @@ void Adapter::installRemotePackageSilently(const QString &fileName)
void Adapter::startInferiorIfNeeded() void Adapter::startInferiorIfNeeded()
{ {
qDebug("Starting");
if (m_session.pid != 0) { if (m_session.pid != 0) {
qDebug() << "Process already 'started'"; qDebug() << "Process already 'started'";
return; return;

View File

@@ -2,6 +2,7 @@ TEMPLATE = app
QT = core network QT = core network
QT -= gui QT -= gui
DEFINES += DEBUG=0
win32:CONFIG += console win32:CONFIG += console
win32:DEFINES += USE_NATIVE win32:DEFINES += USE_NATIVE