History

code review

Seth Alves committed 9 years ago

Commit 8a49edb1 parent cf2979d16 files · +54 −51Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 16 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+17−17
@@ -137,14 +137,14 @@ void ScriptEngines::registerScriptInitializer(ScriptInitializer initializer) { · 136 unmodified lines
137137 _scriptInitializers.push_back(initializer);
138138 }
139139
140−void ScriptEngines::addScriptEngine(QSharedPointer<ScriptEngine> engine) {
140+void ScriptEngines::addScriptEngine(ScriptEnginePointer engine) {
141141 if (!_isStopped) {
142142 QMutexLocker locker(&_allScriptsMutex);
143143 _allKnownScriptEngines.insert(engine);
144144 }
145145 }
146146
147−void ScriptEngines::removeScriptEngine(QSharedPointer<ScriptEngine> engine) {
147+void ScriptEngines::removeScriptEngine(ScriptEnginePointer engine) {
148148 // If we're not already in the middle of stopping all scripts, then we should remove ourselves
149149 // from the list of running scripts. We don't do this if we're in the process of stopping all scripts
150150 // because that method removes scripts from its list as it iterates them
@@ -159,9 +159,9 @@ void ScriptEngines::shutdownScripting() { · 8 unmodified lines
159159 QMutexLocker locker(&_allScriptsMutex);
160160 qCDebug(scriptengine) << "Stopping all scripts.... currently known scripts:" << _allKnownScriptEngines.size();
161161
162− QMutableSetIterator<QSharedPointer<ScriptEngine>> i(_allKnownScriptEngines);
162+ QMutableSetIterator<ScriptEnginePointer> i(_allKnownScriptEngines);
163163 while (i.hasNext()) {
164− QSharedPointer<ScriptEngine> scriptEngine = i.next();
164+ ScriptEnginePointer scriptEngine = i.next();
165165 QString scriptName = scriptEngine->getFilename();
166166
167167 // NOTE: typically all script engines are running. But there's at least one known exception to this, the
@@ -364,9 +364,9 @@ void ScriptEngines::stopAllScripts(bool restart) { · 196 unmodified lines
364364 _isReloading = true;
365365 }
366366
367− for (QHash<QUrl, QSharedPointer<ScriptEngine>>::const_iterator it = _scriptEnginesHash.constBegin();
367+ for (QHash<QUrl, ScriptEnginePointer>::const_iterator it = _scriptEnginesHash.constBegin();
368368 it != _scriptEnginesHash.constEnd(); it++) {
369− QSharedPointer<ScriptEngine> scriptEngine = it.value();
369+ ScriptEnginePointer scriptEngine = it.value();
370370 // skip already stopped scripts
371371 if (scriptEngine->isFinished() || scriptEngine->isStopping()) {
372372 continue;
@@ -412,12 +412,12 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { · 39 unmodified lines
412412
413413 QReadLocker lock(&_scriptEnginesHashLock);
414414 if (_scriptEnginesHash.contains(scriptURL)) {
415− QSharedPointer<ScriptEngine> scriptEngine = _scriptEnginesHash[scriptURL];
415+ ScriptEnginePointer scriptEngine = _scriptEnginesHash[scriptURL];
416416 if (restart) {
417417 auto scriptCache = DependencyManager::get<ScriptCache>();
418418 scriptCache->deleteScript(scriptURL);
419419 connect(scriptEngine.data(), &ScriptEngine::finished,
420− this, [this](QString scriptName, QSharedPointer<ScriptEngine> engine) {
420+ this, [this](QString scriptName, ScriptEnginePointer engine) {
421421 reloadScript(scriptName);
422422 });
423423 }
@@ -445,11 +445,11 @@ void ScriptEngines::reloadAllScripts() { · 21 unmodified lines
445445 stopAllScripts(true);
446446 }
447447
448−QSharedPointer<ScriptEngine> ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor,
448+ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor,
449449 bool activateMainWindow, bool reload) {
450450 if (thread() != QThread::currentThread()) {
451− QSharedPointer<ScriptEngine> result { nullptr };
452− BLOCKING_INVOKE_METHOD(this, "loadScript", Q_RETURN_ARG(QSharedPointer<ScriptEngine>, result),
451+ ScriptEnginePointer result { nullptr };
452+ BLOCKING_INVOKE_METHOD(this, "loadScript", Q_RETURN_ARG(ScriptEnginePointer, result),
453453 Q_ARG(QUrl, scriptFilename),
454454 Q_ARG(bool, isUserLoaded),
455455 Q_ARG(bool, loadScriptFromEditor),
@@ -475,7 +475,7 @@ QSharedPointer<ScriptEngine> ScriptEngines::loadScript(const QUrl& scriptFilenam · 19 unmodified lines
475475 return scriptEngine;
476476 }
477477
478− scriptEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(_context, NO_SCRIPT, "about:" + scriptFilename.fileName()));
478+ scriptEngine = ScriptEnginePointer(new ScriptEngine(_context, NO_SCRIPT, "about:" + scriptFilename.fileName()));
479479 addScriptEngine(scriptEngine);
480480 scriptEngine->setUserLoaded(isUserLoaded);
481481
@@ -493,8 +493,8 @@ QSharedPointer<ScriptEngine> ScriptEngines::loadScript(const QUrl& scriptFilenam · 11 unmodified lines
493493 return scriptEngine;
494494 }
495495
496−QSharedPointer<ScriptEngine> ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
497− QSharedPointer<ScriptEngine> result;
496+ScriptEnginePointer ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
497+ ScriptEnginePointer result;
498498 {
499499 QReadLocker lock(&_scriptEnginesHashLock);
500500 const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
@@ -510,7 +510,7 @@ QSharedPointer<ScriptEngine> ScriptEngines::getScriptEngine(const QUrl& rawScrip · 9 unmodified lines
510510 void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
511511 UserActivityLogger::getInstance().loadedScript(rawScriptURL);
512512 QSharedPointer<BaseScriptEngine> baseScriptEngine = qobject_cast<ScriptEngine*>(sender())->sharedFromThis();
513− QSharedPointer<ScriptEngine> scriptEngine = qSharedPointerCast<ScriptEngine>(baseScriptEngine);
513+ ScriptEnginePointer scriptEngine = qSharedPointerCast<ScriptEngine>(baseScriptEngine);
514514
515515 launchScriptEngine(scriptEngine);
516516
@@ -526,7 +526,7 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) { · 9 unmodified lines
526526 emit scriptCountChanged();
527527 }
528528
529−void ScriptEngines::launchScriptEngine(QSharedPointer<ScriptEngine> scriptEngine) {
529+void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
530530 connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::onScriptFinished, Qt::DirectConnection);
531531 connect(scriptEngine.data(), &ScriptEngine::loadScript, [&](const QString& scriptName, bool userLoaded) {
532532 loadScript(scriptName, userLoaded);
@@ -552,7 +552,7 @@ void ScriptEngines::launchScriptEngine(QSharedPointer<ScriptEngine> scriptEngine · 19 unmodified lines
552552 }
553553 }
554554
555−void ScriptEngines::onScriptFinished(const QString& rawScriptURL, QSharedPointer<ScriptEngine> engine) {
555+void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEnginePointer engine) {
556556 bool removed = false;
557557 {
558558 QWriteLocker lock(&_scriptEnginesHashLock);