summaryrefslogtreecommitdiffstats
path: root/src/pvsDaemon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/pvsDaemon.cpp')
-rw-r--r--src/pvsDaemon.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp
index 1784a14..9f2572c 100644
--- a/src/pvsDaemon.cpp
+++ b/src/pvsDaemon.cpp
@@ -64,9 +64,6 @@ int main(int argc, char** argv)
bool _daemon = false;
int frequency = 5;
int port = -1;
-#ifdef as_daemon
- bool no_fork = false;
-#endif
QCoreApplication app(argc, argv);
app.setOrganizationName("openslx");
@@ -78,11 +75,6 @@ int main(int argc, char** argv)
app.installTranslator(&translator);
QFileInfo script;
-#ifdef __WIN32__
- //TODO Win32
- if (!script.exists())
- script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat");
-#else
QSettings settings;
if (!QFile::exists(settings.fileName()))
{
@@ -97,7 +89,6 @@ int main(int argc, char** argv)
script.setFile("/usr/local/bin/pvs-vncsrv");
if (!script.exists())
script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv");
-#endif //__WIN32__
PVSLocalhostCommunicator com(getPolicyFilePath(QString(
".comfile")));
@@ -122,9 +113,6 @@ int main(int argc, char** argv)
{ "freq", required_argument, 0, 'f' },
{ "client", required_argument, 0, 'e' },
{ "script", required_argument, 0, 's' },
-#ifdef as_daemon
- { "no-fork", no_argument, 0, 'F' },
-#endif
{ 0, 0, 0, 0 },
};
/* getopt_long stores the option index here. */
@@ -232,13 +220,6 @@ int main(int argc, char** argv)
}
break;
}
-#ifdef as_daemon
- case 'F':
- {
- no_fork = true;
- break;
- }
-#endif
case '?':
{
ConsoleLog writeError(
@@ -264,11 +245,7 @@ int main(int argc, char** argv)
ConsoleLog writeLine(QString("PVS-Client started."));
if (_daemon)
- {
- #ifndef __WIN32__
daemon(1, 1);
- #endif /*__WIN32__*/
- }
mainClient = new PVS();
com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand);