fixed build on macos and renamed bitcoin to tapyrus where applicable

Author: Naviabheeman

src/CMakeLists.txt

@@ -15,9 +15,7 @@ option(BUILD_TAPYRUS_SEEDER "Build tapyrus-seeder" ON)
 option(BUILD_TAPYRUS_CLI "Build tapyrus-cli" ON)
 option(BUILD_TAPYRUS_GENESIS "Build tapyrus-genesis" ON)
 option(BUILD_TAPYRUS_TX "Build tapyrus-tx" ON)
-
-# TODO: Fix qt building problem and turn ON.
-option(BUILD_TAPYRUS_QT "Build tapyrus-qt" ON)
+option(ENABLE_QRCODE "Build QR support in wallet" OFF)
 
 # Ensure that WINDRES_PREPROC is enabled when using windres.
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
@@ -308,4 +306,4 @@ if(BUILD_TAPYRUS_QT)
     add_subdirectory(qt)
 endif()
 
-message(status "BUILD_TAPYRUS_QT=${BUILD_TAPYRUS_QT}")
+message(STATUS "BUILD_TAPYRUS_QT=${BUILD_TAPYRUS_QT}")

src/config/CMakeLists.txt

@@ -150,5 +150,12 @@ set(ENABLE_WALLET ${BUILD_TAPYRUS_WALLET})
 # Activate ZeroMQ
 set(ENABLE_ZMQ ${BUILD_TAPYRUS_ZMQ})
 
+# Try to find libqrencode
+ # Only used in the wallet GUI
+ if(ENABLE_QRCODE AND BUILD_BITCOIN_WALLET AND BUILD_BITCOIN_QT)
+ 	find_package(QREncode REQUIRED)
+ 	set(USE_QRCODE 1 CACHE INTERNAL "QR code is enabled")
+ endif()
+ 
 # Generate the config
 configure_file(bitcoin-config.h.cmake.in bitcoin-config.h ESCAPE_QUOTES)

src/config/bitcoin-config.h.cmake.in

@@ -60,5 +60,6 @@
 
 #cmakedefine ENABLE_WALLET 1
 #cmakedefine ENABLE_ZMQ 1
+#cmakedefine ENABLE_QRCODE 0
 
 #endif // BITCOIN_BITCOIN_CONFIG_H

src/qt/CMakeLists.txt

@@ -3,16 +3,14 @@
 project(tapyrus-qt)
 
 # This ensure that AUTOMOC doesn't run on generated files.
-cmake_policy(SET CMP0071 OLD)
+cmake_policy(SET CMP0071 NEW)
 
 include(BrewHelper)
 find_brew_prefix(QT5_PREFIX qt5)
 
 set(QT_REQUIRED_COMPONENTS Core Widgets Network DBus Test)
 find_package(Qt5 COMPONENTS ${QT_REQUIRED_COMPONENTS} REQUIRED HINTS "${QT5_PREFIX}")
 
-find_package(QREncode REQUIRED)
-
 # Find out more about Qt. This is similar to
 # http://code.qt.io/cgit/qt/qtwebkit.git/tree/Source/cmake/OptionsQt.cmake
 get_target_property(QT_CORE_TYPE Qt5::Core TYPE)
@@ -157,30 +155,41 @@ add_library(tapyrus-qt-base
 	qrc_tapyrus_locale.cpp
 )
 
+# Linux support
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	list(APPEND QT_PLUGIN_COMPONENTS QXcbIntegrationPlugin)
+	list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_XCB=1)
+endif()
 # Windows support
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	list(APPEND QT_PLUGIN_COMPONENTS QWindowsIntegrationPlugin)
+	list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_WINDOWS=1)
 	target_sources(tapyrus-qt-base PRIVATE winshutdownmonitor.cpp)
 endif()
-
-target_include_directories(tapyrus-qt-base
-	PUBLIC
-		.
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}/forms
-)
+# OSX support
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	list(APPEND QT_PLUGIN_COMPONENTS QCocoaIntegrationPlugin)
+	list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_COCOA=1)
+	target_sources(tapyrus-qt-base PRIVATE
+		macdockiconhandler.mm
+		macnotificationhandler.mm
+	)
+	set_property(TARGET tapyrus-qt-base PROPERTY AUTOMOC_MOC_OPTIONS "-DQ_OS_MAC")
+	target_link_libraries(tapyrus-qt-base
+		"-framework Foundation"
+		"-framework ApplicationServices"
+		"-framework AppKit"
+	)
+endif()
 
 target_link_libraries(tapyrus-qt-base
 	server
 	rpcclient
 	Qt5::Widgets
 	Qt5::Network
 	Qt5::DBus
-	qrencode
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set_property(TARGET tapyrus-qt-base PROPERTY AUTOMOC_MOC_OPTIONS "-DQ_OS_MAC")
-endif()
 
 # Wallet
 if(BUILD_TAPYRUS_WALLET)
@@ -218,6 +227,11 @@ if(BUILD_TAPYRUS_WALLET)
 	)
 
 	target_link_libraries(tapyrus-qt-base wallet)
+
+	if(ENABLE_QRCODE)
+ 		find_package(QREncode REQUIRED)
+ 		target_link_libraries(tapyrus-qt-base QREncode::qrencode)
+ 	endif()
 endif()
 
 # The executable

src/qt/README.md

@@ -60,7 +60,7 @@ Represents the view to a single wallet.
 
 * UI elements like BitcoinAmountField, which inherit from QWidget.
 * `bitcoinstrings.cpp`: automatically generated
-* `bitcoinunits.(h/cpp)`: TPC / mTPC / etc handling
+* `TapyrusUnits.(h/cpp)`: TPC / mTPC / etc handling
 * `callback.h`
 * `guiconstants.h`: UI colors, app name, etc
 * `guiutil.h`: several helper functions

