Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed extra debugging

Browse source
This commit is contained in:
ZappoMan 2015-02-24 17:15:58 -08:00
parent 25ae001d3b
commit eab09eaf28
2 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -3567,11 +3567,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUserLoaded,
bool loadScriptFromEditor, bool activateMainWindow) {
qDebug() << "Application::loadScript() ---- BEGIN ---- Script:" << scriptFilename;
if (isAboutToQuit()) {
qDebug() << "Requests to load scripts while quitting are ignored. Script:" << scriptFilename;
qDebug() << "Application::loadScript() ---- END ---- Script:" << scriptFilename;
return NULL;
}
@ -3580,8 +3576,6 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser
if (_scriptEnginesHash.contains(scriptURLString) && loadScriptFromEditor
&& !_scriptEnginesHash[scriptURLString]->isFinished()) {
qDebug() << "Application::loadScript() from _scriptEnginesHash[scriptURLString].... Script:" << scriptFilename;
qDebug() << "Application::loadScript() ---- END ---- Script:" << scriptFilename;
return _scriptEnginesHash[scriptURLString];
}
@ -3600,7 +3594,6 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser
connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &Application::handleScriptLoadError);
// get the script engine object to load the script at the designated script URL
qDebug() << "Application::loadScript() about to call loadURL() scriptUrl:" << scriptUrl;
scriptEngine->loadURL(scriptUrl);
}
@ -3609,9 +3602,6 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser
_window->activateWindow();
}
qDebug() << "Application::loadScript() newly created scriptEngine.... Script:" << scriptFilename;
qDebug() << "Application::loadScript() ---- END ---- Script:" << scriptFilename;
return scriptEngine;
}
@ -3771,8 +3761,8 @@ void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject
voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString());
}
qDebug() << "Voxel costs are" << satoshisPerVoxel << "per voxel and" << satoshisPerMeterCubed << "per meter cubed";
qDebug() << "Destination wallet UUID for voxel payments is" << voxelWalletUUID;
qDebug() << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
qDebug() << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
}
QString Application::getPreviousScriptLocation() {

27
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -117,8 +117,6 @@ bool ScriptEngine::_stoppingAllScripts = false;
bool ScriptEngine::_doneRunningThisScript = false;
void ScriptEngine::stopAllScripts(QObject* application) {
qDebug() << "ScriptEngine::stopAllScripts() ------- BEGIN -------";
_allScriptsMutex.lock();
_stoppingAllScripts = true;
@ -148,14 +146,10 @@ void ScriptEngine::stopAllScripts(QObject* application) {
scriptEngine->waitTillDoneRunning();
i.remove();
} else {
qDebug() << "ScriptEngine::stopAllScripts() " << scriptName << " - will be freed on it's own.";
}
}
_stoppingAllScripts = false;
_allScriptsMutex.unlock();
qDebug() << "ScriptEngine::stopAllScripts() _allKnownScriptEngines.count:" << _allKnownScriptEngines.count();
qDebug() << "ScriptEngine::stopAllScripts() ------- DONE -------";
}
@ -693,8 +687,7 @@ QObject* ScriptEngine::setupTimerWithInterval(const QScriptValue& function, int
QObject* ScriptEngine::setInterval(const QScriptValue& function, int intervalMS) {
if (_stoppingAllScripts) {
qDebug() << "Script.setInterval() while shutting down is ignored...";
qDebug() << " parent script:" << getFilename() << "[" << this << "]";
qDebug() << "Script.setInterval() while shutting down is ignored... parent script:" << getFilename();
return NULL; // bail early
}
@ -703,8 +696,7 @@ QObject* ScriptEngine::setInterval(const QScriptValue& function, int intervalMS)
QObject* ScriptEngine::setTimeout(const QScriptValue& function, int timeoutMS) {
if (_stoppingAllScripts) {
qDebug() << "Script.setTimeout() while shutting down is ignored...";
qDebug() << " parent script:" << getFilename() << "[" << this << "]";
qDebug() << "Script.setTimeout() while shutting down is ignored... parent script:" << getFilename();
return NULL; // bail early
}
@ -754,9 +746,8 @@ void ScriptEngine::print(const QString& message) {
// all of the files have finished loading.
void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callback) {
if (_stoppingAllScripts) {
qDebug() << "Script.include() while shutting down is ignored...";
qDebug() << " includeFiles:" << includeFiles;
qDebug() << " parent script:" << getFilename() << "[" << this << "]";
qDebug() << "Script.include() while shutting down is ignored..."
<< "includeFiles:" << includeFiles << "parent script:" << getFilename();
return; // bail early
}
QList<QUrl> urls;
@ -799,9 +790,8 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
void ScriptEngine::include(const QString& includeFile, QScriptValue callback) {
if (_stoppingAllScripts) {
qDebug() << "Script.include() while shutting down is ignored...";
qDebug() << " includeFile:" << includeFile;
qDebug() << " parent script:" << getFilename() << "[" << this << "]";
qDebug() << "Script.include() while shutting down is ignored... "
<< "includeFile:" << includeFile << "parent script:" << getFilename();
return; // bail early
}
@ -815,9 +805,8 @@ void ScriptEngine::include(const QString& includeFile, QScriptValue callback) {
// the Application or other context will connect to in order to know to actually load the script
void ScriptEngine::load(const QString& loadFile) {
if (_stoppingAllScripts) {
qDebug() << "Script.load() while shutting down is ignored...";
qDebug() << " loadFile:" << loadFile;
qDebug() << " parent script:" << getFilename() << "[" << this << "]";
qDebug() << "Script.load() while shutting down is ignored... "
<< "loadFile:" << loadFile << "parent script:" << getFilename();
return; // bail early
}