Merge remote branch 'openslx/master' into mcastft

Conflicts:
	CMakeLists.txt
	pvsmgr.qrc
	src/gui/clientConfigDialog.cpp
	src/gui/mainWindow.cpp
	src/gui/ui/mainwindow.ui
	src/gui/ui/mainwindowtouch.ui
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/pvsgui.cpp

1 files changed, 3 insertions, 3 deletions

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();
         }