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 686880e..fbedb2f 100644 (file)
--- a/src/declarative/qml/qdeclarativeintegercache_p.h
+++ b/src/declarative/qml/qdeclarativeintegercache_p.h
@@ -1,35 +1,35 @@
 /****************************************************************************
 **
-** 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.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
 **
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -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