src/qt/clientmodel.cpp

@@ -247,13 +247,13 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, int heig
 void ClientModel::subscribeToCoreSignals()
 {
     // Connect signals to client
-    m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, _1, _2));
-    m_handler_notify_num_connections_changed = m_node.handleNotifyNumConnectionsChanged(boost::bind(NotifyNumConnectionsChanged, this, _1));
-    m_handler_notify_network_active_changed = m_node.handleNotifyNetworkActiveChanged(boost::bind(NotifyNetworkActiveChanged, this, _1));
+    m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, boost::placeholders::_1, boost::placeholders::_2));
+    m_handler_notify_num_connections_changed = m_node.handleNotifyNumConnectionsChanged(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
+    m_handler_notify_network_active_changed = m_node.handleNotifyNetworkActiveChanged(boost::bind(NotifyNetworkActiveChanged, this, boost::placeholders::_1));
     m_handler_notify_alert_changed = m_node.handleNotifyAlertChanged(boost::bind(NotifyAlertChanged, this));
     m_handler_banned_list_changed = m_node.handleBannedListChanged(boost::bind(BannedListChanged, this));
-    m_handler_notify_block_tip = m_node.handleNotifyBlockTip(boost::bind(BlockTipChanged, this, _1, _2, _3, _4, false));
-    m_handler_notify_header_tip = m_node.handleNotifyHeaderTip(boost::bind(BlockTipChanged, this, _1, _2, _3, _4, true));
+    m_handler_notify_block_tip = m_node.handleNotifyBlockTip(boost::bind(BlockTipChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, false));
+    m_handler_notify_header_tip = m_node.handleNotifyHeaderTip(boost::bind(BlockTipChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, true));
 }
 
 void ClientModel::unsubscribeFromCoreSignals()

src/qt/coincontroldialog.cpp

@@ -233,7 +233,7 @@ void CoinControlDialog::showMenu(const QPoint &point)
 // context menu action: copy amount
 void CoinControlDialog::copyAmount()
 {
-    GUIUtil::setClipboard(BitcoinUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT)));
+    GUIUtil::setClipboard(TapyrusUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT)));
 }
 
 // context menu action: copy label
@@ -535,7 +535,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     }
 
     // actually update labels
-    int nDisplayUnit = BitcoinUnits::TPC;
+    int nDisplayUnit = TapyrusUnits::TPC;
     if (model && model->getOptionsModel())
         nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
 
@@ -555,12 +555,12 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
 
     // stats
     l1->setText(QString::number(nQuantity));                                 // Quantity
-    l2->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAmount));        // Amount
-    l3->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nPayFee));        // Fee
-    l4->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee));      // After Fee
+    l2->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nAmount));        // Amount
+    l3->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nPayFee));        // Fee
+    l4->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nAfterFee));      // After Fee
     l5->setText(((nBytes > 0) ? ASYMP_UTF8 : "") + QString::number(nBytes));        // Bytes
     l7->setText(fDust ? tr("yes") : tr("no"));                               // Dust
-    l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange));        // Change
+    l8->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nChange));        // Change
     if (nPayFee > 0)
     {
         l3->setText(ASYMP_UTF8 + l3->text());
@@ -682,7 +682,7 @@ void CoinControlDialog::updateView()
             }
 
             // amount
-            itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.txout.nValue));
+            itemOutput->setText(COLUMN_AMOUNT, TapyrusUnits::format(nDisplayUnit, out.txout.nValue));
             itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.txout.nValue)); // padding so that sorting works correctly
 
             // date
@@ -716,7 +716,7 @@ void CoinControlDialog::updateView()
         if (treeMode)
         {
             itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")");
-            itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
+            itemWalletAddress->setText(COLUMN_AMOUNT, TapyrusUnits::format(nDisplayUnit, nSum));
             itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)nSum));
         }
     }

src/qt/guiutil.cpp

@@ -158,7 +158,7 @@ bool parseTapyrusURI(const QUrl &uri, SendCoinsRecipient *out)
         {
             if(!i->second.isEmpty())
             {
-                if(!BitcoinUnits::parse(BitcoinUnits::TPC, i->second, &rv.amount))
+                if(!TapyrusUnits::parse(TapyrusUnits::TPC, i->second, &rv.amount))
                 {
                     return false;
                 }
@@ -189,7 +189,7 @@ QString formatTapyrusURI(const SendCoinsRecipient &info)
 
     if (info.amount)
     {
-        ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::TPC, info.amount, false, BitcoinUnits::separatorNever));
+        ret += QString("?amount=%1").arg(TapyrusUnits::format(TapyrusUnits::TPC, info.amount, false, TapyrusUnits::separatorNever));
         paramCount++;
     }
 

src/qt/optionsdialog.cpp

@@ -108,7 +108,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
     }
     ui->thirdPartyTxUrls->setPlaceholderText("https://example.com/tx/%s");
 
-    ui->unit->setModel(new BitcoinUnits(this));
+    ui->unit->setModel(new TapyrusUnits(this));
 
     /* Widget-to-option mapper */
     mapper = new QDataWidgetMapper(this);

src/qt/optionsmodel.cpp

@@ -67,7 +67,7 @@ void OptionsModel::Init(bool resetSettings)
 
     // Display
     if (!settings.contains("nDisplayUnit"))
-        settings.setValue("nDisplayUnit", BitcoinUnits::TPC);
+        settings.setValue("nDisplayUnit", TapyrusUnits::TPC);
     nDisplayUnit = settings.value("nDisplayUnit").toInt();
 
     if (!settings.contains("strThirdPartyTxUrls"))