diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/declarative/qml/qdeclarativeworkerscript_p.h | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (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/qdeclarativeworkerscript_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativeworkerscript_p.h | 130 |
1 files changed, 0 insertions, 130 deletions
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h deleted file mode 100644 index 192251f8ac..0000000000 --- a/src/declarative/qml/qdeclarativeworkerscript_p.h +++ /dev/null @@ -1,130 +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 QDECLARATIVEWORKERSCRIPT_P_H -#define QDECLARATIVEWORKERSCRIPT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "qdeclarative.h" -#include "qdeclarativeparserstatus.h" - -#include <QtCore/qthread.h> -#include <QtDeclarative/qjsvalue.h> -#include <QtCore/qurl.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - - -class QDeclarativeWorkerScript; -class QDeclarativeWorkerScriptEnginePrivate; -class QDeclarativeWorkerScriptEngine : public QThread -{ -Q_OBJECT -public: - QDeclarativeWorkerScriptEngine(QDeclarativeEngine *parent = 0); - virtual ~QDeclarativeWorkerScriptEngine(); - - int registerWorkerScript(QDeclarativeWorkerScript *); - void removeWorkerScript(int); - void executeUrl(int, const QUrl &); - void sendMessage(int, const QByteArray &); - -protected: - virtual void run(); - -private: - QDeclarativeWorkerScriptEnginePrivate *d; -}; - -class QDeclarativeV8Function; -class QDeclarativeV8Handle; -class Q_AUTOTEST_EXPORT QDeclarativeWorkerScript : public QObject, public QDeclarativeParserStatus -{ - Q_OBJECT - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - - Q_INTERFACES(QDeclarativeParserStatus) -public: - QDeclarativeWorkerScript(QObject *parent = 0); - virtual ~QDeclarativeWorkerScript(); - - QUrl source() const; - void setSource(const QUrl &); - -public slots: - void sendMessage(QDeclarativeV8Function*); - -signals: - void sourceChanged(); - void message(const QDeclarativeV8Handle &messageObject); - -protected: - virtual void classBegin(); - virtual void componentComplete(); - virtual bool event(QEvent *); - -private: - QDeclarativeWorkerScriptEngine *engine(); - QDeclarativeWorkerScriptEngine *m_engine; - int m_scriptId; - QUrl m_source; - bool m_componentComplete; -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QDeclarativeWorkerScript) - -QT_END_HEADER - -#endif // QDECLARATIVEWORKERSCRIPT_P_H |