Update obsolete contact address.

[profile/ivi/qtdeclarative.git] / src / declarative / qml / qdeclarativeintegercache_p.h

diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h
index 79506cc..fbedb2f 100644 (file)
--- a/src/declarative/qml/qdeclarativeintegercache_p.h
+++ b/src/declarative/qml/qdeclarativeintegercache_p.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -53,52 +53,37 @@
 // We mean it.
 //
 
-#include "private/qdeclarativerefcount_p.h"
-#include "private/qdeclarativecleanup_p.h"
-
-#include <QtCore/qhash.h>
-
-#include <private/qscriptdeclarativeclass_p.h>
+#include <private/qdeclarativerefcount_p.h>
+#include <private/qhashedstring_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeType;
 class QDeclarativeEngine;
-class QDeclarativeIntegerCache : public QDeclarativeRefCount, public QDeclarativeCleanup
+class QDeclarativeIntegerCache : public QDeclarativeRefCount
 {
 public:
-    QDeclarativeIntegerCache(QDeclarativeEngine *);
+    QDeclarativeIntegerCache();
     virtual ~QDeclarativeIntegerCache();
 
     inline int count() const;
     void add(const QString &, int);
+    void reserve(int);
+
     int value(const QString &);
-    QString findId(int value) const;
-    inline int value(const QScriptDeclarativeClass::Identifier &id) const;
+    inline int value(const QHashedV8String &);
 
-protected:
-    virtual void clear();
+    QString findId(int value) const;
 
 private:
-    struct Data : public QScriptDeclarativeClass::PersistentIdentifier {
-        Data(const QScriptDeclarativeClass::PersistentIdentifier &i, int v) 
-        : QScriptDeclarativeClass::PersistentIdentifier(i), value(v) {}
-
-        int value;
-    };
-
-    typedef QHash<QString, Data *> StringCache;
-    typedef QHash<QScriptDeclarativeClass::Identifier, Data *> IdentifierCache;
-
+    typedef QStringHash<int> StringCache;
     StringCache stringCache;
-    IdentifierCache identifierCache;
-    QDeclarativeEngine *engine;
 };
 
-int QDeclarativeIntegerCache::value(const QScriptDeclarativeClass::Identifier &id) const
+int QDeclarativeIntegerCache::value(const QHashedV8String &name)
 {
-    Data *d = identifierCache.value(id);
-    return d?d->value:-1;
+    int *result = stringCache.value(name);
+    return result?*result:-1;
 }
 
 int QDeclarativeIntegerCache::count() const