Browse Source

use #ifdef QT_UI to distinguish Qt UI instead of hardcoded #if 0

miguelfreitas
Wladimir J. van der Laan 14 years ago
parent
commit
47c6215c22
  1. 3
      bitcoin-qt.pro
  2. 6
      src/headers.h
  3. 12
      src/init.cpp
  4. 0
      src/qtui.h

3
bitcoin-qt.pro

@ -2,6 +2,7 @@ TEMPLATE = app
TARGET = TARGET =
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += src src/json src/cryptopp src/qt INCLUDEPATH += src src/json src/cryptopp src/qt
DEFINES += QT_GUI
# for boost 1.37, add -mt to the boost libraries # for boost 1.37, add -mt to the boost libraries
unix:LIBS += -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx unix:LIBS += -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx
@ -66,7 +67,7 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/guiconstants.h \ src/qt/guiconstants.h \
src/qt/optionsmodel.h \ src/qt/optionsmodel.h \
src/qt/monitoreddatamapper.h \ src/qt/monitoreddatamapper.h \
src/externui.h \ src/qtui.h \
src/qt/transactiondesc.h \ src/qt/transactiondesc.h \
src/qt/transactiondescdialog.h \ src/qt/transactiondescdialog.h \
src/qt/bitcoinamountfield.h src/qt/bitcoinamountfield.h

6
src/headers.h

@ -100,7 +100,11 @@
#include "uibase.h" #include "uibase.h"
#include "ui.h" #include "ui.h"
#else #else
#include "externui.h" #ifdef QT_GUI
#include "qtui.h"
#else
#include "noui.h"
#endif
#endif #endif
#ifdef GUI #ifdef GUI

12
src/init.cpp

@ -75,8 +75,7 @@ void HandleSIGTERM(int)
// //
// Start // Start
// //
#if 0 #if !defined(QT_GUI) && !defined(GUI)
#ifndef GUI
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
bool fRet = false; bool fRet = false;
@ -88,7 +87,6 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
#endif #endif
#endif
bool AppInit(int argc, char* argv[]) bool AppInit(int argc, char* argv[])
{ {
@ -228,10 +226,8 @@ bool AppInit2(int argc, char* argv[])
fServer = GetBoolArg("-server"); fServer = GetBoolArg("-server");
/* force fServer when running without GUI */ /* force fServer when running without GUI */
#if 0 #if !defined(QT_GUI) && !defined(GUI)
#ifndef GUI
fServer = true; fServer = true;
#endif
#endif #endif
fPrintToConsole = GetBoolArg("-printtoconsole"); fPrintToConsole = GetBoolArg("-printtoconsole");
fPrintToDebugger = GetBoolArg("-printtodebugger"); fPrintToDebugger = GetBoolArg("-printtodebugger");
@ -529,11 +525,9 @@ bool AppInit2(int argc, char* argv[])
SetStartOnSystemStartup(true); SetStartOnSystemStartup(true);
#endif #endif
#if 0 #if !defined(QT_GUI) && !defined(GUI)
#ifndef GUI
while (1) while (1)
Sleep(5000); Sleep(5000);
#endif
#endif #endif
return true; return true;

0
src/externui.h → src/qtui.h

Loading…
Cancel
Save