diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-30 11:33:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 09:34:50 +0200 |
| commit | 6cb34bd5000b68d04b2798f6aa16134464573420 (patch) | |
| tree | 9a5dc8a6a638cccf783c39ed593262c91bb2215c /src/quick/util | |
| parent | 2c65dce8f68bfb03848dbd395fd1501fd7cd1510 (diff) | |
Avoid string-based lookup of signals
Change-Id: I5b83b5d07b6a5d2de86d0f37471cf59baa7b0e43
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 9f11062674..3b9c59e5e3 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -66,6 +66,7 @@ #include <private/qobject_p.h> #include <QSslError> #include <QQmlFile> +#include <QMetaMethod> #define IMAGEREQUEST_MAX_REQUEST_COUNT 8 #define IMAGEREQUEST_MAX_REDIRECT_RECURSION 16 @@ -633,12 +634,10 @@ void QQuickPixmapReader::cancel(QQuickPixmapReply *reply) void QQuickPixmapReader::run() { if (replyDownloadProgress == -1) { - const QMetaObject *nr = &QNetworkReply::staticMetaObject; - const QMetaObject *pr = &QQuickPixmapReply::staticMetaObject; + replyDownloadProgress = QMetaMethod::fromSignal(&QNetworkReply::downloadProgress).methodIndex(); + replyFinished = QMetaMethod::fromSignal(&QNetworkReply::finished).methodIndex(); + downloadProgress = QMetaMethod::fromSignal(&QQuickPixmapReply::downloadProgress).methodIndex(); const QMetaObject *ir = &QQuickPixmapReaderThreadObject::staticMetaObject; - replyDownloadProgress = nr->indexOfSignal("downloadProgress(qint64,qint64)"); - replyFinished = nr->indexOfSignal("finished()"); - downloadProgress = pr->indexOfSignal("downloadProgress(qint64,qint64)"); threadNetworkRequestDone = ir->indexOfSlot("networkRequestDone()"); } @@ -832,8 +831,8 @@ QQuickPixmapReply::QQuickPixmapReply(QQuickPixmapData *d) : data(d), engineForReader(0), requestSize(d->requestSize), url(d->url), loading(false), redirectCount(0) { if (finishedIndex == -1) { - finishedIndex = QQuickPixmapReply::staticMetaObject.indexOfSignal("finished()"); - downloadProgressIndex = QQuickPixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)"); + finishedIndex = QMetaMethod::fromSignal(&QQuickPixmapReply::finished).methodIndex(); + downloadProgressIndex = QMetaMethod::fromSignal(&QQuickPixmapReply::downloadProgress).methodIndex(); } } |