diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-14 10:11:35 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-09-17 08:16:18 +0000 |
| commit | be9557db507ea552251bbb1c1091ce115829f485 (patch) | |
| tree | b404452e936e78f31bd00390f2a8d4df342fd077 | |
| parent | c1e36e212090cd02bc238f70dfeb70d7c651e348 (diff) | |
Compositor: Rename QWaylandKeyboard::toScanCode to keyToScanCode
Since the key argument is an int, the signature looks ambiguous otherwise.
Change-Id: I732971437ff7354ad3863ecfe42c779a06a84d69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.h | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandseat.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index c172bca85..aa3b49b7a 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -589,7 +589,7 @@ void QWaylandKeyboard::addClient(QWaylandClient *client, uint32_t id, uint32_t v d->add(client->client(), id, qMin<uint32_t>(QtWaylandServer::wl_keyboard::interfaceVersion(), version)); } -uint QWaylandKeyboard::toScanCode(int qtKey) const +uint QWaylandKeyboard::keyToScanCode(int qtKey) const { uint scanCode = 0; #if QT_CONFIG(xkbcommon_evdev) diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h index e5d5e086e..a443ed3a0 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.h +++ b/src/compositor/compositor_api/qwaylandkeyboard.h @@ -82,7 +82,7 @@ public: virtual void addClient(QWaylandClient *client, uint32_t id, uint32_t version); - uint toScanCode(int qtKey) const; + uint keyToScanCode(int qtKey) const; Q_SIGNALS: void focusChanged(QWaylandSurface *surface); diff --git a/src/compositor/compositor_api/qwaylandseat.cpp b/src/compositor/compositor_api/qwaylandseat.cpp index 60d4d6fd9..a7b01ef03 100644 --- a/src/compositor/compositor_api/qwaylandseat.cpp +++ b/src/compositor/compositor_api/qwaylandseat.cpp @@ -443,7 +443,7 @@ void QWaylandSeat::sendFullKeyEvent(QKeyEvent *event) uint scanCode = event->nativeScanCode(); if (scanCode == 0) - scanCode = d->keyboard->toScanCode(event->key()); + scanCode = d->keyboard->keyToScanCode(event->key()); if (scanCode == 0) { qWarning() << "Can't send Wayland key event: Unable to get a valid scan code"; @@ -477,7 +477,7 @@ void QWaylandSeat::sendKeyEvent(int qtKey, bool pressed) return; } - if (auto scanCode = d->keyboard->toScanCode(qtKey)) { + if (auto scanCode = d->keyboard->keyToScanCode(qtKey)) { if (pressed) d->keyboard->sendKeyPressEvent(scanCode); else |