aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-06-22 20:11:12 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-06-22 20:11:35 +0200
commit47c6215c223ac85eeb31504aa2a56369bdfb3789 (patch)
treeb954ee8712514d72089a4f23a3cd9e93c820d0a0 /src/init.cpp
parent5f280ff5578554750d53391b1e089cb891748c59 (diff)
use #ifdef QT_UI to distinguish Qt UI instead of hardcoded #if 0
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/init.cpp b/src/init.cpp
index f306185317..cbd9fc0219 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -75,8 +75,7 @@ void HandleSIGTERM(int)
//
// Start
//
-#if 0
-#ifndef GUI
+#if !defined(QT_GUI) && !defined(GUI)
int main(int argc, char* argv[])
{
bool fRet = false;
@@ -88,7 +87,6 @@ int main(int argc, char* argv[])
return 1;
}
#endif
-#endif
bool AppInit(int argc, char* argv[])
{
@@ -228,11 +226,9 @@ bool AppInit2(int argc, char* argv[])
fServer = GetBoolArg("-server");
/* force fServer when running without GUI */
-#if 0
-#ifndef GUI
+#if !defined(QT_GUI) && !defined(GUI)
fServer = true;
#endif
-#endif
fPrintToConsole = GetBoolArg("-printtoconsole");
fPrintToDebugger = GetBoolArg("-printtodebugger");
@@ -529,12 +525,10 @@ bool AppInit2(int argc, char* argv[])
SetStartOnSystemStartup(true);
#endif
-#if 0
-#ifndef GUI
+#if !defined(QT_GUI) && !defined(GUI)
while (1)
Sleep(5000);
#endif
-#endif
return true;
}