diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-22 20:11:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-22 20:11:35 +0200 |
| commit | 47c6215c223ac85eeb31504aa2a56369bdfb3789 (patch) | |
| tree | b954ee8712514d72089a4f23a3cd9e93c820d0a0 /src | |
| parent | 5f280ff5578554750d53391b1e089cb891748c59 (diff) | |
| download | bitcoin-47c6215c223ac85eeb31504aa2a56369bdfb3789.tar.xz | |
use #ifdef QT_UI to distinguish Qt UI instead of hardcoded #if 0
Diffstat (limited to 'src')
| -rw-r--r-- | src/headers.h | 6 | ||||
| -rw-r--r-- | src/init.cpp | 12 | ||||
| -rw-r--r-- | src/qtui.h (renamed from src/externui.h) | 0 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/headers.h b/src/headers.h index f682f746ed..38d9566baa 100644 --- a/src/headers.h +++ b/src/headers.h @@ -100,7 +100,11 @@ #include "uibase.h" #include "ui.h" #else -#include "externui.h" +#ifdef QT_GUI +#include "qtui.h" +#else +#include "noui.h" +#endif #endif #ifdef GUI 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; } diff --git a/src/externui.h b/src/qtui.h index 3243164c10..3243164c10 100644 --- a/src/externui.h +++ b/src/qtui.h |