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/qdeclarativeimport_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/qdeclarativeimport_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativeimport_p.h | 157 |
1 files changed, 0 insertions, 157 deletions
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h deleted file mode 100644 index 6dae0f38b9..0000000000 --- a/src/declarative/qml/qdeclarativeimport_p.h +++ /dev/null @@ -1,157 +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 QDECLARATIVEIMPORT_P_H -#define QDECLARATIVEIMPORT_P_H - -#include <QtCore/qurl.h> -#include <QtCore/qcoreapplication.h> -#include <QtCore/qset.h> -#include <QtCore/qstringlist.h> -#include <private/qdeclarativedirparser_p.h> -#include <private/qdeclarativescript_p.h> -#include <private/qdeclarativemetatype_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. -// - -QT_BEGIN_NAMESPACE - -class QDeclarativeTypeNameCache; -class QDeclarativeEngine; -class QDir; -class QDeclarativeImportedNamespace; -class QDeclarativeImportsPrivate; -class QDeclarativeImportDatabase; -class QDeclarativeTypeLoader; - -// Exported for QtQuick1 -class Q_DECLARATIVE_EXPORT QDeclarativeImports -{ -public: - QDeclarativeImports(QDeclarativeTypeLoader *); - QDeclarativeImports(const QDeclarativeImports &); - ~QDeclarativeImports(); - QDeclarativeImports &operator=(const QDeclarativeImports &); - - void setBaseUrl(const QUrl &url, const QString &urlString = QString()); - QUrl baseUrl() const; - - bool resolveType(const QString& type, - QDeclarativeType** type_return, QString* url_return, - int *version_major, int *version_minor, - QDeclarativeImportedNamespace** ns_return, - QList<QDeclarativeError> *errors = 0) const; - bool resolveType(QDeclarativeImportedNamespace*, - const QString& type, - QDeclarativeType** type_return, QString* url_return, - int *version_major, int *version_minor) const; - - bool addImport(QDeclarativeImportDatabase *, - const QString& uri, const QString& prefix, int vmaj, int vmin, - QDeclarativeScript::Import::Type importType, - const QDeclarativeDirComponents &qmldircomponentsnetwork, - QList<QDeclarativeError> *errors); - - void populateCache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *) const; - - struct ScriptReference - { - QString nameSpace; - QString qualifier; - QUrl location; - }; - - QList<ScriptReference> resolvedScripts() const; - -private: - friend class QDeclarativeImportDatabase; - QDeclarativeImportsPrivate *d; -}; - -class QDeclarativeImportDatabase -{ - Q_DECLARE_TR_FUNCTIONS(QDeclarativeImportDatabase) -public: - QDeclarativeImportDatabase(QDeclarativeEngine *); - ~QDeclarativeImportDatabase(); - - bool importPlugin(const QString &filePath, const QString &uri, QList<QDeclarativeError> *errors); - - QStringList importPathList() const; - void setImportPathList(const QStringList &paths); - void addImportPath(const QString& dir); - - QStringList pluginPathList() const; - void setPluginPathList(const QStringList &paths); - void addPluginPath(const QString& path); - -private: - friend class QDeclarativeImportsPrivate; - QString resolvePlugin(QDeclarativeTypeLoader *typeLoader, - const QString &qmldirPath, const QString &qmldirPluginPath, - const QString &baseName, const QStringList &suffixes, - const QString &prefix = QString()); - QString resolvePlugin(QDeclarativeTypeLoader *typeLoader, - const QString &qmldirPath, const QString &qmldirPluginPath, - const QString &baseName); - - - // XXX thread - QStringList filePluginPath; - QStringList fileImportPath; - - QSet<QString> initializedPlugins; - QDeclarativeEngine *engine; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVEIMPORT_P_H - |