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/items | |
| 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/items')
| -rw-r--r-- | src/quick/items/qquickrectangle.cpp | 3 | ||||
| -rw-r--r-- | src/quick/items/qquickrectangle_p_p.h | 3 | ||||
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index f4fe4714ea..b4156d9749 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -48,6 +48,7 @@ #include <QtGui/qpixmapcache.h> #include <QtCore/qstringbuilder.h> #include <QtCore/qmath.h> +#include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE @@ -414,7 +415,7 @@ void QQuickRectangle::setGradient(QQuickGradient *gradient) return; static int updatedSignalIdx = -1; if (updatedSignalIdx < 0) - updatedSignalIdx = QQuickGradient::staticMetaObject.indexOfSignal("updated()"); + updatedSignalIdx = QMetaMethod::fromSignal(&QQuickGradient::updated).methodIndex(); if (d->doUpdateSlotIdx < 0) d->doUpdateSlotIdx = QQuickRectangle::staticMetaObject.indexOfSlot("doUpdate()"); if (d->gradient) diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h index cb923ee563..934544b697 100644 --- a/src/quick/items/qquickrectangle_p_p.h +++ b/src/quick/items/qquickrectangle_p_p.h @@ -54,6 +54,7 @@ // #include "qquickitem_p.h" +#include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE @@ -88,7 +89,7 @@ public: pen = new QQuickPen; static int penChangedSignalIdx = -1; if (penChangedSignalIdx < 0) - penChangedSignalIdx = QQuickPen::staticMetaObject.indexOfSignal("penChanged()"); + penChangedSignalIdx = QMetaMethod::fromSignal(&QQuickPen::penChanged).methodIndex(); if (doUpdateSlotIdx < 0) doUpdateSlotIdx = QQuickRectangle::staticMetaObject.indexOfSlot("doUpdate()"); QMetaObject::connect(pen, penChangedSignalIdx, q, doUpdateSlotIdx); diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 751706dce1..b390679a4b 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -69,6 +69,7 @@ #include <qvariant.h> #include <qurl.h> #include <qstylehints.h> +#include <qmetaobject.h> // ### these should come from QStyleHints const int textCursorWidth = 1; @@ -321,8 +322,8 @@ void QQuickTextControlPrivate::setContent(Qt::TextFormat format, const QString & doc->setUndoRedoEnabled(false); //Saving the index save some time. - static int contentsChangedIndex = QTextDocument::staticMetaObject.indexOfSignal("contentsChanged()"); - static int textChangedIndex = QQuickTextControl::staticMetaObject.indexOfSignal("textChanged()"); + static int contentsChangedIndex = QMetaMethod::fromSignal(&QTextDocument::contentsChanged).methodIndex(); + static int textChangedIndex = QMetaMethod::fromSignal(&QQuickTextControl::textChanged).methodIndex(); // avoid multiple textChanged() signals being emitted QMetaObject::disconnect(doc, contentsChangedIndex, q, textChangedIndex); |