Remove more unused code from the QQmlEnginePrivate

overloadError has always been false and the if (overloadError)
was dead code. The code has been commented out for a long time
and I started to extend the #ifdef. The QQmlError is only used
inside the commented out code so I have removed the error param.

This is fixing Coverity CID 10612.

Change-Id: I48f36ede6ba615a34b15caefb0eea5d7e898f120
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index f1fbad3cf8..ce6b814d90 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -208,7 +208,7 @@ public:
     inline static void deleteInEngineThread(QQmlEngine *, T *);
 
     // These methods may be called from the loader thread
-    inline QQmlPropertyCache *cache(QQmlType *, int, QQmlError &error);
+    inline QQmlPropertyCache *cache(QQmlType *, int);
     using QJSEnginePrivate::cache;
 
     // These methods may be called from the loader thread
@@ -262,7 +262,7 @@ public:
 
 private:
     // Must be called locked
-    QQmlPropertyCache *createCache(QQmlType *, int, QQmlError &error);
+    QQmlPropertyCache *createCache(QQmlType *, int);
 
     // These members must be protected by a QQmlEnginePrivate::Locker as they are required by
     // the threaded loader.  Only access them through their respective accessor methods.
@@ -346,7 +346,7 @@ Returns a QQmlPropertyCache for \a type with \a minorVersion.
 
 The returned cache is not referenced, so if it is to be stored, call addref().
 */
-QQmlPropertyCache *QQmlEnginePrivate::cache(QQmlType *type, int minorVersion, QQmlError &error)
+QQmlPropertyCache *QQmlEnginePrivate::cache(QQmlType *type, int minorVersion)
 {
     Q_ASSERT(type);
 
@@ -355,7 +355,7 @@ QQmlPropertyCache *QQmlEnginePrivate::cache(QQmlType *type, int minorVersion, QQ
 
     Locker locker(this);
     QQmlPropertyCache *rv = typePropertyCache.value(qMakePair(type, minorVersion));
-    if (!rv) rv = createCache(type, minorVersion, error);
+    if (!rv) rv = createCache(type, minorVersion);
     return rv;
 }