refactor: move third party integrations to plugins folder

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ada21ff6a0c577fb2bf79a7cc19359fc3da6e718..63a196e1d13bb010f5f6d58e91275effd3a56d12 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,6 +72,8 @@ file(GLOB SOURCE_FILES
         "monero_seed/*.cpp"
         "monero_seed/*.c"
         "monero_seed/*.hpp"
+        "plugins/*/*.cpp"
+        "plugins/*/*.h"
         )
 
 if (WITH_SCANNER AND NOT Qt6_FOUND)

diff --git a/src/MainWindow.h b/src/MainWindow.h
index 99a261cebf7b2ef5e92bd05aaf91f0a97a23a274..e871c6453d31b472b657ef3fa5190f33b82b5040 100644 (file)
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -32,8 +32,8 @@
 #include "utils/daemonrpc.h"
 #include "utils/EventFilter.h"
 #include "utils/Updater.h"
-#include "widgets/CCSWidget.h"
-#include "widgets/RedditWidget.h"
+#include "plugins/ccs/CCSWidget.h"
+#include "plugins/reddit/RedditWidget.h"
 #include "widgets/TickerWidget.h"
 #include "widgets/WalletUnlockWidget.h"
 #include "wizard/WalletWizard.h"
@@ -47,11 +47,11 @@
 #include "WindowManager.h"
 
 #ifdef HAS_LOCALMONERO
-#include "widgets/LocalMoneroWidget.h"
+#include "plugins/localmonero/LocalMoneroWidget.h"
 #endif
 
 #ifdef HAS_XMRIG
