diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-17 19:33:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 16:53:10 +0100 |
| commit | a0d27513f4eff3f76fd85e6442aca443b7c05a53 (patch) | |
| tree | 2239ed849796744299fbe25ab3cc50c2867160e9 /src/declarative/qml/qdeclarativeimport_p.h | |
| parent | 9ba631edb469599d3973982f8d5d72a9ba059eab (diff) | |
whitespace fixes
remove trailing spaces & expand tabs
Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h index 91a50e8c..e3013561 100644 --- a/src/declarative/qml/qdeclarativeimport_p.h +++ b/src/declarative/qml/qdeclarativeimport_p.h @@ -87,15 +87,15 @@ public: int *version_major, int *version_minor, QDeclarativeImportedNamespace** ns_return, QString *errorString = 0) const; - bool resolveType(QDeclarativeImportedNamespace*, + bool resolveType(QDeclarativeImportedNamespace*, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *version_major, int *version_minor) const; - bool addImport(QDeclarativeImportDatabase *, - const QString& uri, const QString& prefix, int vmaj, int vmin, + bool addImport(QDeclarativeImportDatabase *, + const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType, - const QDeclarativeDirComponents &qmldircomponentsnetwork, + const QDeclarativeDirComponents &qmldircomponentsnetwork, QString *errorString); void populateCache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *) const; @@ -124,10 +124,10 @@ public: private: friend class QDeclarativeImportsPrivate; - QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, + QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, const QString &baseName, const QStringList &suffixes, const QString &prefix = QString()); - QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, + QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, const QString &baseName); |