forked from Public/monero-gui
replace wallet/wallet2_api.h with wallet/api/wallet2_api.h to compile
This commit is contained in:
2
main.cpp
2
main.cpp
@@ -50,7 +50,7 @@
|
|||||||
#include "model/TransactionHistorySortFilterModel.h"
|
#include "model/TransactionHistorySortFilterModel.h"
|
||||||
#include "AddressBook.h"
|
#include "AddressBook.h"
|
||||||
#include "model/AddressBookModel.h"
|
#include "model/AddressBookModel.h"
|
||||||
#include "wallet/wallet2_api.h"
|
#include "wallet/api/wallet2_api.h"
|
||||||
#include "MainApp.h"
|
#include "MainApp.h"
|
||||||
|
|
||||||
// IOS exclusions
|
// IOS exclusions
|
||||||
|
|||||||
2
monero
2
monero
Submodule monero updated: ab594cfee9...8512a83572
@@ -1,7 +1,7 @@
|
|||||||
#ifndef ADDRESSBOOK_H
|
#ifndef ADDRESSBOOK_H
|
||||||
#define ADDRESSBOOK_H
|
#define ADDRESSBOOK_H
|
||||||
|
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
|
|
||||||
//namespace Monero {
|
//namespace Monero {
|
||||||
//class PendingTransaction;
|
//class PendingTransaction;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#include "TransactionHistory.h"
|
#include "TransactionHistory.h"
|
||||||
#include "TransactionInfo.h"
|
#include "TransactionInfo.h"
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef TRANSACTIONINFO_H
|
#ifndef TRANSACTIONINFO_H
|
||||||
#define TRANSACTIONINFO_H
|
#define TRANSACTIONINFO_H
|
||||||
|
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef TRANSFER_H
|
#ifndef TRANSFER_H
|
||||||
#define TRANSFER_H
|
#define TRANSFER_H
|
||||||
|
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
class Transfer : public QObject
|
class Transfer : public QObject
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
|
|
||||||
class UnsignedTransaction : public QObject
|
class UnsignedTransaction : public QObject
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include "model/TransactionHistoryModel.h"
|
#include "model/TransactionHistoryModel.h"
|
||||||
#include "model/TransactionHistorySortFilterModel.h"
|
#include "model/TransactionHistorySortFilterModel.h"
|
||||||
#include "model/AddressBookModel.h"
|
#include "model/AddressBookModel.h"
|
||||||
#include "wallet/wallet2_api.h"
|
#include "wallet/api/wallet2_api.h"
|
||||||
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
#include <QtConcurrent/QtConcurrent>
|
#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 "PendingTransaction.h" // we need to have an access to the PendingTransaction::Priority enum here;
|
||||||
#include "UnsignedTransaction.h"
|
#include "UnsignedTransaction.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#include "WalletManager.h"
|
#include "WalletManager.h"
|
||||||
#include "Wallet.h"
|
#include "Wallet.h"
|
||||||
#include "wallet/wallet2_api.h"
|
#include "wallet/api/wallet2_api.h"
|
||||||
#include "zxcvbn-c/zxcvbn.h"
|
#include "zxcvbn-c/zxcvbn.h"
|
||||||
#include "QRCodeImageProvider.h"
|
#include "QRCodeImageProvider.h"
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
#include <QPointer>
|
#include <QPointer>
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#include "AddressBook.h"
|
#include "AddressBook.h"
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
#include <wallet/wallet2_api.h>
|
#include <wallet/api/wallet2_api.h>
|
||||||
|
|
||||||
AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook)
|
AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook)
|
||||||
: QAbstractListModel(parent) , m_addressBook(addressBook)
|
: QAbstractListModel(parent) , m_addressBook(addressBook)
|
||||||
|
|||||||
Reference in New Issue
Block a user