From 3a33ddeecdea52bbf35549ffb0d4904eba1ebff6 Mon Sep 17 00:00:00 2001 From: xiphon Date: Wed, 28 Aug 2019 16:21:53 +0000 Subject: fix invalid include paths, compilation warnings, update README.md --- src/qt/FutureScheduler.cpp | 2 +- src/qt/FutureScheduler.h | 6 +++--- src/qt/KeysFiles.cpp | 6 +++--- src/qt/KeysFiles.h | 4 ++-- src/qt/MoneroSettings.cpp | 2 +- src/qt/utils.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/qt') diff --git a/src/qt/FutureScheduler.cpp b/src/qt/FutureScheduler.cpp index bdd47829..17551c15 100644 --- a/src/qt/FutureScheduler.cpp +++ b/src/qt/FutureScheduler.cpp @@ -38,7 +38,7 @@ QPair> FutureScheduler::run(std::function function) }); } -QPair> FutureScheduler::run(std::function function, const QJSValue &callback) noexcept +QPair> FutureScheduler::run(std::function function, const QJSValue &callback) { if (!callback.isCallable()) { diff --git a/src/qt/FutureScheduler.h b/src/qt/FutureScheduler.h index 28c2dfdf..e76021c3 100644 --- a/src/qt/FutureScheduler.h +++ b/src/qt/FutureScheduler.h @@ -20,9 +20,9 @@ public: ~FutureScheduler(); void shutdownWaitForFinished() noexcept; - + QPair> run(std::function function) noexcept; - QPair> run(std::function function, const QJSValue &callback) noexcept; + QPair> run(std::function function, const QJSValue &callback); private: bool add() noexcept; @@ -38,7 +38,7 @@ private: watcher->moveToThread(schedulerThread); } watcher->setParent(this); - + return watcher; } diff --git a/src/qt/KeysFiles.cpp b/src/qt/KeysFiles.cpp index 55820c77..85697c6d 100644 --- a/src/qt/KeysFiles.cpp +++ b/src/qt/KeysFiles.cpp @@ -36,9 +36,9 @@ #include #include #include -#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" diff --git a/src/qt/KeysFiles.h b/src/qt/KeysFiles.h index 78348b2d..afdc0216 100644 --- a/src/qt/KeysFiles.h +++ b/src/qt/KeysFiles.h @@ -30,8 +30,8 @@ #define KEYSFILES_H #include -#include "src/libwalletqt/WalletManager.h" -#include "src/NetworkType.h" +#include "libwalletqt/WalletManager.h" +#include "NetworkType.h" #include class WalletKeysFiles diff --git a/src/qt/MoneroSettings.cpp b/src/qt/MoneroSettings.cpp index 1de786a6..409f010c 100644 --- a/src/qt/MoneroSettings.cpp +++ b/src/qt/MoneroSettings.cpp @@ -40,7 +40,7 @@ #include #include -#include "src/qt/MoneroSettings.h" +#include "qt/MoneroSettings.h" /*! \qmlmodule moneroSettings 1.0 diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp index 4418a050..35b5a835 100644 --- a/src/qt/utils.cpp +++ b/src/qt/utils.cpp @@ -29,7 +29,7 @@ #include #include -#include "src/qt/TailsOS.h" +#include "TailsOS.h" #include "utils.h" bool fileExists(QString path) { -- cgit v1.2.3