-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 12 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_simpad.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_simpad.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 6 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.h | 6 |
8 files changed, 21 insertions, 19 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 6c8432f..72b9ac7 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp @@ -356,5 +356,5 @@ ODirection ODevice::direction() const /** -* This plays an alarmSound +* This plays an alarm sound */ -void ODevice::alarmSound() +void ODevice::playAlarmSound() { @@ -371,3 +371,3 @@ void ODevice::alarmSound() */ -void ODevice::keySound() +void ODevice::playKeySound() { @@ -384,3 +384,3 @@ void ODevice::keySound() */ -void ODevice::touchSound() +void ODevice::playTouchSound() { diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 8ae7ffa..791ccb3 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h @@ -227,6 +227,5 @@ public: // input / output - //FIXME playAlarmSound and al might be better -zecke - virtual void alarmSound(); - virtual void keySound(); - virtual void touchSound(); + virtual void playAlarmSound(); + virtual void playKeySound(); + virtual void playTouchSound(); @@ -252,4 +251,7 @@ public: * button. Note that this list only contains "user mappable" buttons. + * + * @todo Make method const and take care of calling initButtons or make that const too + * */ - const QValueList<ODeviceButton> &buttons() /* ### make const */; + const QValueList<ODeviceButton> &buttons(); diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index d68bce1..d20ea4d 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp @@ -344,3 +344,3 @@ void iPAQ::timerEvent ( QTimerEvent * ) -void iPAQ::alarmSound() +void iPAQ::playAlarmSound() { diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h index baf7215..f512344 100644 --- a/libopie2/opiecore/device/odevice_ipaq.h +++ b/libopie2/opiecore/device/odevice_ipaq.h @@ -52,3 +52,3 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter - virtual void alarmSound(); + virtual void playAlarmSound(); diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp index a2cd419..4397b78 100644 --- a/libopie2/opiecore/device/odevice_simpad.cpp +++ b/libopie2/opiecore/device/odevice_simpad.cpp @@ -283,3 +283,3 @@ void SIMpad::timerEvent ( QTimerEvent * ) -void SIMpad::alarmSound() +void SIMpad::playAlarmSound() { diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h index 615effc..3287ee8 100644 --- a/libopie2/opiecore/device/odevice_simpad.h +++ b/libopie2/opiecore/device/odevice_simpad.h @@ -53,3 +53,3 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter - virtual void alarmSound(); + virtual void playAlarmSound(); diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 78bc62e..8bff770 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp @@ -401,3 +401,3 @@ void Zaurus::buzzer ( int sound ) -void Zaurus::alarmSound() +void Zaurus::playAlarmSound() { @@ -406,3 +406,3 @@ void Zaurus::alarmSound() -void Zaurus::touchSound() +void Zaurus::playTouchSound() { @@ -411,3 +411,3 @@ void Zaurus::touchSound() -void Zaurus::keySound() +void Zaurus::playKeySound() { diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h index c07fe07..f5c5172 100644 --- a/libopie2/opiecore/device/odevice_zaurus.h +++ b/libopie2/opiecore/device/odevice_zaurus.h @@ -62,5 +62,5 @@ class Zaurus : public ODevice - virtual void alarmSound(); - virtual void keySound(); - virtual void touchSound(); + virtual void playAlarmSound(); + virtual void playKeySound(); + virtual void playTouchSound(); |