summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-03-19 10:11:53 +0100
committerKai Koehne <kai.koehne@digia.com>2014-03-19 11:14:37 +0100
commit231c46d10240de94ab73aeb04ee13626d8006898 (patch)
treeff138d6c984101b56871b67ad8aae26ae203d303
parent2074b5571c0f5ee0c362a4231a6e53c9d32823fa (diff)
downloadqt-creator-231c46d10240de94ab73aeb04ee13626d8006898.tar.gz
Fix 'prefered' typo in variable names
Change-Id: I15d65d4bb5a29b546b7a781051c3d641764d527e Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
-rw-r--r--src/libs/qmljs/qmljscheck.cpp30
-rw-r--r--src/plugins/projectexplorer/project.h2
2 files changed, 16 insertions, 16 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 4c68ea3a69..89aa87c829 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -885,34 +885,34 @@ bool Check::visit(UiPublicMember *ast)
if (name == QLatin1String("variant") || name == QLatin1String("var")) {
Evaluate evaluator(&_scopeChain);
const Value *init = evaluator(ast->statement);
- QString preferedType;
+ QString preferredType;
if (init->asNumberValue())
- preferedType = tr("'int' or 'real'");
+ preferredType = tr("'int' or 'real'");
else if (init->asStringValue())
- preferedType = QLatin1String("'string'");
+ preferredType = QLatin1String("'string'");
else if (init->asBooleanValue())
- preferedType = QLatin1String("'bool'");
+ preferredType = QLatin1String("'bool'");
else if (init->asColorValue())
- preferedType = QLatin1String("'color'");
+ preferredType = QLatin1String("'color'");
else if (init == _context->valueOwner()->qmlPointObject())
- preferedType = QLatin1String("'point'");
+ preferredType = QLatin1String("'point'");
else if (init == _context->valueOwner()->qmlRectObject())
- preferedType = QLatin1String("'rect'");
+ preferredType = QLatin1String("'rect'");
else if (init == _context->valueOwner()->qmlSizeObject())
- preferedType = QLatin1String("'size'");
+ preferredType = QLatin1String("'size'");
else if (init == _context->valueOwner()->qmlVector2DObject())
- preferedType = QLatin1String("'vector2d'");
+ preferredType = QLatin1String("'vector2d'");
else if (init == _context->valueOwner()->qmlVector3DObject())
- preferedType = QLatin1String("'vector3d'");
+ preferredType = QLatin1String("'vector3d'");
else if (init == _context->valueOwner()->qmlVector4DObject())
- preferedType = QLatin1String("'vector4d'");
+ preferredType = QLatin1String("'vector4d'");
else if (init == _context->valueOwner()->qmlQuaternionObject())
- preferedType = QLatin1String("'quaternion'");
+ preferredType = QLatin1String("'quaternion'");
else if (init == _context->valueOwner()->qmlMatrix4x4Object())
- preferedType = QLatin1String("'matrix4x4'");
+ preferredType = QLatin1String("'matrix4x4'");
- if (!preferedType.isEmpty())
- addMessage(HintPreferNonVarPropertyType, ast->typeToken, preferedType);
+ if (!preferredType.isEmpty())
+ addMessage(HintPreferNonVarPropertyType, ast->typeToken, preferredType);
}
}
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index ba88092572..cc041e183d 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -109,7 +109,7 @@ public:
// TODO: generalize to find source(s) of generated files?
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;