author | zecke <zecke> | 2004-02-07 18:51:44 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-07 18:51:44 (UTC) |
commit | e74082b93d1948385d8d32ed92e61396b74d72f1 (patch) (side-by-side diff) | |
tree | 72fa998043e8218412b593626093f62b629154cc /libopie2/opiecore/device | |
parent | a41eba9e8404fb6321097e86736e23fbce4ead7a (diff) | |
download | opie-e74082b93d1948385d8d32ed92e61396b74d72f1.zip opie-e74082b93d1948385d8d32ed92e61396b74d72f1.tar.gz opie-e74082b93d1948385d8d32ed92e61396b74d72f1.tar.bz2 |
Rename the rest bunch of functions <- fix compiling...
Readd the todo mark about constness initButtons is not const...
-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 @@ -353,11 +353,11 @@ ODirection ODevice::direction() const return d->m_direction; } /** -* This plays an alarmSound +* This plays an alarm sound */ -void ODevice::alarmSound() +void ODevice::playAlarmSound() { #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); @@ -368,9 +368,9 @@ void ODevice::alarmSound() /** * This plays a key sound */ -void ODevice::keySound() +void ODevice::playKeySound() { #ifndef QT_NO_SOUND static Sound snd ( "keysound" ); @@ -381,9 +381,9 @@ void ODevice::keySound() /** * This plays a touch sound */ -void ODevice::touchSound() +void ODevice::playTouchSound() { #ifndef QT_NO_SOUND static Sound snd ( "touchsound" ); 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 @@ -224,12 +224,11 @@ public: // protected virtual int virtual_hook(int, void *) // which is defined below // 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(); virtual QValueList <OLed> ledList() const; virtual QValueList <OLedState> ledStateList ( OLed led ) const; virtual OLedState ledState ( OLed led ) const; @@ -249,10 +248,13 @@ public: * Returns the available buttons on this device. The number and location * of buttons will vary depending on the device. Button numbers will be assigned * by the device manufacturer and will be from most preferred button to least preffered * 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(); /** * Returns the DeviceButton for the \a keyCode. If \a keyCode is not found, it * returns 0L 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 @@ -341,9 +341,9 @@ void iPAQ::timerEvent ( QTimerEvent * ) QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); } -void iPAQ::alarmSound() +void iPAQ::playAlarmSound() { #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); int fd; 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 @@ -49,9 +49,9 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter virtual bool setDisplayBrightness( int b ); virtual int displayBrightnessResolution() const; - virtual void alarmSound(); + virtual void playAlarmSound(); virtual QValueList <OLed> ledList() const; virtual QValueList <OLedState> ledStateList( OLed led ) const; virtual OLedState ledState( OLed led ) const; 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 @@ -280,9 +280,9 @@ void SIMpad::timerEvent ( QTimerEvent * ) QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); } -void SIMpad::alarmSound() +void SIMpad::playAlarmSound() { #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); int fd; 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 @@ -50,9 +50,9 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter virtual bool setDisplayStatus( bool on ); virtual bool setDisplayBrightness( int b ); virtual int displayBrightnessResolution() const; - virtual void alarmSound(); + virtual void playAlarmSound(); virtual QValueList <OLed> ledList() const; virtual QValueList <OLedState> ledStateList( OLed led ) const; virtual OLedState ledState( OLed led ) const; 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 @@ -398,19 +398,19 @@ void Zaurus::buzzer ( int sound ) #endif } -void Zaurus::alarmSound() +void Zaurus::playAlarmSound() { buzzer ( SHARP_BUZ_SCHEDULE_ALARM ); } -void Zaurus::touchSound() +void Zaurus::playTouchSound() { buzzer ( SHARP_BUZ_TOUCHSOUND ); } -void Zaurus::keySound() +void Zaurus::playKeySound() { buzzer ( SHARP_BUZ_KEYSOUND ); } 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 @@ -59,11 +59,11 @@ class Zaurus : public ODevice virtual bool setDisplayBrightness ( int b ); virtual int displayBrightnessResolution() const; - virtual void alarmSound(); - virtual void keySound(); - virtual void touchSound(); + virtual void playAlarmSound(); + virtual void playKeySound(); + virtual void playTouchSound(); virtual QValueList <OLed> ledList() const; virtual QValueList <OLedState> ledStateList ( OLed led ) const; virtual OLedState ledState( OLed led ) const; |