monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1000

Browse source 
77bcdf9 replace wallet/wallet2_api.h with wallet/api/wallet2_api.h to compile
This commit is contained in:
luigi1111 2017-12-10 16:06:46 -06:00
commit 7e801642c2
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
13 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.cpp
View file

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

@ -1 +1 @@
Subproject commit ab594cfee94dff87bb7039724563f6177a892b8b Subproject commit 8512a83572094f96aff95e02db359914a37c3c71

2
src/libwalletqt/AddressBook.h
View file

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

2
src/libwalletqt/PendingTransaction.h
View file

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

2
src/libwalletqt/TransactionHistory.cpp
View file

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

2
src/libwalletqt/TransactionInfo.h
View file

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

2
src/libwalletqt/Transfer.h
View file

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

2
src/libwalletqt/UnsignedTransaction.h
View file

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

2
src/libwalletqt/Wallet.cpp
View file

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

2
src/libwalletqt/Wallet.h
View file

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

2
src/libwalletqt/WalletManager.cpp
View file

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

2
src/libwalletqt/WalletManager.h
View file

@ -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
src/model/AddressBookModel.cpp
View file

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