aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeexpression.h
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-02-16 14:43:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-24 04:51:31 +0100
commitb855240b782395f94315f43ea3e7e182299fac48 (patch)
treebc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/declarative/qml/qdeclarativeexpression.h
parent6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.h')
-rw-r--r--src/declarative/qml/qdeclarativeexpression.h121
1 files changed, 0 insertions, 121 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
deleted file mode 100644
index c9ab40854d..0000000000
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** GNU Lesser General Public License Usage
-** 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
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEEXPRESSION_H
-#define QDECLARATIVEEXPRESSION_H
-
-#include <QtDeclarative/qdeclarativeerror.h>
-#include <QtDeclarative/qdeclarativescriptstring.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-
-class QString;
-class QDeclarativeRefCount;
-class QDeclarativeEngine;
-class QDeclarativeContext;
-class QDeclarativeExpressionPrivate;
-class QDeclarativeContextData;
-class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject
-{
- Q_OBJECT
-public:
- QDeclarativeExpression();
- QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = 0);
- explicit QDeclarativeExpression(const QDeclarativeScriptString &, QObject * = 0);
- virtual ~QDeclarativeExpression();
-
- QDeclarativeEngine *engine() const;
- QDeclarativeContext *context() const;
-
- QString expression() const;
- void setExpression(const QString &);
-
- bool notifyOnValueChanged() const;
- void setNotifyOnValueChanged(bool);
-
- QString sourceFile() const;
- int lineNumber() const;
- int columnNumber() const;
- void setSourceLocation(const QString &fileName, int line, int column = 0);
-
- QObject *scopeObject() const;
-
- bool hasError() const;
- void clearError();
- QDeclarativeError error() const;
-
- QVariant evaluate(bool *valueIsUndefined = 0);
-
-Q_SIGNALS:
- void valueChanged();
-
-protected:
- QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QString &,
- QDeclarativeExpressionPrivate &dd);
- QDeclarativeExpression(QDeclarativeContextData *, QObject *, void *,
- QDeclarativeExpressionPrivate &dd);
- QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QString &, bool,
- const QString &, int, int, QDeclarativeExpressionPrivate &dd);
- QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QByteArray &, bool,
- const QString &, int, int, QDeclarativeExpressionPrivate &dd);
-
-private:
- QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QString &);
-
- Q_DISABLE_COPY(QDeclarativeExpression)
- Q_DECLARE_PRIVATE(QDeclarativeExpression)
- friend class QDeclarativeDebugger;
- friend class QDeclarativeContext;
- friend class QDeclarativeVME;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEEXPRESSION_H
-