From 0e5329ab6c8e09b5b78120b917c19e6e6a455156 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Wed, 14 Dec 2016 23:28:20 +0100 Subject: [PATCH] Addressbook: updated references to bitmonero --- src/libwalletqt/AddressBook.cpp | 6 +++--- src/libwalletqt/AddressBook.h | 12 ++++++------ src/model/AddressBookModel.cpp | 2 +- src/model/AddressBookModel.h | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp index 971fa17b..3535bb67 100644 --- a/src/libwalletqt/AddressBook.cpp +++ b/src/libwalletqt/AddressBook.cpp @@ -1,7 +1,7 @@ #include "AddressBook.h" #include -AddressBook::AddressBook(Bitmonero::AddressBook *abImpl,QObject *parent) +AddressBook::AddressBook(Monero::AddressBook *abImpl,QObject *parent) : QObject(parent), m_addressBookImpl(abImpl) { qDebug(__FUNCTION__); @@ -18,7 +18,7 @@ int AddressBook::errorCode() const return m_addressBookImpl->errorCode(); } -QList AddressBook::getAll(bool update) const +QList AddressBook::getAll(bool update) const { qDebug(__FUNCTION__); @@ -38,7 +38,7 @@ QList AddressBook::getAll(bool update) const } -Bitmonero::AddressBookRow * AddressBook::getRow(int index) const +Monero::AddressBookRow * AddressBook::getRow(int index) const { return m_rows.at(index); } diff --git a/src/libwalletqt/AddressBook.h b/src/libwalletqt/AddressBook.h index 2262e00f..7a1f2da8 100644 --- a/src/libwalletqt/AddressBook.h +++ b/src/libwalletqt/AddressBook.h @@ -6,7 +6,7 @@ #include #include -namespace Bitmonero { +namespace Monero { class AddressBook; } class AddressBookRow; @@ -15,8 +15,8 @@ class AddressBook : public QObject { Q_OBJECT public: - Q_INVOKABLE QList getAll(bool update = false) const; - Q_INVOKABLE Bitmonero::AddressBookRow * getRow(int index) const; + Q_INVOKABLE QList getAll(bool update = false) const; + Q_INVOKABLE Monero::AddressBookRow * getRow(int index) const; Q_INVOKABLE bool addRow(const QString &address, const QString &payment_id, const QString &description) const; Q_INVOKABLE bool deleteRow(int rowId) const; quint64 count() const; @@ -41,10 +41,10 @@ signals: public slots: private: - explicit AddressBook(Bitmonero::AddressBook * abImpl, QObject *parent); + explicit AddressBook(Monero::AddressBook * abImpl, QObject *parent); friend class Wallet; - Bitmonero::AddressBook * m_addressBookImpl; - mutable QList m_rows; + Monero::AddressBook * m_addressBookImpl; + mutable QList m_rows; }; #endif // ADDRESSBOOK_H diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp index 5e78200b..e8e673fa 100644 --- a/src/model/AddressBookModel.cpp +++ b/src/model/AddressBookModel.cpp @@ -36,7 +36,7 @@ QVariant AddressBookModel::data(const QModelIndex &index, int role) const return QVariant(); } - Bitmonero::AddressBookRow * ar = m_addressBook->getRow(index.row()); + Monero::AddressBookRow * ar = m_addressBook->getRow(index.row()); QVariant result = ""; switch (role) { diff --git a/src/model/AddressBookModel.h b/src/model/AddressBookModel.h index d6fd01e8..b239bd65 100644 --- a/src/model/AddressBookModel.h +++ b/src/model/AddressBookModel.h @@ -2,7 +2,6 @@ #define ADDRESSBOOKMODEL_H #include -//#include "wallet/wallet2_api.h" // we need to have an access to the Bitmonero::Wallet::AddressBook class AddressBook;