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

@@ -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

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

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),