From d734655ab6a7aabe40f471a2417189237e62c585 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 6 Sep 2014 16:03:03 -0700 Subject: [PATCH] fix some recently introduced warnings --- libraries/script-engine/src/ScriptEngine.cpp | 4 ++-- libraries/script-engine/src/TypedArrays.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index a55a05bc5c..d85d201d88 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -88,7 +88,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam _isRunning(false), _isInitialized(false), _isAvatar(false), - _isUserLoaded(false), _avatarIdentityTimer(NULL), _avatarBillboardTimer(NULL), _timerFunctionMap(), @@ -103,6 +102,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam _vec3Library(), _uuidLibrary(), _animationCache(this), + _isUserLoaded(false), _arrayBufferClass(new ArrayBufferClass(this)) { } @@ -114,7 +114,6 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, _isRunning(false), _isInitialized(false), _isAvatar(false), - _isUserLoaded(false), _avatarIdentityTimer(NULL), _avatarBillboardTimer(NULL), _timerFunctionMap(), @@ -129,6 +128,7 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, _vec3Library(), _uuidLibrary(), _animationCache(this), + _isUserLoaded(false), _arrayBufferClass(new ArrayBufferClass(this)) { QString scriptURLString = scriptURL.toString(); diff --git a/libraries/script-engine/src/TypedArrays.cpp b/libraries/script-engine/src/TypedArrays.cpp index c9663556d9..c1c4117f76 100644 --- a/libraries/script-engine/src/TypedArrays.cpp +++ b/libraries/script-engine/src/TypedArrays.cpp @@ -158,7 +158,7 @@ QScriptClass::QueryFlags TypedArray::queryProperty(const QScriptValue& object, quint32 pos = name.toArrayIndex(&ok); // Check that name is a valid index and arrayBuffer exists - if (ok && pos >= 0 && pos < length) { + if (ok && pos < length) { *id = byteOffset + pos * _bytesPerElement; // save pos to avoid recomputation return HandlesReadAccess | HandlesWriteAccess; // Read/Write access }