Remove "All rights reserved" line from license headers.

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

diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index be9f514..863e853 100644 (file)
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -1,34 +1,34 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** 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,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativemetatype_p.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarativeerror.h"
-#include "private/qdeclarativeparser_p.h"
-#include "private/qdeclarativebinding_p.h"
+#include "qdeclarativescript_p.h"
+#include "qdeclarativebinding_p.h"
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeCompiler;
 
@@ -78,11 +77,11 @@ public:
     QDeclarativeCustomParserProperty &operator=(const QDeclarativeCustomParserProperty &);
     ~QDeclarativeCustomParserProperty();
 
-    QByteArray name() const;
-    QDeclarativeParser::Location location() const;
+    QString name() const;
+    QDeclarativeScript::Location location() const;
 
     bool isList() const;
-    // Will be one of QDeclarativeParser::Variant, QDeclarativeCustomParserProperty or 
+    // Will be one of QDeclarativeScript::Variant, QDeclarativeCustomParserProperty or 
     // QDeclarativeCustomParserNode
     QList<QVariant> assignedValues() const;
 
@@ -101,8 +100,8 @@ public:
     QDeclarativeCustomParserNode &operator=(const QDeclarativeCustomParserNode &);
     ~QDeclarativeCustomParserNode();
 
-    QByteArray name() const;
-    QDeclarativeParser::Location location() const;
+    QString name() const;
+    QDeclarativeScript::Location location() const;
 
     QList<QDeclarativeCustomParserProperty> properties() const;
 
@@ -116,7 +115,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser
 public:
     enum Flag {
         NoFlag                    = 0x00000000,
-        AcceptsAttachedProperties = 0x00000001
+        AcceptsAttachedProperties = 0x00000001,
+        AcceptsSignalHandlers     = 0x00000002
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
@@ -139,14 +139,15 @@ protected:
 
     int evaluateEnum(const QByteArray&) const;
 
-    const QMetaObject *resolveType(const QByteArray&) const;
+    const QMetaObject *resolveType(const QString&) const;
 
-    QDeclarativeBinding::Identifier rewriteBinding(const QString&, const QByteArray&);
+    QDeclarativeBinding::Identifier rewriteBinding(const QDeclarativeScript::Variant&, const QString&);
+    QString rewriteSignalHandler(const QString&, const QString&);
 
 private:
     QList<QDeclarativeError> exceptions;
     QDeclarativeCompiler *compiler;
-    QDeclarativeParser::Object *object;
+    QDeclarativeScript::Object *object;
     Flags m_flags;
     friend class QDeclarativeCompiler;
 };