libwalletqt: forward declare wallet2

diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp
index 607bd92da59d38515d2a5cf4bc3b27e723efaf2b..b145c1fad0a985742912d90f48827ee93c3ceddc 100644 (file)
--- a/src/libwalletqt/AddressBook.cpp
+++ b/src/libwalletqt/AddressBook.cpp
@@ -3,6 +3,7 @@
 
 #include "AddressBook.h"
 #include <QDebug>
+#include <wallet/wallet2.h>
 
 AddressBook::AddressBook(Wallet *wallet, tools::wallet2 *wallet2, QObject *parent)
      : QObject(parent)

diff --git a/src/libwalletqt/AddressBook.h b/src/libwalletqt/AddressBook.h
index b9e7f2095814e01e5a90f22c016557d5a496026d..f3724ad9ae6278a0d9c1d49271b85e5a64229187 100644 (file)
--- a/src/libwalletqt/AddressBook.h
+++ b/src/libwalletqt/AddressBook.h
@@ -13,12 +13,15 @@
 
 #include "rows/ContactRow.h"
 #include "Wallet.h"
-#include "wallet/wallet2.h"
 
 namespace Monero {
 struct AddressBook;
 }
 
+namespace tools{
+    class wallet2;
+}
+
 class AddressBook : public QObject
 {
     Q_OBJECT

diff --git a/src/libwalletqt/Coins.cpp b/src/libwalletqt/Coins.cpp
index 3f74fe45452e62dcd5a6d8d2f99640f987613ef3..aefe5571b0e383b6de938ecb4a0590323fe701ce 100644 (file)
--- a/src/libwalletqt/Coins.cpp
+++ b/src/libwalletqt/Coins.cpp
@@ -3,6 +3,7 @@
 
 #include "Coins.h"
 #include "rows/CoinsInfo.h"
+#include <wallet/wallet2.h>
 
 Coins::Coins(Wallet *wallet, tools::wallet2 *wallet2, QObject *parent)
         : QObject(parent)

diff --git a/src/libwalletqt/Coins.h b/src/libwalletqt/Coins.h
index 8c6e9cdd2b72fc6530b3fe0c4bcf6434f604ae93..68b58eeb015390483b2a0842c697263c7e0e4dc0 100644 (file)
--- a/src/libwalletqt/Coins.h
+++ b/src/libwalletqt/Coins.h
@@ -10,15 +10,17 @@
 #include <QList>
 #include <QReadWriteLock>
 #include <QDateTime>
-#include <wallet/api/wallet2_api.h>
 
 #include "Wallet.h"
-#include "wallet/wallet2.h"
 
 namespace Monero {
     struct TransactionHistory;
 }
 
+namespace tools {
+    class wallet2;
+}
+
 class CoinsInfo;
 
 class Coins : public QObject

diff --git a/src/libwalletqt/Subaddress.cpp b/src/libwalletqt/Subaddress.cpp
index d33072dcbdcaa52564bda076330400910d801484..1a3bf5f07e331093a5a22e457c5a510c2ce8068c 100644 (file)
--- a/src/libwalletqt/Subaddress.cpp
+++ b/src/libwalletqt/Subaddress.cpp
@@ -4,6 +4,8 @@
 #include "Subaddress.h"
 #include <QDebug>
 
+#include <wallet/wallet2.h>
+
 Subaddress::Subaddress(Wallet *wallet, tools::wallet2 *wallet2, QObject *parent)
     : QObject(parent)
     , m_wallet(wallet)

diff --git a/src/libwalletqt/Subaddress.h b/src/libwalletqt/Subaddress.h
index 96c111ab61c9f269b6db7ca9ce1a873aef5de8a7..32439fcd7a97dd14a1a53f53abccbe107653e474 100644 (file)
--- a/src/libwalletqt/Subaddress.h
+++ b/src/libwalletqt/Subaddress.h
@@ -12,11 +12,13 @@
 #include <QList>
 #include <QDateTime>
 
-#include <wallet/wallet2.h>
-
 #include "Wallet.h"
 #include "rows/SubaddressRow.h"
 
+namespace tools {
+    class wallet2;
+}
+
 class Subaddress : public QObject
 {
     Q_OBJECT

diff --git a/src/libwalletqt/SubaddressAccount.cpp b/src/libwalletqt/SubaddressAccount.cpp
index 16db72f4cf74487918a052d99651538218247d61..69b4a5b1fa63fc1d0517f7f545a8232e1e25c46a 100644 (file)
--- a/src/libwalletqt/SubaddressAccount.cpp
+++ b/src/libwalletqt/SubaddressAccount.cpp
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2020-2023 The Monero Project
 
 #include "SubaddressAccount.h"
-#include <QDebug>
+#include <wallet/wallet2.h>
 
 SubaddressAccount::SubaddressAccount(Wallet *wallet, tools::wallet2 *wallet2, QObject *parent)
     : QObject(parent)

diff --git a/src/libwalletqt/SubaddressAccount.h b/src/libwalletqt/SubaddressAccount.h
index 28957b40fdedef2ade81713455f0f9964bd783f8..30d1a589eda3a08ea82e9c3c35584edeeaf404a4 100644 (file)
--- a/src/libwalletqt/SubaddressAccount.h
+++ b/src/libwalletqt/SubaddressAccount.h
@@ -6,17 +6,18 @@
 
 #include <functional>
 
-#include <wallet/api/wallet2_api.h>
 #include <QObject>
 #include <QReadWriteLock>
 #include <QList>
 #include <QDateTime>
 
-#include <wallet/wallet2.h>
-
 #include "Wallet.h"
 #include "rows/AccountRow.h"
 
+namespace tools {
+    class wallet2;
+}
+
 class SubaddressAccount : public QObject
 {
     Q_OBJECT

diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp
index 35029925e0f2ed78357d23788b98773cf7b19749..bdcddcd4dc81e21a0286b627f1da7d6308bd65b1 100644 (file)
--- a/src/libwalletqt/TransactionHistory.cpp
+++ b/src/libwalletqt/TransactionHistory.cpp
@@ -9,6 +9,7 @@
 #include "WalletManager.h"
 #include "Transfer.h"
 #include "Ring.h"
+#include "wallet/wallet2.h"
 
 bool TransactionHistory::transaction(int index, std::function<void (TransactionRow &)> callback)
 {

diff --git a/src/libwalletqt/TransactionHistory.h b/src/libwalletqt/TransactionHistory.h
index c55298d56aa650218e2d5bb6e7cf6be9dde72cf4..cd6afbe14a17ac5da7bafb7fe85e499f379582b1 100644 (file)
--- a/src/libwalletqt/TransactionHistory.h
+++ b/src/libwalletqt/TransactionHistory.h
@@ -13,7 +13,10 @@
 
 #include "rows/TransactionRow.h"
 #include "Wallet.h"
-#include "wallet/wallet2.h"
+
+namespace tools {
+    class wallet2;
+}
 
 namespace Monero {
 struct TransactionHistory;