From 867d34b6171d36928621fe784f6dc9799eb1fb83 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 6 Oct 2015 16:33:24 -0700 Subject: [PATCH] clean up warnings and coding standard issues --- .../entities/src/EntityActionInterface.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/entities/src/EntityActionInterface.cpp b/libraries/entities/src/EntityActionInterface.cpp index c34f072601..d874646b4b 100644 --- a/libraries/entities/src/EntityActionInterface.cpp +++ b/libraries/entities/src/EntityActionInterface.cpp @@ -237,16 +237,16 @@ float EntityActionInterface::extractFloatArgument(QString objectName, QVariantMa return 0.0f; } - QVariant vV = arguments[argumentName]; - bool vOk = true; - float v = vV.toFloat(&vOk); + QVariant variant = arguments[argumentName]; + bool variantOk = true; + float value = variant.toFloat(&variantOk); - if (!vOk || v != v) { + if (!variantOk || std::isnan(value)) { ok = false; return 0.0f; } - return v; + return value; } int EntityActionInterface::extractIntegerArgument(QString objectName, QVariantMap arguments, @@ -259,16 +259,16 @@ int EntityActionInterface::extractIntegerArgument(QString objectName, QVariantMa return 0.0f; } - QVariant vV = arguments[argumentName]; - bool vOk = true; - int v = vV.toInt(&vOk); + QVariant variant = arguments[argumentName]; + bool variantOk = true; + int value = variant.toInt(&variantOk); - if (!vOk || v != v) { + if (!variantOk) { ok = false; return 0; } - return v; + return value; } QString EntityActionInterface::extractStringArgument(QString objectName, QVariantMap arguments,