Remove some unused code

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

2 files changed, 0 insertions, 136 deletions

diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index 9a935ed55f..8f17c2ac44 100644
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -346,25 +346,6 @@ void QQmlPropertyCache::appendProperty(const QString &name,
     setNamedProperty(name, index + propertyOffset(), propertyIndexCache.data() + index, (old != 0));
 }
 
-void QQmlPropertyCache::appendProperty(const QHashedCStringRef &name,
-                                       quint32 flags, int coreIndex, int propType, int notifyIndex)
-{
-    QQmlPropertyData data;
-    data.propType = propType;
-    data.coreIndex = coreIndex;
-    data.notifyIndex = notifyIndex;
-    data.flags = flags;
-
-    QQmlPropertyData *old = findNamedProperty(name);
-    if (old)
-        data.markAsOverrideOf(old);
-
-    int index = propertyIndexCache.count();
-    propertyIndexCache.append(data);
-
-    setNamedProperty(name, index + propertyOffset(), propertyIndexCache.data() + index, (old != 0));
-}
-
 void QQmlPropertyCache::appendSignal(const QString &name, quint32 flags, int coreIndex,
                                      const int *types, const QList<QByteArray> &names)
 {
@@ -402,43 +383,6 @@ void QQmlPropertyCache::appendSignal(const QString &name, quint32 flags, int cor
     setNamedProperty(handlerName, signalHandlerIndex + signalOffset(), signalHandlerIndexCache.data() + signalHandlerIndex, (old != 0));
 }
 
-void QQmlPropertyCache::appendSignal(const QHashedCStringRef &name, quint32 flags, int coreIndex,
-                                     const int *types, const QList<QByteArray> &names)
-{
-    QQmlPropertyData data;
-    data.propType = QVariant::Invalid;
-    data.coreIndex = coreIndex;
-    data.flags = flags;
-    data.arguments = 0;
-
-    QQmlPropertyData handler = data;
-    handler.flags |= QQmlPropertyData::IsSignalHandler;
-
-    if (types) {
-        int argumentCount = *types;
-        QQmlPropertyCacheMethodArguments *args = createArgumentsObject(argumentCount, names);
-        ::memcpy(args->arguments, types, (argumentCount + 1) * sizeof(int));
-        args->argumentsValid = true;
-        data.arguments = args;
-    }
-
-    QQmlPropertyData *old = findNamedProperty(name);
-    if (old)
-        data.markAsOverrideOf(old);
-
-    int methodIndex = methodIndexCache.count();
-    methodIndexCache.append(data);
-
-    int signalHandlerIndex = signalHandlerIndexCache.count();
-    signalHandlerIndexCache.append(handler);
-
-    QString handlerName = QLatin1String("on") + name.toUtf16();
-    handlerName[2] = handlerName[2].toUpper();
-
-    setNamedProperty(name, methodIndex + methodOffset(), methodIndexCache.data() + methodIndex, (old != 0));
-    setNamedProperty(handlerName, signalHandlerIndex + signalOffset(), signalHandlerIndexCache.data() + signalHandlerIndex, (old != 0));
-}
-
 void QQmlPropertyCache::appendMethod(const QString &name, quint32 flags, int coreIndex,
                                      const QList<QByteArray> &names)
 {
@@ -466,33 +410,6 @@ void QQmlPropertyCache::appendMethod(const QString &name, quint32 flags, int cor
     setNamedProperty(name, methodIndex + methodOffset(), methodIndexCache.data() + methodIndex, (old != 0));
 }
 
-void QQmlPropertyCache::appendMethod(const QHashedCStringRef &name, quint32 flags, int coreIndex,
-                                     const QList<QByteArray> &names)
-{
-    int argumentCount = names.count();
-
-    QQmlPropertyData data;
-    data.propType = QMetaType::QVariant;
-    data.coreIndex = coreIndex;
-
-    QQmlPropertyCacheMethodArguments *args = createArgumentsObject(argumentCount, names);
-    for (int ii = 0; ii < argumentCount; ++ii)
-        args->arguments[ii + 1] = QMetaType::QVariant;
-    args->argumentsValid = true;
-    data.arguments = args;
-
-    data.flags = flags;
-
-    QQmlPropertyData *old = findNamedProperty(name);
-    if (old)
-        data.markAsOverrideOf(old);
-
-    int methodIndex = methodIndexCache.count();
-    methodIndexCache.append(data);
-
-    setNamedProperty(name, methodIndex + methodOffset(), methodIndexCache.data() + methodIndex, (old != 0));
-}
-
 // Returns this property cache's metaObject.  May be null if it hasn't been created yet.
 const QMetaObject *QQmlPropertyCache::metaObject() const
 {
@@ -1101,52 +1018,6 @@ QQmlPropertyCacheMethodArguments *QQmlPropertyCache::createArgumentsObject(int a
     return args;
 }
 
-/*! \internal
-    \a index MUST be in the signal index range (see QObjectPrivate::signalIndex()).
-    This is different from QMetaMethod::methodIndex().
-*/
-QString QQmlPropertyCache::signalParameterStringForJS(int index, QString *errorString)
-{
-    QQmlPropertyCache *c = 0;
-    QQmlPropertyData *signalData = signal(index, &c);
-    if (!signalData)
-        return QString();
-
-    typedef QQmlPropertyCacheMethodArguments A;
-
-    if (signalData->arguments) {
-        A *arguments = static_cast<A *>(signalData->arguments);
-        if (arguments->signalParameterStringForJS) {
-            if (arguments->parameterError) {
-                if (errorString)
-                    *errorString = *arguments->signalParameterStringForJS;
-                return QString();
-            }
-            return *arguments->signalParameterStringForJS;
-        }
-    }
-
-    QList<QByteArray> parameterNameList = signalParameterNames(index);
-
-    if (!signalData->arguments) {
-        A *args = c->createArgumentsObject(parameterNameList.count(), parameterNameList);
-        signalData->arguments = args;
-    }
-
-    QString error;
-    QString parameters = signalParameterStringForJS(engine, parameterNameList, &error);
-
-    A *arguments = static_cast<A *>(signalData->arguments);
-    arguments->signalParameterStringForJS = new QString(!error.isEmpty() ? error : parameters);
-    if (!error.isEmpty()) {
-        arguments->parameterError = true;
-        if (errorString)
-            *errorString = *arguments->signalParameterStringForJS;
-        return QString();
-    }
-    return *arguments->signalParameterStringForJS;
-}
-
 QString QQmlPropertyCache::signalParameterStringForJS(QV4::ExecutionEngine *engine, const QList<QByteArray> &parameterNameList, QString *errorString)
 {
     bool unnamedParameter = false;
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 2ee399c496..fa4aaac5c5 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -267,16 +267,10 @@ public:
                                       int methodCount, int signalCount);
     void appendProperty(const QString &,
                         quint32 flags, int coreIndex, int propType, int notifyIndex);
-    void appendProperty(const QHashedCStringRef &,
-                        quint32 flags, int coreIndex, int propType, int notifyIndex);
     void appendSignal(const QString &, quint32, int coreIndex, const int *types = 0,
                       const QList<QByteArray> &names = QList<QByteArray>());
-    void appendSignal(const QHashedCStringRef &, quint32, int coreIndex, const int *types = 0,
-                      const QList<QByteArray> &names = QList<QByteArray>());
     void appendMethod(const QString &, quint32 flags, int coreIndex,
                       const QList<QByteArray> &names = QList<QByteArray>());
-    void appendMethod(const QHashedCStringRef &, quint32 flags, int coreIndex,
-                      const QList<QByteArray> &names = QList<QByteArray>());
 
     const QMetaObject *metaObject() const;
     const QMetaObject *createMetaObject();
@@ -313,7 +307,6 @@ public:
     static int originalClone(QObject *, int index);
 
     QList<QByteArray> signalParameterNames(int index) const;
-    QString signalParameterStringForJS(int index, QString *errorString = 0);
     static QString signalParameterStringForJS(QV4::ExecutionEngine *engine, const QList<QByteArray> &parameterNameList, QString *errorString = 0);
 
     const char *className() const;