on xenial help sign in
Rename signals properly.
commit5612caf861f60ca9bc2df1a9f2279590afeb5612 authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 16 Feb 2015, 23:59 (12 years ago) parent4abadea
2 files changed+15−15
qml/Components/PhysicalKeysMapper.qml+11−11 tests/qmltests/Components/tst_PhysicalKeysMapper.qml+4−4
qml/Components/PhysicalKeysMapper.qml+11−11
@@ -36,10 +36,10 @@ import Powerd 0.1
3636Item {
3737 id: root
3838
39− signal powerKeyLongPress;
40− signal volumeDownTrigger;
41− signal volumeUpTrigger;
42− signal screenshotTrigger;
39+ signal powerKeyLongPressed;
40+ signal volumeDownTriggered;
41+ signal volumeUpTriggered;
42+ signal screenshotTriggered;
4343
4444 QtObject {
4545 id: d
@@ -53,7 +53,7 @@ Item {
5353 id: powerKeyLongPressTimer
5454
5555 interval: 2000
56− onTriggered: root.powerKeyLongPress();
56+ onTriggered: root.powerKeyLongPressed();
5757 }
5858
5959
@@ -76,19 +76,19 @@ Item {
7676 && !event.isAutoRepeat) {
7777 event.accepted = callManager.handleMediaKey(false);
7878 } else if (event.key == Qt.Key_VolumeDown) {
79− if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeDownTrigger();
79+ if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeDownTriggered();
8080 else if (!event.isAutoRepeat) {
8181 if (d.volumeUpKeyPressed) {
82− if (Powerd.status === Powerd.On) root.screenshotTrigger();
82+ if (Powerd.status === Powerd.On) root.screenshotTriggered();
8383 d.ignoreVolumeEvents = true;
8484 }
8585 d.volumeDownKeyPressed = true;
8686 }
8787 } else if (event.key == Qt.Key_VolumeUp) {
88− if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeUpTrigger();
88+ if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeUpTriggered();
8989 else if (!event.isAutoRepeat) {
9090 if (d.volumeDownKeyPressed) {
91− if (Powerd.status === Powerd.On) root.screenshotTrigger();
91+ if (Powerd.status === Powerd.On) root.screenshotTriggered();
9292 d.ignoreVolumeEvents = true;
9393 }
9494 d.volumeUpKeyPressed = true;
@@ -101,11 +101,11 @@ Item {
101101 powerKeyLongPressTimer.stop();
102102 event.accepted = true;
103103 } else if (event.key == Qt.Key_VolumeDown) {
104− if (!d.ignoreVolumeEvents) root.volumeDownTrigger();
104+ if (!d.ignoreVolumeEvents) root.volumeDownTriggered();
105105 d.volumeDownKeyPressed = false;
106106 if (!d.volumeUpKeyPressed) d.ignoreVolumeEvents = false;
107107 } else if (event.key == Qt.Key_VolumeUp) {
108− if (!d.ignoreVolumeEvents) root.volumeUpTrigger();
108+ if (!d.ignoreVolumeEvents) root.volumeUpTriggered();
109109 d.volumeUpKeyPressed = false;
110110 if (!d.volumeDownKeyPressed) d.ignoreVolumeEvents = false;
111111 }
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+4−4
@@ -32,25 +32,25 @@ TestCase {
3232 SignalSpy {
3333 id: powerSpy
3434 target: loader.item
35− signalName: "powerKeyLongPress"
35+ signalName: "powerKeyLongPressed"
3636 }
3737
3838 SignalSpy {
3939 id: volumeDownSpy
4040 target: loader.item
41− signalName: "volumeDownTrigger"
41+ signalName: "volumeDownTriggered"
4242 }
4343
4444 SignalSpy {
4545 id: volumeUpSpy
4646 target: loader.item
47− signalName: "volumeUpTrigger"
47+ signalName: "volumeUpTriggered"
4848 }
4949
5050 SignalSpy {
5151 id: screenshotSpy
5252 target: loader.item
53− signalName: "screenshotTrigger"
53+ signalName: "screenshotTriggered"
5454 }
5555
5656 function init() {