All printf() replaced with qDebug()

15 files changed, 46 insertions, 52 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a98022d..fa4da6a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,15 +11,11 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.6.2 )
 # set compiler optimizations for debug and release
 SET(CMAKE_BUILD_TYPE Debug)
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2" )
-#-march=native -DQT_NO_DEBUG_OUTPUT
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -DQT_NO_DEBUG_OUTPUT" )
 
 # local cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
 
-#Test
-SET(CMAKE_EDIT_COMMAND ${CMAKE_SOURCE_DIR})
-
 # this command finds libraries and sets all required variables
 FIND_PACKAGE( Qt4 4.5.0 REQUIRED )
 FIND_PACKAGE( X11 REQUIRED )
diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
index bea636f..10c64d6 100644
--- a/src/gui/mainWindow.cpp
+++ b/src/gui/mainWindow.cpp
@@ -813,7 +813,7 @@ void MainWindow::foto() // makes a screenshot of the selected client
 					img.save(path, format.toAscii());
 			}
 			else
-				printf("Cannot save screen: Image is null.\n");
+				qDebug("Cannot save screen: Image is null.");
 		}
 	}
 	else
diff --git a/src/net/SslServer.cpp b/src/net/SslServer.cpp
index e353e0a..9940a61 100644
--- a/src/net/SslServer.cpp
+++ b/src/net/SslServer.cpp
@@ -59,7 +59,7 @@ void SslServer::incomingConnection(int socketDescriptor)
 
 void SslServer :: sslErrors ( const QList<QSslError> & errors )
 {
-	printf("FIXME: SSL ERRORS on SERVER: %s\n", errors.begin()->errorString().toUtf8().data());
+	qDebug("FIXME: SSL ERRORS on SERVER: %s", qPrintable(errors.begin()->errorString()));
 }
 
 void SslServer::timerEvent (QTimerEvent* event)
@@ -98,7 +98,7 @@ bool SslServer::hasPendingConnections()
 {
     for (QList<QSslSocket*>::iterator it = _pending.begin(); it != _pending.end(); it++)
     {
-    	printf("State: %d - Encrypted: %d\n", (int)(*it)->state(), (*it)->isEncrypted());
+    	qDebug("State: %d - Encrypted: %d", (int)(*it)->state(), (*it)->isEncrypted());
         if ((*it)->state() == QAbstractSocket::ConnectedState && (*it)->isEncrypted()) return true;
     }
     return false;
diff --git a/src/net/pvsClientConnection.cpp b/src/net/pvsClientConnection.cpp
index dff40d5..5354e95 100644
--- a/src/net/pvsClientConnection.cpp
+++ b/src/net/pvsClientConnection.cpp
@@ -134,7 +134,7 @@ bool PVSClientConnection::push_back_send(PVSMsg newMsg)
     char *tmp = data;
     if (!newMsg.getBinaryData(tmp, len))
     {
-        printf("Message empty. Ignored.\n");
+        qDebug("Message empty. Ignored.");
         return false;
     }
     QByteArray ba;
diff --git a/src/net/pvsDiscoveredServer.cpp b/src/net/pvsDiscoveredServer.cpp
index dddb5a0..efa1506 100644
--- a/src/net/pvsDiscoveredServer.cpp
+++ b/src/net/pvsDiscoveredServer.cpp
@@ -48,7 +48,7 @@ void PVSDiscoveredServer::ssl_Error( const QList<QSslError> & errors )
 		}
 		//ConsoleLog writeNetwork(err.errorString().toUtf8().data());
 		//ConsoleLog writeNetwork("***** SSL ERROR, ABORTING *****");
-		printf("Unhandled SSL Error in SD: %s\n", err.errorString().toUtf8().data());
+		qDebug("Unhandled SSL Error in SD: %s", qPrintable(err.errorString()));
 		return;
 	}
 	_socket->ignoreSslErrors();
