monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix invalid include paths, compilation warnings, update README.md

Browse source
This commit is contained in:
xiphon 2019-08-28 16:21:53 +00:00
parent 346e942e93
commit 3a33ddeecd
14 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -237,8 +237,6 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
git clone https://github.com/monero-project/monero-gui.git
```
**Note:** Due to some bug in the build process, "monero-gui" repo can't be a top level directory.
7. Build
```

6
src/libwalletqt/UnsignedTransaction.cpp
View file

@ -40,7 +40,7 @@ QString UnsignedTransaction::errorString() const
return QString::fromStdString(m_pimpl->errorString());
}
quint64 UnsignedTransaction::amount(int index) const
quint64 UnsignedTransaction::amount(size_t index) const
{
std::vector<uint64_t> arr = m_pimpl->amount();
if(index > arr.size() - 1)
@ -48,7 +48,7 @@ quint64 UnsignedTransaction::amount(int index) const
return arr[index];
}
quint64 UnsignedTransaction::fee(int index) const
quint64 UnsignedTransaction::fee(size_t index) const
{
std::vector<uint64_t> arr = m_pimpl->fee();
if(index > arr.size() - 1)
@ -56,7 +56,7 @@ quint64 UnsignedTransaction::fee(int index) const
return arr[index];
}
quint64 UnsignedTransaction::mixin(int index) const
quint64 UnsignedTransaction::mixin(size_t index) const
{
std::vector<uint64_t> arr = m_pimpl->mixin();
if(index > arr.size() - 1)

6
src/libwalletqt/UnsignedTransaction.h
View file

@ -56,9 +56,9 @@ public:
Status status() const;
QString errorString() const;
Q_INVOKABLE quint64 amount(int index) const;
Q_INVOKABLE quint64 fee(int index) const;
Q_INVOKABLE quint64 mixin(int index) const;
Q_INVOKABLE quint64 amount(size_t index) const;
Q_INVOKABLE quint64 fee(size_t index) const;
Q_INVOKABLE quint64 mixin(size_t index) const;
QStringList recipientAddress() const;
QStringList paymentId() const;
quint64 txCount() const;

8
src/libwalletqt/Wallet.cpp
View file

@ -963,16 +963,16 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
, m_historyModel(nullptr)
, m_addressBook(nullptr)
, m_addressBookModel(nullptr)
, m_subaddress(nullptr)
, m_subaddressModel(nullptr)
, m_subaddressAccount(nullptr)
, m_subaddressAccountModel(nullptr)
, m_daemonBlockChainHeight(0)
, m_daemonBlockChainHeightTtl(DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS)
, m_daemonBlockChainTargetHeight(0)
, m_daemonBlockChainTargetHeightTtl(DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS)
, m_connectionStatusTtl(WALLET_CONNECTION_STATUS_CACHE_TTL_SECONDS)
, m_currentSubaddressAccount(0)
, m_subaddress(nullptr)
, m_subaddressModel(nullptr)
, m_subaddressAccount(nullptr)
, m_subaddressAccountModel(nullptr)
, m_scheduler(this)
{
m_history = new TransactionHistory(m_walletImpl->history(), this);

4
src/libwalletqt/Wallet.h
View file

@ -395,6 +395,8 @@ private:
mutable TransactionHistoryModel * m_historyModel;
mutable TransactionHistorySortFilterModel * m_historySortFilterModel;
QString m_paymentId;
AddressBook * m_addressBook;
mutable AddressBookModel * m_addressBookModel;
mutable QTime m_daemonBlockChainHeightTime;
mutable quint64 m_daemonBlockChainHeight;
int m_daemonBlockChainHeightTtl;
@ -406,8 +408,6 @@ private:
mutable QTime m_connectionStatusTime;
mutable bool m_initialized;
uint32_t m_currentSubaddressAccount;
AddressBook * m_addressBook;
mutable AddressBookModel * m_addressBookModel;
Subaddress * m_subaddress;
mutable SubaddressModel * m_subaddressModel;
SubaddressAccount * m_subaddressAccount;

2
src/model/AddressBookModel.cpp
View file

@ -50,7 +50,7 @@ void AddressBookModel::endReset(){
endResetModel();
}
int AddressBookModel::rowCount(const QModelIndex &parent) const
int AddressBookModel::rowCount(const QModelIndex &) const
{
return m_addressBook->count();
}

2
src/model/SubaddressAccountModel.cpp
View file

@ -49,7 +49,7 @@ void SubaddressAccountModel::endReset(){
endResetModel();
}
int SubaddressAccountModel::rowCount(const QModelIndex &parent) const
int SubaddressAccountModel::rowCount(const QModelIndex &) const
{
return m_subaddressAccount->count();
}

2
src/model/SubaddressModel.cpp
View file

@ -50,7 +50,7 @@ void SubaddressModel::endReset(){
endResetModel();
}
int SubaddressModel::rowCount(const QModelIndex &parent) const
int SubaddressModel::rowCount(const QModelIndex &) const
{
return m_subaddress->count();
}

2
src/qt/FutureScheduler.cpp
View file

@ -38,7 +38,7 @@ QPair<bool, QFuture<void>> FutureScheduler::run(std::function<void()> function)
});
}
QPair<bool, QFuture<QJSValueList>> FutureScheduler::run(std::function<QJSValueList() noexcept> function, const QJSValue &callback) noexcept
QPair<bool, QFuture<QJSValueList>> FutureScheduler::run(std::function<QJSValueList() noexcept> function, const QJSValue &callback)
{
if (!callback.isCallable())
{

2
src/qt/FutureScheduler.h
View file

@ -22,7 +22,7 @@ public:
void shutdownWaitForFinished() noexcept;
QPair<bool, QFuture<void>> run(std::function<void()> function) noexcept;
QPair<bool, QFuture<QJSValueList>> run(std::function<QJSValueList() noexcept> function, const QJSValue &callback) noexcept;
QPair<bool, QFuture<QJSValueList>> run(std::function<QJSValueList() noexcept> function, const QJSValue &callback);
private:
bool add() noexcept;

6
src/qt/KeysFiles.cpp
View file

@ -36,9 +36,9 @@
#include <QMutex>
#include <QMutexLocker>
#include <QString>
#include "src/libwalletqt/WalletManager.h"
#include "src/NetworkType.h"
#include "src/qt/utils.h"
#include "libwalletqt/WalletManager.h"
#include "NetworkType.h"
#include "qt/utils.h"
#include "KeysFiles.h"

4
src/qt/KeysFiles.h
View file

@ -30,8 +30,8 @@
#define KEYSFILES_H
#include <qqmlcontext.h>
#include "src/libwalletqt/WalletManager.h"
#include "src/NetworkType.h"
#include "libwalletqt/WalletManager.h"
#include "NetworkType.h"
#include <QtCore>
class WalletKeysFiles

2
src/qt/MoneroSettings.cpp
View file

@ -40,7 +40,7 @@
#include <QHash>
#include <QMetaProperty>
#include "src/qt/MoneroSettings.h"
#include "qt/MoneroSettings.h"
/*!
\qmlmodule moneroSettings 1.0

2
src/qt/utils.cpp
View file

@ -29,7 +29,7 @@
#include <QtCore>
#include <QApplication>
#include "src/qt/TailsOS.h"
#include "TailsOS.h"
#include "utils.h"
bool fileExists(QString path) {