diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-15 14:42:57 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-20 10:38:16 +0000 |
| commit | 8de7ec4bf82c35ff1413fb5f5a5ca1788dc93af3 (patch) | |
| tree | 6d50f515aafaebb177ef22b3e7687a0335bd9323 /src/quick | |
| parent | 3690c740d9337983c7bfc4ff2a21a7403a5e7940 (diff) | |
QQuickKeysAttached: drop const from keyToSignal() result type
Let the compiler use the result as rvalue.
Also mark this method as static, it does not use members.
Change-Id: I3711b1a99c6b1a10ee491cdbc14419a62fd545ec
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 4c6b0b4167..8771e1a56e 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -806,7 +806,7 @@ const SigMap sigMap[] = { { 0, 0 } }; -const QByteArray QQuickKeysAttached::keyToSignal(int key) +QByteArray QQuickKeysAttached::keyToSignal(int key) { QByteArray keySignal; if (key >= Qt::Key_0 && key <= Qt::Key_9) { diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 9ea2712e18..9e4c7bc0e8 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -859,7 +859,7 @@ private: void inputMethodEvent(QInputMethodEvent *, bool post) Q_DECL_OVERRIDE; QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; #endif - const QByteArray keyToSignal(int key); + static QByteArray keyToSignal(int key); bool isConnected(const char *signalName); }; |