From 4fc2594f1c8b67a796ff260994555e25a0d577d6 Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Sun, 4 Apr 2021 01:03:55 -0700
Subject: [PATCH] Build: Remove no-longer-needed Moc conflict workaround

With the GUI's RPC execution code being now de-duplicated, we can do
some additional cleanup for CMake builds and a no-longer-needed
`rpcconsole.moc` include.
---
 src/Makefile.qt.include | 4 +---
 src/qt/CMakeLists.txt   | 7 -------
 src/qt/rpcconsole.cpp   | 4 ----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 9931d3b231d98..e60c9252b3995 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -163,9 +163,7 @@ BITCOIN_MM = \
 
 QT_MOC = \
   qt/pivx.moc \
-  qt/intro.moc \
-  qt/rpcconsole.moc \
-  qt/pivx/settings/moc_settingsconsolewidget.cpp
+  qt/intro.moc
 
 QT_QRC_CPP = qt/qrc_pivx.cpp
 QT_QRC = qt/pivx.qrc
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index d0a62f27147e5..daac74f1b1a86 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -175,13 +175,6 @@ SET(QT_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/splash.cpp
         )
 
-# Workaround until the old rpcconsole UI window is fully removed
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsconsolewidget.cpp PROPERTY SKIP_AUTOMOC ON)
-execute_process(
-        COMMAND ${MOC_BIN} -o moc_settingsconsolewidget.cpp settingsconsolewidget.h
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings
-)
-
 execute_process(
         COMMAND ${MOC_BIN} -o moc_pfborderimage.cpp pfborderimage.h
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pivx
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 0a811d22f4291..8e3405d025c25 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -20,8 +20,6 @@
 #include "wallet/wallet.h"
 #endif // ENABLE_WALLET
 
-#include <univalue.h>
-
 #ifdef ENABLE_WALLET
 #include <db_cxx.h>
 #endif
@@ -62,8 +60,6 @@ const struct {
     {"misc", ":/icons/tx_inout"},
     {NULL, NULL}};
 
-#include "rpcconsole.moc"
-
 RPCConsole::RPCConsole(QWidget* parent) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
                                           ui(new Ui::RPCConsole),
                                           clientModel(0),