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

Merge pull request #6007 from ZappoMan/fixWarning

Browse source 
clean up warnings and coding standard issues
This commit is contained in:
Clément Brisset 2015-10-06 17:02:11 -07:00
commit 8a24d1eb9c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/entities/src/EntityActionInterface.cpp
View file

@ -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,