Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 06:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Add Qt::DirectConnection to signalHandlerException

Browse source 
* CR feedback / coding standards
This commit is contained in:
humbletim 2017-02-22 20:36:49 -05:00
parent 417587dcda
commit 132a889f74
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@
static const QScriptEngine::QObjectWrapOptions DEFAULT_QOBJECT_WRAP_OPTIONS = static const QScriptEngine::QObjectWrapOptions DEFAULT_QOBJECT_WRAP_OPTIONS =
QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects; QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects;
static const QScriptValue::PropertyFlags READONLY_PROP_FLAGS { QScriptValue::ReadOnly | QScriptValue::Undeletable }; static const QScriptValue::PropertyFlags READONLY_PROP_FLAGS { QScriptValue::ReadOnly | QScriptValue::Undeletable };
static const QScriptValue::PropertyFlags HIDDEN_PROP_FLAGS { READONLY_PROP_FLAGS | QScriptValue::SkipInEnumeration }; static const QScriptValue::PropertyFlags READONLY_HIDDEN_PROP_FLAGS { READONLY_PROP_FLAGS | QScriptValue::SkipInEnumeration };
@ -165,7 +165,7 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const
// ... but may not always be available -- so if needed we fallback to the passed exception // ... but may not always be available -- so if needed we fallback to the passed exception
emit unhandledException(exception); emit unhandledException(exception);
} }
}); }, Qt::DirectConnection);
setProcessEventsInterval(MSECS_PER_SECOND); setProcessEventsInterval(MSECS_PER_SECOND);
if (isEntityServerScript()) { if (isEntityServerScript()) {
@ -1250,7 +1250,7 @@ void ScriptEngine::stopTimer(QTimer *timer) {
QUrl ScriptEngine::resolvePath(const QString& include) const { QUrl ScriptEngine::resolvePath(const QString& include) const {
QUrl url(include); QUrl url(include);
// first lets check to see if it's already a full URL // first lets check to see if it's already a full URL -- or a Windows path like "c:/"
if (include.startsWith("/") || url.scheme().length() == 1) { if (include.startsWith("/") || url.scheme().length() == 1) {
url = QUrl::fromLocalFile(include); url = QUrl::fromLocalFile(include);
} }
@ -1261,12 +1261,12 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
// we apparently weren't a fully qualified url, so, let's assume we're relative // we apparently weren't a fully qualified url, so, let's assume we're relative
// to the first absolute URL in the JS scope chain // to the first absolute URL in the JS scope chain
QUrl parentURL; QUrl parentURL;
auto ctx = currentContext(); auto context = currentContext();
do { do {
QScriptContextInfo contextInfo { ctx }; QScriptContextInfo contextInfo { context };
parentURL = QUrl(contextInfo.fileName()); parentURL = QUrl(contextInfo.fileName());
ctx = ctx->parentContext(); context = context->parentContext();
} while (parentURL.isRelative() && ctx); } while (parentURL.isRelative() && context);
if (parentURL.isRelative()) { if (parentURL.isRelative()) {
// fallback to the "include" parent (if defined, this will already be absolute) // fallback to the "include" parent (if defined, this will already be absolute)