@@ -70,30 +70,30 @@ void PVSDiscoveredServer::sock_connected()
     QByteArray cert = _socket->peerCertificate().digest(QCryptographicHash::Sha1);
     if (_socket->peerCertificate().isNull())
     {
-    	printf("**** WARNING - PEER CERTIFICATE IS NULL ****\n");
+    	qDebug("**** WARNING - PEER CERTIFICATE IS NULL ****");
     }
     else
     {
-        printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::Organization).toUtf8().data());
-        printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::CommonName).toUtf8().data());
-        printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::LocalityName).toUtf8().data());
-        printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::OrganizationalUnitName	).toUtf8().data());
-        printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::CountryName	).toUtf8().data());
-        printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::StateOrProvinceName	).toUtf8().data());
+        qDebug("%s", qPrintable(_socket->peerCertificate().subjectInfo(QSslCertificate::Organization)));
+        qDebug("%s", qPrintable(_socket->peerCertificate().subjectInfo(QSslCertificate::CommonName)));
+        qDebug("%s", qPrintable(_socket->peerCertificate().subjectInfo(QSslCertificate::LocalityName)));
+        qDebug("%s", qPrintable(_socket->peerCertificate().subjectInfo(QSslCertificate::OrganizationalUnitName)));
+        qDebug("%s", qPrintable(_socket->peerCertificate().subjectInfo(QSslCertificate::CountryName)));
+        qDebug("%s", qPrintable(_socket->peerCertificate().subjectInfo(QSslCertificate::StateOrProvinceName)));
     }
     if (cert == _fingerprint && !_validated)
     {
         _validated = true;
         emit validated(this);
-        printf("Validated certificate of %s :)\n", _socket->peerAddress().toString().toUtf8().data());
+        qDebug("Validated certificate of %s :)", qPrintable(_socket->peerAddress().toString()));
     }
     else
     {
-        printf("Certificate of %s is invalid :(\n", _socket->peerAddress().toString().toUtf8().data());
+        qDebug("Certificate of %s is invalid :(", qPrintable(_socket->peerAddress().toString()));
         QByteArray is, should;
         is = cert.toBase64();
         should = _fingerprint.toBase64();
-        printf("Is %s and should be %s\n", is.data(), should.data());
+        qDebug("Is %s and should be %s", is.data(), should.data());
     }
     _socket->disconnectFromHost();
 }
diff --git a/src/net/pvsListenServer.cpp b/src/net/pvsListenServer.cpp
index f21303e..58d4aee 100644
--- a/src/net/pvsListenServer.cpp
+++ b/src/net/pvsListenServer.cpp
@@ -137,7 +137,7 @@ void PVSListenServer::timerEvent(QTimerEvent *event)
             }
 			if (client->lastData() < refval)
 			{ // ping timeout
-				printf("Ping timeout for client %s\n", client->getNameUser().toLocal8Bit().data());
+			    qDebug("Ping timeout for client %s", qPrintable(client->getNameUser()));
 				if (disconnectClient(client))
 					break; // list was modified, iterator not valid anymore
 			}
