Move from noui.h / ui.h to one ui_interface.h with dummy implementati…

…on for the daemon.
np · Apr 4, 2012 · 5cccb13 · 5cccb13
1 parent 5a60b66
commit 5cccb13
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 92 deletions.
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
@@ -115,7 +115,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/key.h \
     src/db.h \
     src/script.h \
-    src/noui.h \
     src/init.h \
     src/headers.h \
     src/irc.h \
@@ -135,7 +134,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/guiconstants.h \
     src/qt/optionsmodel.h \
     src/qt/monitoreddatamapper.h \
-    src/qtui.h \
     src/qt/transactiondesc.h \
     src/qt/transactiondescdialog.h \
     src/qt/bitcoinamountfield.h \
@@ -156,7 +154,8 @@ HEADERS += src/qt/bitcoingui.h \
     src/protocol.h \
     src/qt/notificator.h \
     src/qt/qtipcserver.h \
-    src/allocators.h
+    src/allocators.h \
+    src/ui_interface.h
 
 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/transactiontablemodel.cpp \

diff --git a/src/headers.h b/src/headers.h
@@ -87,8 +87,5 @@
 #include "bignum.h"
 #include "base58.h"
 #include "main.h"
-#ifdef QT_GUI
-#include "qtui.h"
-#else
-#include "noui.h"
-#endif
+#include "wallet.h"
+#include "ui_interface.h"
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
@@ -59,7 +59,8 @@ OBJS= \
     obj/rpcdump.o \
     obj/script.o \
     obj/util.o \
-    obj/wallet.o
+    obj/wallet.o \
+    obj/noui.o
 
 all: bitcoind.exe
 

diff --git a/src/makefile.mingw b/src/makefile.mingw
@@ -57,7 +57,8 @@ OBJS= \
     obj/rpcdump.o \
     obj/script.o \
     obj/util.o \
-    obj/wallet.o
+    obj/wallet.o \
+    obj/noui.o
 
 
 all: bitcoind.exe

diff --git a/src/makefile.osx b/src/makefile.osx
@@ -74,7 +74,8 @@ OBJS= \
     obj/rpcdump.o \
     obj/script.o \
     obj/util.o \
-    obj/wallet.o
+    obj/wallet.o \
+    obj/noui.o
 
 ifdef USE_UPNP
 	DEFS += -DUSE_UPNP=$(USE_UPNP)

diff --git a/src/makefile.unix b/src/makefile.unix
@@ -105,7 +105,8 @@ OBJS= \
     obj/rpcdump.o \
     obj/script.o \
     obj/util.o \
-    obj/wallet.o
+    obj/wallet.o \
+    obj/noui.o
 
 
 all: bitcoind

diff --git a/src/noui.cpp b/src/noui.cpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2009-2012 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+#include "ui_interface.h"
+
+#include <string>
+#include "headers.h"
+#include "init.h"
+
+int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style)
+{
+    printf("%s: %s\n", caption.c_str(), message.c_str());
+    fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str());
+    return 4;
+}
+
+bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption)
+{
+    return true;
+}
+
+void MainFrameRepaint()
+{
+}
+
+void AddressBookRepaint()
+{
+}
+
+void InitMessage(const std::string &message)
+{
+}
+
+std::string _(const char* psz)
+{
+    return psz;
+}
+
+void QueueShutdown()
+{
+    // Without UI, Shutdown can simply be started in a new thread
+    CreateThread(Shutdown, NULL);
+}
+
diff --git a/src/noui.h b/src/noui.h
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -4,7 +4,7 @@
 #include "bitcoinunits.h"
 
 #include "headers.h"
-#include "qtui.h"
+#include "ui_interface.h"
 
 #include <QString>
 

diff --git a/src/qtui.h → src/ui_interface.h b/src/qtui.h → src/ui_interface.h
@@ -1,11 +1,11 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_EXTERNUI_H
-#define BITCOIN_EXTERNUI_H
+#ifndef BITCOIN_UI_INTERFACE_H
+#define BITCOIN_UI_INTERFACE_H
 
 #include <string>
-#include "wallet.h"
+#include "util.h" // for int64
 
 #define wxYES                   0x00000002
 #define wxOK                    0x00000004
@@ -36,6 +36,8 @@
 // Force blocking, modal message box dialog (not just notification)
 #define wxMODAL                 0x00040000
 
+/* These UI communication functions are implemented in bitcoin.cpp (for ui) and noui.cpp (no ui) */
+
 extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK);
 extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption);
 extern void ThreadSafeHandleURL(const std::string& strURL);