feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix 'prefered' typo in variable names

Browse Source 
Change-Id: I15d65d4bb5a29b546b7a781051c3d641764d527e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Kai Koehne
2014-03-19 10:11:53 +01:00
parent 2074b5571c
commit 231c46d102
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libs/qmljs/qmljscheck.cpp
View File

@@ -885,34 +885,34 @@ bool Check::visit(UiPublicMember *ast)
if (name == QLatin1String("variant") || name == QLatin1String("var")) { if (name == QLatin1String("variant") || name == QLatin1String("var")) {
Evaluate evaluator(&_scopeChain); Evaluate evaluator(&_scopeChain);
const Value *init = evaluator(ast->statement); const Value *init = evaluator(ast->statement);
QString preferedType; QString preferredType;
if (init->asNumberValue()) if (init->asNumberValue())
preferedType = tr("'int' or 'real'"); preferredType = tr("'int' or 'real'");
else if (init->asStringValue()) else if (init->asStringValue())
preferedType = QLatin1String("'string'"); preferredType = QLatin1String("'string'");
else if (init->asBooleanValue()) else if (init->asBooleanValue())
preferedType = QLatin1String("'bool'"); preferredType = QLatin1String("'bool'");
else if (init->asColorValue()) else if (init->asColorValue())
preferedType = QLatin1String("'color'"); preferredType = QLatin1String("'color'");
else if (init == _context->valueOwner()->qmlPointObject()) else if (init == _context->valueOwner()->qmlPointObject())
preferedType = QLatin1String("'point'"); preferredType = QLatin1String("'point'");
else if (init == _context->valueOwner()->qmlRectObject()) else if (init == _context->valueOwner()->qmlRectObject())
preferedType = QLatin1String("'rect'"); preferredType = QLatin1String("'rect'");
else if (init == _context->valueOwner()->qmlSizeObject()) else if (init == _context->valueOwner()->qmlSizeObject())
preferedType = QLatin1String("'size'"); preferredType = QLatin1String("'size'");
else if (init == _context->valueOwner()->qmlVector2DObject()) else if (init == _context->valueOwner()->qmlVector2DObject())
preferedType = QLatin1String("'vector2d'"); preferredType = QLatin1String("'vector2d'");
else if (init == _context->valueOwner()->qmlVector3DObject()) else if (init == _context->valueOwner()->qmlVector3DObject())
preferedType = QLatin1String("'vector3d'"); preferredType = QLatin1String("'vector3d'");
else if (init == _context->valueOwner()->qmlVector4DObject()) else if (init == _context->valueOwner()->qmlVector4DObject())
preferedType = QLatin1String("'vector4d'"); preferredType = QLatin1String("'vector4d'");
else if (init == _context->valueOwner()->qmlQuaternionObject()) else if (init == _context->valueOwner()->qmlQuaternionObject())
preferedType = QLatin1String("'quaternion'"); preferredType = QLatin1String("'quaternion'");
else if (init == _context->valueOwner()->qmlMatrix4x4Object()) else if (init == _context->valueOwner()->qmlMatrix4x4Object())
preferedType = QLatin1String("'matrix4x4'"); preferredType = QLatin1String("'matrix4x4'");
if (!preferedType.isEmpty()) if (!preferredType.isEmpty())
addMessage(HintPreferNonVarPropertyType, ast->typeToken, preferedType); addMessage(HintPreferNonVarPropertyType, ast->typeToken, preferredType);
} }
} }

2
src/plugins/projectexplorer/project.h
View File

@@ -109,7 +109,7 @@ public:
// TODO: generalize to find source(s) of generated files? // TODO: generalize to find source(s) of generated files?
virtual QString generatedUiHeader(const QString &formFile) const; virtual QString generatedUiHeader(const QString &formFile) const;
static QString makeUnique(const QString &preferedName, const QStringList &usedNames); static QString makeUnique(const QString &preferredName, const QStringList &usedNames);
virtual QVariantMap toMap() const; virtual QVariantMap toMap() const;