@@ -283,9 +283,8 @@ void PVSListenServer::server_connectionRequest()
 
 void PVSListenServer::handleClientMsg(unsigned int clientID, PVSMsg msg)
 {
-    printf("Got Message for client %ud: [%c][%s][%s]\n", clientID,
-           (char) msg.getType(), msg.getIdent().toUtf8().data(),
-           msg.getMessage().toUtf8().data());
+    qDebug("Got Message for client %ud: [%c][%s][%s]", clientID,
+           (char) msg.getType(), qPrintable(msg.getIdent()), qPrintable(msg.getMessage()));
     msg.setSndID(clientID);
     if (msg.getType() == PVSCOMMAND)
         _commandDispatcher.fire(msg.getIdent(), msg);
diff --git a/src/net/pvsListenServer.h b/src/net/pvsListenServer.h
index ab021c7..b43b730 100644
--- a/src/net/pvsListenServer.h
+++ b/src/net/pvsListenServer.h
@@ -73,7 +73,7 @@ public:
 
     template<class T> void addLoginHandler(QString ident, T* who, void (T :: *func)(PVSMsg))
     {
-        printf("Listener got added to LoginHandler\n");
+        qDebug("Listener got added to LoginHandler");
         _loginDispatcher.addListener(ident, who, func);
     };
     template<class T> void removeLoginHandler(QString ident, T* who, void (T :: *func)(PVSMsg))
diff --git a/src/net/pvsLocalhostCommunicator.cpp b/src/net/pvsLocalhostCommunicator.cpp
index 199b39c..20783bb 100644
--- a/src/net/pvsLocalhostCommunicator.cpp
+++ b/src/net/pvsLocalhostCommunicator.cpp
@@ -83,7 +83,7 @@ void PVSLocalhostCommunicator::sendCommand(QString ident, QString cmd)
         int len;
         sender.getBinaryData(data, len);
         QByteArray qba(data, len);
-        printf("Sending %d bytes to daemon...\n", qba.length());
+        qDebug("Sending %d bytes to daemon...", qba.length());
         qint64 result = _sock->writeDatagram(qba, localhost, localport);
         _sock->waitForBytesWritten(100);
 
@@ -92,11 +92,11 @@ void PVSLocalhostCommunicator::sendCommand(QString ident, QString cmd)
         {
             if (result == -1)
             {
-                printf("Error sending PVSMsg to daemon: %s\n", _sock->errorString().toUtf8().data());
+                qDebug("Error sending PVSMsg to daemon: %s", qPrintable(_sock->errorString()));
             }
             else
             {
-                printf("Sent PVSMsg was incomplete.\n");
+                qDebug("Sent PVSMsg was incomplete.");
             }
             stop();
         }
diff --git a/src/net/pvsServerConnection.cpp b/src/net/pvsServerConnection.cpp
index 04a1ef6..d187ce3 100644
--- a/src/net/pvsServerConnection.cpp
+++ b/src/net/pvsServerConnection.cpp
@@ -70,7 +70,7 @@ void PVSServerConnection::sslErrors ( const QList<QSslError> & errors )
 	for (QList<QSslError>::const_iterator it = errors.begin(); it != errors.end(); it++)
 	{
 		QSslError err = *it;
-		printf("Connect SSL: %s\n", err.errorString().toUtf8().data());
+		qDebug("Connect SSL: %s", qPrintable(err.errorString()));
 		if (err.error() == QSslError::HostNameMismatch) continue; // We don't pay attention to hostnames for validation
 		if (err.error() == QSslError::SelfSignedCertificate) continue; // Also, this will always be the case; we check the fingerprint later
 		ConsoleLog writeNetwork(err.errorString().toUtf8().data());
diff --git a/src/net/pvsServiceDiscovery.cpp b/src/net/pvsServiceDiscovery.cpp
index 0a99802..dd6b500 100644
--- a/src/net/pvsServiceDiscovery.cpp
+++ b/src/net/pvsServiceDiscovery.cpp
@@ -30,7 +30,7 @@ PVSServiceDiscovery::PVSServiceDiscovery(PVS* client)
     bool ret = _sock.bind(SD_PORT_CLIENT);
     if (!ret)
     {
-        printf("Could not open SERVICE DISCOVERY port\n");
+        qDebug("Could not open SERVICE DISCOVERY port");
         exit(1);
     }
     connect(&_sock, SIGNAL(readyRead()), this, SLOT(sock_dataArrival()));
diff --git a/src/pvs.cpp b/src/pvs.cpp
index 07b9005..2aaec8a 100755
--- a/src/pvs.cpp
+++ b/src/pvs.cpp
@@ -54,9 +54,9 @@ PVS::PVS() :
     new PvsAdaptor(this);
     QDBusConnection dbus = QDBusConnection::sessionBus();
     if (!dbus.registerObject("/", this))
-        printf("[ERROR] DBus: Could not register object\n");
+        qDebug("[ERROR] DBus: Could not register object");
     if (!dbus.registerService("org.openslx.pvs"))
-        printf("[ERROR] DBus: Could not register service\n");
+        qDebug("[ERROR] DBus: Could not register service");
 
     _sdClient = new PVSServiceDiscovery(this);
 
diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp
index 4d3e146..cc11bd4 100755
--- a/src/pvsDaemon.cpp
+++ b/src/pvsDaemon.cpp
@@ -13,8 +13,8 @@ QTextStream qout(stdout);
 /// VERSION_STRING is defined in src/version.h
 void printVersion(bool doExit)
 {
-    QTextStream qout(stdout);
-    printf("Version:\t"VERSION_STRING"\n");
+    qout << "Version:\t"VERSION_STRING"\n";
+    qout.flush();
     if (doExit)
         exit(0);
 }
@@ -36,7 +36,7 @@ void printHelp()
     qout << QObject::tr("-v or --version") << "\n\t" << QObject::tr("Shows the current version and exits.") << "\n";
     qout << QObject::tr("-d or --daemon") << "\n\t" << QObject::tr("Start as daemon.") << "\n";
     qout << QObject::tr("-c <string command>:<string value>") << "\n\t" << QObject::tr("Sends the command and the optional value to a running PVS-Client.") << "\n\t" << QObject::tr("Command and value may not contain spaces or colons.") << "\n\t" << QObject::tr("The dividing colon is mandatory.") << "\n";
-    qout << "-commands: \n\t" << QObject::tr("Prints out available commands to use with -c.") << "\n";
+    qout << "--commands: \n\t" << QObject::tr("Prints out available commands to use with -c.") << "\n";
     qout << "**************************************************************\n";
     qout.flush();
     exit(0);
@@ -51,11 +51,10 @@ void printNotice()
 
 void printCommands()
 {
-    printf("**************************************************************\n");
-    printf("chat:<on/ off/ 1/ 2/ 3>\n ");
-    printf("on = turns that chat option on\n off = turns the chat option off\n 1 = bossmode\n 2 = community\n 3 = private\n");
-    printf("stop \n\t Stops the running PVS-Client.\n");
-    printf("**************************************************************\n");
+    qout << "**************************************************************\n";
+    qout << "stop \n\t Stops the running PVS-Client.\n";
+    qout << "**************************************************************\n";
+    qout.flush();
     exit(0);
 }
 
@@ -102,7 +101,7 @@ int main(int argc, char** argv)
     com.run();
     if (!(com.running()))
     {
-        printf("Error. UDS Communicator is not running. Exiting.\n");
+        qDebug("Error. UDS Communicator is not running. Exiting.");
         exit(0);
     }
 
@@ -151,20 +150,20 @@ int main(int argc, char** argv)
                 if (com.server())
                 {
                     // wont work, no daemon running
-                    printf("Error. No running PVS-Client found. Exiting.\n");
+                    qDebug("Error. No running PVS-Client found. Exiting.");
                     com.stop();
                 }
                 else
                 {
-                    printf("Will send i: %s, m: %s\n", argv[option_index + 1], "");
+                    qDebug("Will send i: %s, m: %s\n", argv[option_index + 1], "");
                     com.sendCommand(QString(argv[option_index + 1]), "");
                     QCoreApplication::processEvents(QEventLoop::AllEvents);
-                    printf("Sent command. Exiting.\n");
+                    qDebug("Sent command. Exiting.");
                  }
             }
             else
             {
-                printf("Error. No command issued. Exiting.\n");
+                qDebug("Error. No command issued. Exiting.");
             }
             exit(0); // and gone
         }
