Internal naming cleanup

Rename QV4::CompiledData::Binding::containsTranslations() to
isTranslationBinding() in an attempt to improve the readability of the
code.

Change-Id: I73898298c4295d0def812c0526d908254d73c243
Reviewed-by: Michael Brasser <michael.brasser@live.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index d81ded5044..c1be00ea27 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -461,8 +461,8 @@ struct Q_QML_PRIVATE_EXPORT Binding
 
     static QString escapedString(const QString &string);
 
-    bool containsTranslations() const { return type == Type_Translation || type == Type_TranslationById; }
-    bool evaluatesToString() const { return type == Type_String || containsTranslations(); }
+    bool isTranslationBinding() const { return type == Type_Translation || type == Type_TranslationById; }
+    bool evaluatesToString() const { return type == Type_String || isTranslationBinding(); }
 
     QString valueAsString(const Unit *unit) const;
     QString valueAsScriptString(const Unit *unit) const;
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index f6f18ab35f..264d7d9179 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -876,7 +876,7 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *bindingProper
         && !_valueTypeProperty)
         QQmlPropertyPrivate::removeBinding(_bindingTarget, QQmlPropertyIndex(bindingProperty->coreIndex()));
 
-    if (binding->type == QV4::CompiledData::Binding::Type_Script || binding->containsTranslations()) {
+    if (binding->type == QV4::CompiledData::Binding::Type_Script || binding->isTranslationBinding()) {
         if (binding->flags & QV4::CompiledData::Binding::IsSignalHandlerExpression) {
             QV4::Function *runtimeFunction = compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex];
             int signalIndex = _propertyCache->methodIndexToSignalIndex(bindingProperty->coreIndex());
@@ -898,7 +898,7 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *bindingProper
                 targetProperty = _valueTypeProperty;
                 subprop = bindingProperty;
             }
-            if (binding->containsTranslations()) {
+            if (binding->isTranslationBinding()) {
                 qmlBinding = QQmlBinding::createTranslationBinding(compilationUnit, binding, _scopeObject, context);
             } else {
                 QV4::Function *runtimeFunction = compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex];
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 0a9540bf4b..41c52e742c 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -230,7 +230,7 @@ const ListLayout::Role *ListLayout::getRoleOrCreate(const QString &key, const QV
                 type = Role::Function;
                 break;
             } else if (data.userType() == qMetaTypeId<const QV4::CompiledData::Binding*>()
-                       && data.value<const QV4::CompiledData::Binding*>()->containsTranslations()) {
+                       && data.value<const QV4::CompiledData::Binding*>()->isTranslationBinding()) {
                 type = Role::String;
                 break;
             } else {
@@ -2731,7 +2731,7 @@ bool QQmlListModelParser::applyProperty(QV4::CompiledData::CompilationUnit *comp
     } else {
         QVariant value;
 
-        if (binding->containsTranslations()) {
+        if (binding->isTranslationBinding()) {
             value = QVariant::fromValue<const QV4::CompiledData::Binding*>(binding);
         } else if (binding->evaluatesToString()) {
             value = binding->valueAsString(qmlUnit);
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index a3a598621f..9c01a3f80e 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -298,7 +298,7 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix,
         }
     }
 
-    if (binding->type == QV4::CompiledData::Binding::Type_Script || binding->containsTranslations()) {
+    if (binding->type == QV4::CompiledData::Binding::Type_Script || binding->isTranslationBinding()) {
         QUrl url = QUrl();
         int line = -1;
         int column = -1;
@@ -313,7 +313,7 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix,
         QString expression;
         QQmlBinding::Identifier id = QQmlBinding::Invalid;
 
-        if (!binding->containsTranslations()) {
+        if (!binding->isTranslationBinding()) {
             expression = binding->valueAsString(qmlUnit);
             id = binding->value.compiledScriptIndex;
         }
@@ -468,7 +468,7 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions()
             QQmlContextData *context = QQmlContextData::get(qmlContext(this));
 
             QQmlBinding *newBinding = nullptr;
-            if (e.binding && e.binding->containsTranslations()) {
+            if (e.binding && e.binding->isTranslationBinding()) {
                 newBinding = QQmlBinding::createTranslationBinding(d->compilationUnit, e.binding, object(), context);
             } else if (e.id != QQmlBinding::Invalid) {
                 QV4::Scope scope(qmlEngine(this)->handle());