-#include "widgets/XMRigWidget.h"
+#include "plugins/xmrig/XMRigWidget.h"
 #endif
 
 namespace Ui {

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 0f913ea1310b117453e6e5599d0f7cae5ebafa99..710e39e6beb4034dccc7183b9724c5992848d353 100644 (file)
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -960,25 +960,25 @@
   <customwidget>
    <class>CCSWidget</class>
    <extends>QWidget</extends>
-   <header>widgets/CCSWidget.h</header>
+   <header>plugins/ccs/CCSWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>RedditWidget</class>
    <extends>QWidget</extends>
-   <header>widgets/RedditWidget.h</header>
+   <header>plugins/reddit/RedditWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>RevuoWidget</class>
    <extends>QWidget</extends>
-   <header>widgets/RevuoWidget.h</header>
+   <header>plugins/revuo/RevuoWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>BountiesWidget</class>
    <extends>QWidget</extends>
-   <header>widgets/BountiesWidget.h</header>
+   <header>plugins/bounties/BountiesWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/SendWidget.h b/src/SendWidget.h
index ca1375937e5831886f6a26c01b31c6c25c7fcf0a..db11b5fd438ef88287def5afb6f69bf405295d52 100644 (file)
--- a/src/SendWidget.h
+++ b/src/SendWidget.h
@@ -7,7 +7,6 @@
 #include <QWidget>
 
 #include "libwalletqt/Wallet.h"
-#include "widgets/CCSWidget.h"
 
 namespace Ui {
     class SendWidget;

diff --git a/src/model/BountiesModel.cpp b/src/plugins/bounties/BountiesModel.cpp
similarity index 100%
rename from src/model/BountiesModel.cpp
rename to src/plugins/bounties/BountiesModel.cpp

diff --git a/src/model/BountiesModel.h b/src/plugins/bounties/BountiesModel.h
similarity index 97%
rename from src/model/BountiesModel.h
rename to src/plugins/bounties/BountiesModel.h
index cde0d23dc86afe7d2cccd943c8e2cccae6b83f2d..34b6e0c5a4d0a710c2a90d4df8f8847e6b81cdc5 100644 (file)
--- a/src/model/BountiesModel.h
+++ b/src/plugins/bounties/BountiesModel.h
@@ -7,7 +7,7 @@
 #include <QAbstractTableModel>
 #include <QSharedPointer>
 
-#include "widgets/Bounty.h"
+#include "Bounty.h"
 
 class BountiesModel : public QAbstractTableModel
 {

diff --git a/src/widgets/BountiesWidget.cpp b/src/plugins/bounties/BountiesWidget.cpp
similarity index 98%
rename from src/widgets/BountiesWidget.cpp
rename to src/plugins/bounties/BountiesWidget.cpp
index 75622858d5a080c54ba12e3bf7a3715fb0edb5f7..3ed33f1f457ff772b5388feb66c317e284c54bc1 100644 (file)
--- a/src/widgets/BountiesWidget.cpp
+++ b/src/plugins/bounties/BountiesWidget.cpp
@@ -8,7 +8,7 @@
 #include <QStandardItemModel>
 #include <QTableWidget>
 
-#include "model/BountiesModel.h"
+#include "BountiesModel.h"
 #include "utils/Utils.h"
 #include "utils/config.h"
 

diff --git a/src/widgets/BountiesWidget.h b/src/plugins/bounties/BountiesWidget.h
similarity index 96%
rename from src/widgets/BountiesWidget.h
rename to src/plugins/bounties/BountiesWidget.h
index 47f070b57fa1fc435a84f1dd78253bd4070502a3..02e51a4f6fd7804a3751a0f53e54716d362280b8 100644 (file)
--- a/src/widgets/BountiesWidget.h
+++ b/src/plugins/bounties/BountiesWidget.h
@@ -8,7 +8,7 @@
 #include <QMenu>
 #include <QWidget>
 
-#include "model/BountiesModel.h"
+#include "BountiesModel.h"
 
 namespace Ui {
     class BountiesWidget;

diff --git a/src/widgets/BountiesWidget.ui b/src/plugins/bounties/BountiesWidget.ui
similarity index 100%
rename from src/widgets/BountiesWidget.ui
rename to src/plugins/bounties/BountiesWidget.ui

diff --git a/src/widgets/Bounty.h b/src/plugins/bounties/Bounty.h
similarity index 100%
rename from src/widgets/Bounty.h
rename to src/plugins/bounties/Bounty.h

diff --git a/src/widgets/CCSEntry.h b/src/plugins/ccs/CCSEntry.h
similarity index 100%
rename from src/widgets/CCSEntry.h
rename to src/plugins/ccs/CCSEntry.h

diff --git a/src/model/CCSModel.cpp b/src/plugins/ccs/CCSModel.cpp
similarity index 100%
rename from src/model/CCSModel.cpp
rename to src/plugins/ccs/CCSModel.cpp

diff --git a/src/model/CCSModel.h b/src/plugins/ccs/CCSModel.h
similarity index 96%
rename from src/model/CCSModel.h
rename to src/plugins/ccs/CCSModel.h
index 2ff4be00c7963b7135c6228752bcf2bcaa9c84f4..7b34416b2de087bb19919c91d52e025bc5c4bb65 100644 (file)
--- a/src/model/CCSModel.h
+++ b/src/plugins/ccs/CCSModel.h
@@ -7,7 +7,7 @@
 #include <QAbstractTableModel>
 #include <QSharedPointer>
 
-#include "widgets/CCSEntry.h"
+#include "CCSEntry.h"
 
 class CCSModel : public QAbstractTableModel
 {

diff --git a/src/widgets/CCSProgressDelegate.cpp b/src/plugins/ccs/CCSProgressDelegate.cpp
similarity index 100%
rename from src/widgets/CCSProgressDelegate.cpp
rename to src/plugins/ccs/CCSProgressDelegate.cpp

diff --git a/src/widgets/CCSProgressDelegate.h b/src/plugins/ccs/CCSProgressDelegate.h
similarity index 95%
rename from src/widgets/CCSProgressDelegate.h
rename to src/plugins/ccs/CCSProgressDelegate.h
index 0e2319c09009358935ab951e2056d78fd057cab2..ed621ab473dd89915da853e490a3ef59f4c5d2b5 100644 (file)
--- a/src/widgets/CCSProgressDelegate.h
+++ b/src/plugins/ccs/CCSProgressDelegate.h
@@ -6,7 +6,7 @@
 
 #include <QStyledItemDelegate>
 
-#include "model/CCSModel.h"
+#include "CCSModel.h"
 
 class CCSProgressDelegate : public QStyledItemDelegate
 {

diff --git a/src/widgets/CCSWidget.cpp b/src/plugins/ccs/CCSWidget.cpp
similarity index 100%
rename from src/widgets/CCSWidget.cpp
rename to src/plugins/ccs/CCSWidget.cpp

diff --git a/src/widgets/CCSWidget.h b/src/plugins/ccs/CCSWidget.h
similarity index 93%
rename from src/widgets/CCSWidget.h
rename to src/plugins/ccs/CCSWidget.h
index 0b47e4db56f35656765a326081aaedc68963e07a..473bbb4c7f61920234b9fdd3cae23ac052ae4aa6 100644 (file)
--- a/src/widgets/CCSWidget.h
+++ b/src/plugins/ccs/CCSWidget.h
@@ -10,8 +10,8 @@
 #include <QProgressBar>
 #include <QWidget>
 
-#include "model/CCSModel.h"
-#include "widgets/CCSEntry.h"
+#include "CCSModel.h"
+#include "CCSEntry.h"
 
 namespace Ui {
     class CSSWidget;

diff --git a/src/widgets/CCSWidget.ui b/src/plugins/ccs/CCSWidget.ui
similarity index 100%
rename from src/widgets/CCSWidget.ui
rename to src/plugins/ccs/CCSWidget.ui

diff --git a/src/api/LocalMoneroApi.cpp b/src/plugins/localmonero/LocalMoneroApi.cpp
similarity index 100%
rename from src/api/LocalMoneroApi.cpp
rename to src/plugins/localmonero/LocalMoneroApi.cpp

diff --git a/src/api/LocalMoneroApi.h b/src/plugins/localmonero/LocalMoneroApi.h
similarity index 100%
rename from src/api/LocalMoneroApi.h
rename to src/plugins/localmonero/LocalMoneroApi.h

diff --git a/src/dialog/LocalMoneroInfoDialog.cpp b/src/plugins/localmonero/LocalMoneroInfoDialog.cpp
similarity index 100%
rename from src/dialog/LocalMoneroInfoDialog.cpp
rename to src/plugins/localmonero/LocalMoneroInfoDialog.cpp

diff --git a/src/dialog/LocalMoneroInfoDialog.h b/src/plugins/localmonero/LocalMoneroInfoDialog.h
similarity index 95%
rename from src/dialog/LocalMoneroInfoDialog.h
rename to src/plugins/localmonero/LocalMoneroInfoDialog.h
index fa0184419b2ac5b5bc652b62861062a0f900e13e..fb4ffa69a57a6bcedf25b42ebd291cc8eae134a8 100644 (file)
--- a/src/dialog/LocalMoneroInfoDialog.h
+++ b/src/plugins/localmonero/LocalMoneroInfoDialog.h
@@ -8,7 +8,7 @@
 #include <QLabel>
 
 #include "components.h"
-#include "model/LocalMoneroModel.h"
+#include "LocalMoneroModel.h"
 
 namespace Ui {
     class LocalMoneroInfoDialog;

diff --git a/src/dialog/LocalMoneroInfoDialog.ui b/src/plugins/localmonero/LocalMoneroInfoDialog.ui
similarity index 100%
rename from src/dialog/LocalMoneroInfoDialog.ui
rename to src/plugins/localmonero/LocalMoneroInfoDialog.ui

diff --git a/src/model/LocalMoneroModel.cpp b/src/plugins/localmonero/LocalMoneroModel.cpp
similarity index 100%
rename from src/model/LocalMoneroModel.cpp
rename to src/plugins/localmonero/LocalMoneroModel.cpp

diff --git a/src/model/LocalMoneroModel.h b/src/plugins/localmonero/LocalMoneroModel.h
similarity index 100%
rename from src/model/LocalMoneroModel.h
rename to src/plugins/localmonero/LocalMoneroModel.h

diff --git a/src/widgets/LocalMoneroWidget.cpp b/src/plugins/localmonero/LocalMoneroWidget.cpp
similarity index 99%
rename from src/widgets/LocalMoneroWidget.cpp
rename to src/plugins/localmonero/LocalMoneroWidget.cpp
index e00a9009464ea4ebd215a349bd067de5ec2e7c50..7a2c72dfcbd726c93f73b1b1dfc9a49685c1e933 100644 (file)
--- a/src/widgets/LocalMoneroWidget.cpp
+++ b/src/plugins/localmonero/LocalMoneroWidget.cpp
@@ -7,10 +7,9 @@
 #include <QMessageBox>
 #include <QMenu>
 
-#include "dialog/LocalMoneroInfoDialog.h"
+#include "LocalMoneroInfoDialog.h"
 #include "utils/ColorScheme.h"
 #include "utils/Icons.h"
-#include "utils/NetworkManager.h"
 #include "utils/WebsocketNotifier.h"
 
 LocalMoneroWidget::LocalMoneroWidget(QWidget *parent, Wallet *wallet)

diff --git a/src/widgets/LocalMoneroWidget.h b/src/plugins/localmonero/LocalMoneroWidget.h
similarity index 94%
rename from src/widgets/LocalMoneroWidget.h
rename to src/plugins/localmonero/LocalMoneroWidget.h
index ffb470a3f3570f1a2ab93c561cc2ed607051f325..edad19bacd2a9fdd552bc5f025fdb9bb7d311179 100644 (file)
--- a/src/widgets/LocalMoneroWidget.h
+++ b/src/plugins/localmonero/LocalMoneroWidget.h
@@ -6,8 +6,8 @@
 
 #include <QWidget>
 
-#include "api/LocalMoneroApi.h"
-#include "model/LocalMoneroModel.h"
+#include "LocalMoneroApi.h"
+#include "LocalMoneroModel.h"
 #include "libwalletqt/Wallet.h"
 
 namespace Ui {

diff --git a/src/widgets/LocalMoneroWidget.ui b/src/plugins/localmonero/LocalMoneroWidget.ui
similarity index 100%
rename from src/widgets/LocalMoneroWidget.ui
rename to src/plugins/localmonero/LocalMoneroWidget.ui

diff --git a/src/model/RedditModel.cpp b/src/plugins/reddit/RedditModel.cpp
similarity index 100%
rename from src/model/RedditModel.cpp
rename to src/plugins/reddit/RedditModel.cpp

diff --git a/src/model/RedditModel.h b/src/plugins/reddit/RedditModel.h
similarity index 96%
rename from src/model/RedditModel.h
rename to src/plugins/reddit/RedditModel.h
index a4b1c94bd1eaad5cb9671e8af74381bdbc81144c..0b9da907888116a8b3d64d17a4d27c379c72d327 100644 (file)
--- a/src/model/RedditModel.h
+++ b/src/plugins/reddit/RedditModel.h
@@ -7,7 +7,7 @@
 #include <QAbstractTableModel>
 #include <QSharedPointer>
 
-#include "widgets/RedditPost.h"
+#include "RedditPost.h"
 
 class RedditModel : public QAbstractTableModel
 {

diff --git a/src/widgets/RedditPost.h b/src/plugins/reddit/RedditPost.h
similarity index 100%
rename from src/widgets/RedditPost.h
rename to src/plugins/reddit/RedditPost.h

diff --git a/src/widgets/RedditWidget.cpp b/src/plugins/reddit/RedditWidget.cpp
similarity index 98%
rename from src/widgets/RedditWidget.cpp
rename to src/plugins/reddit/RedditWidget.cpp
index c5089b81ed5381dc40369b6f63c4ebe434204bc3..c360586c217bcca698a654dc9f2c1de052b155d9 100644 (file)
--- a/src/widgets/RedditWidget.cpp
+++ b/src/plugins/reddit/RedditWidget.cpp
@@ -8,7 +8,7 @@
 #include <QStandardItemModel>
 #include <QTableWidget>
 
-#include "model/RedditModel.h"
+#include "RedditModel.h"
 #include "utils/Utils.h"
 #include "utils/config.h"
 

diff --git a/src/widgets/RedditWidget.h b/src/plugins/reddit/RedditWidget.h
similarity index 96%
rename from src/widgets/RedditWidget.h
rename to src/plugins/reddit/RedditWidget.h
index a88cf4f2008d48c6c5f833d3a15baf1fdd16dd46..950700ed16e853d8ff272b69e7dc5d213d8e6048 100644 (file)
--- a/src/widgets/RedditWidget.h
+++ b/src/plugins/reddit/RedditWidget.h
@@ -8,7 +8,7 @@
 #include <QMenu>
 #include <QWidget>
 
-#include "model/RedditModel.h"
+#include "RedditModel.h"
 
 namespace Ui {
     class RedditWidget;

diff --git a/src/widgets/RedditWidget.ui b/src/plugins/reddit/RedditWidget.ui
similarity index 100%
rename from src/widgets/RedditWidget.ui
rename to src/plugins/reddit/RedditWidget.ui

diff --git a/src/widgets/RevuoItem.h b/src/plugins/revuo/RevuoItem.h
similarity index 100%
rename from src/widgets/RevuoItem.h
rename to src/plugins/revuo/RevuoItem.h

diff --git a/src/widgets/RevuoWidget.cpp b/src/plugins/revuo/RevuoWidget.cpp
similarity index 100%
rename from src/widgets/RevuoWidget.cpp
rename to src/plugins/revuo/RevuoWidget.cpp

diff --git a/src/widgets/RevuoWidget.h b/src/plugins/revuo/RevuoWidget.h
similarity index 100%
rename from src/widgets/RevuoWidget.h
rename to src/plugins/revuo/RevuoWidget.h

diff --git a/src/widgets/RevuoWidget.ui b/src/plugins/revuo/RevuoWidget.ui
similarity index 100%
rename from src/widgets/RevuoWidget.ui
rename to src/plugins/revuo/RevuoWidget.ui

diff --git a/src/widgets/XMRigWidget.cpp b/src/plugins/xmrig/XMRigWidget.cpp
similarity index 100%
rename from src/widgets/XMRigWidget.cpp
rename to src/plugins/xmrig/XMRigWidget.cpp

diff --git a/src/widgets/XMRigWidget.h b/src/plugins/xmrig/XMRigWidget.h
similarity index 98%
rename from src/widgets/XMRigWidget.h
rename to src/plugins/xmrig/XMRigWidget.h
index a7e3f6730169838e36bb08b1898cd79c4a197059..4a645f520cd827db09dd9cc39196160cd064fc61 100644 (file)
--- a/src/widgets/XMRigWidget.h
+++ b/src/plugins/xmrig/XMRigWidget.h
@@ -9,7 +9,7 @@
 #include <QItemSelection>
 #include <QStandardItemModel>
 
-#include "utils/xmrig.h"
+#include "xmrig.h"
 #include "utils/config.h"
 #include "libwalletqt/Wallet.h"
 

diff --git a/src/widgets/XMRigWidget.ui b/src/plugins/xmrig/XMRigWidget.ui
similarity index 100%
rename from src/widgets/XMRigWidget.ui
rename to src/plugins/xmrig/XMRigWidget.ui

diff --git a/src/utils/xmrig.cpp b/src/plugins/xmrig/xmrig.cpp
similarity index 99%
rename from src/utils/xmrig.cpp
rename to src/plugins/xmrig/xmrig.cpp
index 418fd57b258868333e24fddee211244f5d9cbecb..403a2e3b5ea3e10133006072802bb5a8758d5c4d 100644 (file)
--- a/src/utils/xmrig.cpp
+++ b/src/plugins/xmrig/xmrig.cpp
@@ -6,7 +6,7 @@
 
 #include "utils/config.h"
 #include "utils/Utils.h"
-#include "utils/xmrig.h"
+#include "xmrig.h"
 #include "utils/TorManager.h"
 
 XmRig::XmRig(const QString &configDir, QObject *parent)

diff --git a/src/utils/xmrig.h b/src/plugins/xmrig/xmrig.h
similarity index 100%
rename from src/utils/xmrig.h
rename to src/plugins/xmrig/xmrig.h

diff --git a/src/utils/WebsocketNotifier.h b/src/utils/WebsocketNotifier.h
index 228f3f2db1dfaa92a5cdee7e200a1bcb4b2471c1..ce131ca38c980826fbe0bc8fa7233e9496053788 100644 (file)
--- a/src/utils/WebsocketNotifier.h
+++ b/src/utils/WebsocketNotifier.h
@@ -11,10 +11,10 @@
 #include "networktype.h"
 #include "nodes.h"
 #include "prices.h"
-#include "widgets/Bounty.h"
-#include "widgets/RedditPost.h"
-#include "widgets/CCSEntry.h"
-#include "widgets/RevuoItem.h"
+#include "plugins/bounties/Bounty.h"
+#include "plugins/reddit/RedditPost.h"
+#include "plugins/ccs/CCSEntry.h"
+#include "plugins/revuo/RevuoItem.h"
 #include "TxFiatHistory.h"
 
 class WebsocketNotifier : public QObject {