aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeimport_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-07-22 14:52:08 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-30 13:18:28 +0200
commitcc533d80928445c45d6d181f26f0c7dc57c09811 (patch)
tree89cbcd495967da1d2c6b0d91e0182cf8ece1b329 /src/declarative/qml/qdeclarativeimport_p.h
parent540774d7dfe2a309fca181d9e54e14ba87069bbd (diff)
Remove some QString <-> utf8 conversions.
Change-Id: I4478ec805f5b1e05025baafaf7035b8fb57f9854 Reviewed-on: http://codereview.qt.nokia.com/3770 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport_p.h')
-rw-r--r--src/declarative/qml/qdeclarativeimport_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h
index 94639bd328..4f3b9c2a2d 100644
--- a/src/declarative/qml/qdeclarativeimport_p.h
+++ b/src/declarative/qml/qdeclarativeimport_p.h
@@ -81,13 +81,13 @@ public:
void setBaseUrl(const QUrl &url);
QUrl baseUrl() const;
- bool resolveType(const QByteArray& type,
+ 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 QByteArray& type,
+ const QString& type,
QDeclarativeType** type_return, QString* url_return,
int *version_major, int *version_minor) const;