diff options
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/FutureScheduler.cpp | 2 | ||||
| -rw-r--r-- | src/qt/FutureScheduler.h | 6 | ||||
| -rw-r--r-- | src/qt/KeysFiles.cpp | 6 | ||||
| -rw-r--r-- | src/qt/KeysFiles.h | 4 | ||||
| -rw-r--r-- | src/qt/MoneroSettings.cpp | 2 | ||||
| -rw-r--r-- | src/qt/utils.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
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<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()) { 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<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; @@ -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 <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" 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 <qqmlcontext.h> -#include "src/libwalletqt/WalletManager.h" -#include "src/NetworkType.h" +#include "libwalletqt/WalletManager.h" +#include "NetworkType.h" #include <QtCore> 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 <QHash> #include <QMetaProperty> -#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 <QtCore> #include <QApplication> -#include "src/qt/TailsOS.h" +#include "TailsOS.h" #include "utils.h" bool fileExists(QString path) { |
