diff options
Diffstat (limited to 'src/pvs.cpp')
| -rw-r--r--[-rwxr-xr-x] | src/pvs.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/pvs.cpp b/src/pvs.cpp index 1f751b8..cf45dd7 100755..100644 --- a/src/pvs.cpp +++ b/src/pvs.cpp @@ -46,9 +46,7 @@ PVS::PVS() : _vncRequested = false; readPolicyFiles(); loadCommands(); - /*#ifndef __WIN32__*/ - _blankScreen = NULL; - /*#endif*/ + _blankScreen = NULL; _vncPort = -1; _masterMcastConfig = new McastConfiguration(this); @@ -81,7 +79,6 @@ PVS::PVS() : _timerLockTest = 0; _timerLockDelay = 0; - #ifndef __WIN32__ //add signalhandling for sigterm signals struct sigaction act; act.sa_handler = &PVS::signalHandler; @@ -95,7 +92,6 @@ PVS::PVS() : sigaction(SIGQUIT, &act, 0); initializeInputEventHandling(); - #endif /*__WIN32__*/ } PVS::~PVS() @@ -593,18 +589,12 @@ int PVS::startVNCScript(int port, QString pass, QString rwpass) if (!system(NULL)) ConsoleLog writeError("No Command processor available"); int result = system(commandLine.toUtf8().data()); - #ifndef __WIN32__ -//TODO Win32 result = WEXITSTATUS(result); if (result != 0) ConsoleLog writeError(QString("VNC-Server is not running, code: ") + int2String(result)); else ConsoleLog writeLine("VNC-Server should be running"); return result; - #else - /*Code fuer VNC-Aufruf unter Windows einfuegen*/ - return 0; - #endif /*__WIN32__*/ } else { @@ -620,7 +610,6 @@ int PVS::stopVNCScript() { if (gotVNCScript()) { - #ifndef __WIN32__ ConsoleLog writeLine("Stopping VNC-Script"); QString commandLine(_vncScriptPath); commandLine.append(" "); @@ -632,10 +621,6 @@ int PVS::stopVNCScript() ConsoleLog writeLine("VNC-Server should be stopped"); int result = system(commandLine.toUtf8().data()); return WEXITSTATUS(result); - #else - /*Code fuer VNC-Server stoppen unter Windows einfuegen*/ - return 0; - #endif /*__WIN32__*/ } else { @@ -713,7 +698,6 @@ QString PVS::getIpByNick(QString nick) void PVS::signalHandler(int signal) { ConsoleLog writeLine(QString("Received Signal ").append (int2String(signal))); - #ifndef __WIN32__ switch (signal) { case SIGHUP: mainClient->quit(); @@ -728,10 +712,6 @@ void PVS::signalHandler(int signal) mainClient->quit(); break; } - #else - ConsoleLog writeLine("Abfang nicht definiert fuer Windows"); - #endif /*__WIN32__*/ - } bool PVS::createMulticastTransfer(QString const& objectPath, quint64& transferID, QString& errorReason) |