@@ -211,7 +210,7 @@ int main(int argc, char** argv)
         {
             if (option_index + 1 < argc)
             {
-                printf("WARNING: -e is deprecated\n");
+                qDebug("WARNING: -e is deprecated");
                 option_index++;
                 continue;
             }
@@ -243,7 +242,7 @@ int main(int argc, char** argv)
 
     if (!com.server())
     {
-        printf("Error. PoolVSClient already running. Exiting\n");
+        qDebug("Error. PoolVSClient already running. Exiting");
         com.stop();
         exit(0);
     }
diff --git a/src/util/consoleLogger.cpp b/src/util/consoleLogger.cpp
index 5d07dbe..9189543 100755
--- a/src/util/consoleLogger.cpp
+++ b/src/util/consoleLogger.cpp
@@ -235,7 +235,7 @@ void ConsoleLogger::_prepareLog()
     if (_logFile.good())
         _logFileGood = true;
     else
-        printf("ERROR: Logfile ( %s ) not accessible/found. Logs will not be available.\n", _logPath.toUtf8().data());
+        qDebug("ERROR: Logfile ( %s ) not accessible/found. Logs will not be available.", qPrintable(_logPath));
 
     _logFile.close();
 }
diff --git a/src/util/consoleLogger.h b/src/util/consoleLogger.h
index 3a0950d..e4cb291 100644
--- a/src/util/consoleLogger.h
+++ b/src/util/consoleLogger.h
@@ -116,7 +116,7 @@ public:
                 _line.push_back('\n');    // add an explicit newline char, so it looks better in the logfile
             //#ifndef as_daemon
             if (_level == LOG_TERMINAL) // may look strange here, but its quite central :-)
-                printf("%s\n", _line.toUtf8().data());
+                qDebug("%s", qPrintable(_line));
             //#endif
         };
         LOG_LEVEL getLevel()
diff --git a/src/util/util.cpp b/src/util/util.cpp
index 8b25b12..05a209f 100755
--- a/src/util/util.cpp
+++ b/src/util/util.cpp
@@ -213,7 +213,7 @@ QString getUserName()
     #endif //#ifdef __WIN32__
     if (username.isEmpty())
     {
-        printf("USERNAME COULDNT BE RETRIEVED!\n");
+        qDebug("USERNAME COULDNT BE RETRIEVED!");
         username = QString("USERNAMEERROR");
     }
     return username;
@@ -323,7 +323,7 @@ QString readPassFromPassFile()
 }
 bool getAllowed()
 {
-    printf("Checking %s\n", getPolicyFilePath(QString(".allow")).toUtf8().data());
+    qDebug("Checking %s", qPrintable(getPolicyFilePath(QString(".allow"))));
     TextFile file(getPolicyFilePath(".allow"));
     if (file.good()) // should have been checked via exists before, but better be safe
     {
@@ -338,7 +338,7 @@ bool getAllowed()
                 (allowed.compare(QString("TRUE")) == 0) )
             return true;
     }
-    printf("...negative\n");
+    qDebug("...negative");
     return false;
 }