summaryrefslogtreecommitdiff
path: root/libopie2
authorzecke <zecke>2004-02-07 18:51:44 (UTC)
committer zecke <zecke>2004-02-07 18:51:44 (UTC)
commite74082b93d1948385d8d32ed92e61396b74d72f1 (patch) (unidiff)
tree72fa998043e8218412b593626093f62b629154cc /libopie2
parenta41eba9e8404fb6321097e86736e23fbce4ead7a (diff)
downloadopie-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...
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.cpp8
-rw-r--r--libopie2/opiecore/device/odevice.h12
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.h2
-rw-r--r--libopie2/opiecore/device/odevice_simpad.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_simpad.h2
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp6
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.h6
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
356/** 356/**
357* This plays an alarmSound 357* This plays an alarm sound
358*/ 358*/
359void ODevice::alarmSound() 359void ODevice::playAlarmSound()
360{ 360{
@@ -371,3 +371,3 @@ void ODevice::alarmSound()
371*/ 371*/
372void ODevice::keySound() 372void ODevice::playKeySound()
373{ 373{
@@ -384,3 +384,3 @@ void ODevice::keySound()
384*/ 384*/
385void ODevice::touchSound() 385void ODevice::playTouchSound()
386{ 386{
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:
227 // input / output 227 // input / output
228 //FIXME playAlarmSound and al might be better -zecke 228 virtual void playAlarmSound();
229 virtual void alarmSound(); 229 virtual void playKeySound();
230 virtual void keySound(); 230 virtual void playTouchSound();
231 virtual void touchSound();
232 231
@@ -252,4 +251,7 @@ public:
252 * button. Note that this list only contains "user mappable" buttons. 251 * button. Note that this list only contains "user mappable" buttons.
252 *
253 * @todo Make method const and take care of calling initButtons or make that const too
254 *
253 */ 255 */
254 const QValueList<ODeviceButton> &buttons() /* ### make const */; 256 const QValueList<ODeviceButton> &buttons();
255 257
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 * )
344 344
345void iPAQ::alarmSound() 345void iPAQ::playAlarmSound()
346{ 346{
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
52 52
53 virtual void alarmSound(); 53 virtual void playAlarmSound();
54 54
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 * )
283 283
284void SIMpad::alarmSound() 284void SIMpad::playAlarmSound()
285{ 285{
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
53 53
54 virtual void alarmSound(); 54 virtual void playAlarmSound();
55 55
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 )
401 401
402void Zaurus::alarmSound() 402void Zaurus::playAlarmSound()
403{ 403{
@@ -406,3 +406,3 @@ void Zaurus::alarmSound()
406 406
407void Zaurus::touchSound() 407void Zaurus::playTouchSound()
408{ 408{
@@ -411,3 +411,3 @@ void Zaurus::touchSound()
411 411
412void Zaurus::keySound() 412void Zaurus::playKeySound()
413{ 413{
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
62 62
63 virtual void alarmSound(); 63 virtual void playAlarmSound();
64 virtual void keySound(); 64 virtual void playKeySound();
65 virtual void touchSound(); 65 virtual void playTouchSound();
66 66