mirror of
https://github.com/monero-project/monero-gui
synced 2024-11-14 15:46:00 +01:00
replace wallet/wallet2_api.h with wallet/api/wallet2_api.h to compile
This commit is contained in:
parent
d9d2050f29
commit
77bcdf9434
2
main.cpp
2
main.cpp
@ -50,7 +50,7 @@
|
||||
#include "model/TransactionHistorySortFilterModel.h"
|
||||
#include "AddressBook.h"
|
||||
#include "model/AddressBookModel.h"
|
||||
#include "wallet/wallet2_api.h"
|
||||
#include "wallet/api/wallet2_api.h"
|
||||
#include "MainApp.h"
|
||||
|
||||
// IOS exclusions
|
||||
|
2
monero
2
monero
@ -1 +1 @@
|
||||
Subproject commit ab594cfee94dff87bb7039724563f6177a892b8b
|
||||
Subproject commit 8512a83572094f96aff95e02db359914a37c3c71
|
@ -1,7 +1,7 @@
|
||||
#ifndef ADDRESSBOOK_H
|
||||
#define ADDRESSBOOK_H
|
||||
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
#include <QObject>
|
||||
#include <QList>
|
||||
#include <QDateTime>
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
|
||||
//namespace Monero {
|
||||
//class PendingTransaction;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "TransactionHistory.h"
|
||||
#include "TransactionInfo.h"
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef TRANSACTIONINFO_H
|
||||
#define TRANSACTIONINFO_H
|
||||
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
#include <QObject>
|
||||
#include <QDateTime>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef TRANSFER_H
|
||||
#define TRANSFER_H
|
||||
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
#include <QObject>
|
||||
|
||||
class Transfer : public QObject
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
|
||||
class UnsignedTransaction : public QObject
|
||||
{
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "model/TransactionHistoryModel.h"
|
||||
#include "model/TransactionHistorySortFilterModel.h"
|
||||
#include "model/AddressBookModel.h"
|
||||
#include "wallet/wallet2_api.h"
|
||||
#include "wallet/api/wallet2_api.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QDir>
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <QMutex>
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
|
||||
#include "wallet/wallet2_api.h" // we need to have an access to the Monero::Wallet::Status enum here;
|
||||
#include "wallet/api/wallet2_api.h" // we need to have an access to the Monero::Wallet::Status enum here;
|
||||
#include "PendingTransaction.h" // we need to have an access to the PendingTransaction::Priority enum here;
|
||||
#include "UnsignedTransaction.h"
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "WalletManager.h"
|
||||
#include "Wallet.h"
|
||||
#include "wallet/wallet2_api.h"
|
||||
#include "wallet/api/wallet2_api.h"
|
||||
#include "zxcvbn-c/zxcvbn.h"
|
||||
#include "QRCodeImageProvider.h"
|
||||
#include <QFile>
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QUrl>
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
#include <QMutex>
|
||||
#include <QPointer>
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "AddressBook.h"
|
||||
#include <QDebug>
|
||||
#include <QHash>
|
||||
#include <wallet/wallet2_api.h>
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
|
||||
AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook)
|
||||
: QAbstractListModel(parent) , m_addressBook(addressBook)
|
||||
|
Loading…
Reference in New Issue
Block a user