Qml, Imports: mark some methods as const

These methods do not modify objects.

Change-Id: I67b1a10cfd0b32688500fca3265a96f53afd1b57
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

12 files changed, 20 insertions, 20 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 90698c3b24..e12472760f 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -449,7 +449,7 @@ QVariant QQmlBinding::evaluate()
     return scope.engine->toVariant(scope.result, qMetaTypeId<QList<QObject*> >());
 }
 
-QString QQmlBinding::expressionIdentifier()
+QString QQmlBinding::expressionIdentifier() const
 {
     QQmlEnginePrivate *ep = QQmlEnginePrivate::get(context()->engine);
     QV4::Scope scope(ep->v4engine());
diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h
index 6d42a8ea8a..be23a96d01 100644
--- a/src/qml/qml/qqmlbinding_p.h
+++ b/src/qml/qml/qqmlbinding_p.h
@@ -98,8 +98,8 @@ public:
 
     QVariant evaluate();
 
-    QString expressionIdentifier() Q_DECL_OVERRIDE;
-    void expressionChanged() Q_DECL_OVERRIDE;
+    QString expressionIdentifier() const override;
+    void expressionChanged() override;
 
 protected:
     virtual void doUpdate(const DeleteWatcher &watcher,
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 4e63790290..dfb1b98ca0 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -146,7 +146,7 @@ QQmlBoundSignalExpression::~QQmlBoundSignalExpression()
 {
 }
 
-QString QQmlBoundSignalExpression::expressionIdentifier()
+QString QQmlBoundSignalExpression::expressionIdentifier() const
 {
     QQmlSourceLocation loc = sourceLocation();
     return loc.sourceFile + QLatin1Char(':') + QString::number(loc.line);
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index e940ca7401..4356c6cbfa 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -79,7 +79,7 @@ public:
                               QQmlContextData *ctxt, QObject *scope, QV4::Function *runtimeFunction);
 
     // inherited from QQmlJavaScriptExpression.
-    QString expressionIdentifier() override;
+    QString expressionIdentifier() const override;
     void expressionChanged() override;
 
     // evaluation of a bound signal expression doesn't return any value
diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index 62cd3d4877..162fbcc8f6 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -235,7 +235,7 @@ public:
     inline QQmlGuardedContextData(QQmlContextData *);
     inline ~QQmlGuardedContextData();
 
-    inline QQmlContextData *contextData();
+    inline QQmlContextData *contextData() const;
     inline void setContextData(QQmlContextData *);
 
     inline bool isNull() const { return !m_contextData; }
@@ -285,7 +285,7 @@ void QQmlGuardedContextData::setContextData(QQmlContextData *contextData)
     }
 }
 
-QQmlContextData *QQmlGuardedContextData::contextData()
+QQmlContextData *QQmlGuardedContextData::contextData() const
 {
     return m_contextData;
 }
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 6afbd05e3e..01d4722ca6 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -434,7 +434,7 @@ void QQmlExpressionPrivate::expressionChanged()
     emit q->valueChanged();
 }
 
-QString QQmlExpressionPrivate::expressionIdentifier()
+QString QQmlExpressionPrivate::expressionIdentifier() const
 {
     return QLatin1Char('"') + expression + QLatin1Char('"');
 }
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h
index 81a749e017..44342a957b 100644
--- a/src/qml/qml/qqmlexpression_p.h
+++ b/src/qml/qml/qqmlexpression_p.h
@@ -85,7 +85,7 @@ public:
     bool expressionFunctionValid:1;
 
     // Inherited from QQmlJavaScriptExpression
-    QString expressionIdentifier() override;
+    QString expressionIdentifier() const override;
     void expressionChanged() override;
 
     QString expression;
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index 5f9cffb56d..a0735d91de 100644
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -100,7 +100,7 @@ public:
     QQmlJavaScriptExpression();
     virtual ~QQmlJavaScriptExpression();
 
-    virtual QString expressionIdentifier() = 0;
+    virtual QString expressionIdentifier() const = 0;
     virtual void expressionChanged() = 0;
 
     void evaluate(QV4::CallData *callData, bool *isUndefined, QV4::Scope &scope);
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h
index eff9684558..4db0dd038a 100644
--- a/src/qml/qml/qqmlnotifier_p.h
+++ b/src/qml/qml/qqmlnotifier_p.h
@@ -94,9 +94,9 @@ public:
     inline QQmlNotifierEndpoint(Callback callback);
     inline ~QQmlNotifierEndpoint();
 
-    inline bool isConnected();
-    inline bool isConnected(QObject *source, int sourceSignal);
-    inline bool isConnected(QQmlNotifier *);
+    inline bool isConnected() const;
+    inline bool isConnected(QObject *source, int sourceSignal) const;
+    inline bool isConnected(QQmlNotifier *) const;
 
     void connect(QObject *source, int sourceSignal, QQmlEngine *engine);
     inline void connect(QQmlNotifier *);
@@ -162,7 +162,7 @@ QQmlNotifierEndpoint::~QQmlNotifierEndpoint()
     disconnect();
 }
 
-bool QQmlNotifierEndpoint::isConnected()
+bool QQmlNotifierEndpoint::isConnected() const
 {
     return prev != 0;
 }
@@ -171,13 +171,13 @@ bool QQmlNotifierEndpoint::isConnected()
     \a sourceSignal MUST be in the signal index range (see QObjectPrivate::signalIndex()).
     This is different from QMetaMethod::methodIndex().
 */
-bool QQmlNotifierEndpoint::isConnected(QObject *source, int sourceSignal)
+bool QQmlNotifierEndpoint::isConnected(QObject *source, int sourceSignal) const
 {
     return this->sourceSignal != -1 && senderAsObject() == source &&
            this->sourceSignal == sourceSignal;
 }
 
-bool QQmlNotifierEndpoint::isConnected(QQmlNotifier *notifier)
+bool QQmlNotifierEndpoint::isConnected(QQmlNotifier *notifier) const
 {
     return sourceSignal == -1 && senderAsNotifier() == notifier;
 }
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index c27ea796e0..f90945bf57 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -470,7 +470,7 @@ private:
     void updateRecur(const QMetaObject *);
 
     template<typename K>
-    QQmlPropertyData *findNamedProperty(const K &key)
+    QQmlPropertyData *findNamedProperty(const K &key) const
     {
         StringCache::mapped_type *it = stringCache.value(key);
         return it ? it->second : 0;
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 6b308374e6..2625f5af11 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -275,9 +275,9 @@ void QQmlValueTypeWrapper::advanceIterator(Managed *m, ObjectIterator *it, Value
     QV4::Object::advanceIterator(m, it, name, index, p, attributes);
 }
 
-bool QQmlValueTypeWrapper::isEqual(const QVariant& value)
+bool QQmlValueTypeWrapper::isEqual(const QVariant& value) const
 {
-    if (QQmlValueTypeReference *ref = as<QQmlValueTypeReference>())
+    if (const QQmlValueTypeReference *ref = as<const QQmlValueTypeReference>())
         if (!ref->readReferenceValue())
             return false;
     return (value == d()->toVariant());
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index 94eeba366a..5ef480061d 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -91,7 +91,7 @@ public:
 
     QVariant toVariant() const;
     bool toGadget(void *data) const;
-    bool isEqual(const QVariant& value);
+    bool isEqual(const QVariant& value) const;
     int typeId() const;
     bool write(QObject *target, int propertyIndex) const;