From 946f3782f36c44b751c89a566eda56e637f13546 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 27 Oct 2016 09:59:17 -0700 Subject: [PATCH] Fix indentation in BatchLoader --- libraries/script-engine/src/BatchLoader.cpp | 24 ++++++++++----------- libraries/script-engine/src/BatchLoader.h | 10 ++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp index ef8cf90656..65c1bc5a2a 100644 --- a/libraries/script-engine/src/BatchLoader.cpp +++ b/libraries/script-engine/src/BatchLoader.cpp @@ -50,18 +50,18 @@ void BatchLoader::start() { qCDebug(scriptengine) << "Loading script at " << url; - auto scriptCache = DependencyManager::get(); + auto scriptCache = DependencyManager::get(); - // Use a proxy callback to handle the call and emit the signal in a thread-safe way. - // If BatchLoader is deleted before the callback is called, the subsequent "emit" call will not do - // anything. - ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy(scriptCache.data()); - scriptCache->getScriptContents(url.toString(), [proxy](const QString& url, const QString& contents, bool isURL, bool success) { - proxy->receivedContent(url, contents, isURL, success); - proxy->deleteLater(); - }, false); + // Use a proxy callback to handle the call and emit the signal in a thread-safe way. + // If BatchLoader is deleted before the callback is called, the subsequent "emit" call will not do + // anything. + ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy(scriptCache.data()); + scriptCache->getScriptContents(url.toString(), [proxy](const QString& url, const QString& contents, bool isURL, bool success) { + proxy->receivedContent(url, contents, isURL, success); + proxy->deleteLater(); + }, false); - connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this](const QString& url, const QString& contents, bool isURL, bool success) { + connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this](const QString& url, const QString& contents, bool isURL, bool success) { if (isURL && success) { _data.insert(url, contents); qCDebug(scriptengine) << "Loaded: " << url; @@ -74,10 +74,10 @@ void BatchLoader::start() { _finished = true; emit finished(_data); } - }); + }); } } void ScriptCacheSignalProxy::receivedContent(const QString& url, const QString& contents, bool isURL, bool success) { - emit contentAvailable(url, contents, isURL, success); + emit contentAvailable(url, contents, isURL, success); } diff --git a/libraries/script-engine/src/BatchLoader.h b/libraries/script-engine/src/BatchLoader.h index 55acc11c26..a03a8d80c6 100644 --- a/libraries/script-engine/src/BatchLoader.h +++ b/libraries/script-engine/src/BatchLoader.h @@ -22,19 +22,19 @@ #include class ScriptCacheSignalProxy : public QObject { - Q_OBJECT + Q_OBJECT public: - ScriptCacheSignalProxy(QObject* parent) : QObject(parent) { } - void receivedContent(const QString& url, const QString& contents, bool isURL, bool success); + ScriptCacheSignalProxy(QObject* parent) : QObject(parent) { } + void receivedContent(const QString& url, const QString& contents, bool isURL, bool success); signals: - void contentAvailable(const QString& url, const QString& contents, bool isURL, bool success); + void contentAvailable(const QString& url, const QString& contents, bool isURL, bool success); }; class BatchLoader : public QObject { Q_OBJECT public: - BatchLoader(const QList& urls) ; + BatchLoader(const QList& urls); void start(); bool isFinished() const { return _finished; };