summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-07 18:51:44 (UTC)
committer zecke <zecke>2004-02-07 18:51:44 (UTC)
commite74082b93d1948385d8d32ed92e61396b74d72f1 (patch) (unidiff)
tree72fa998043e8218412b593626093f62b629154cc
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 (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
@@ -349,45 +349,45 @@ Transformation ODevice::rotation() const
349* @return the current rotation direction 349* @return the current rotation direction
350*/ 350*/
351ODirection ODevice::direction() const 351ODirection ODevice::direction() const
352{ 352{
353 return d->m_direction; 353 return d->m_direction;
354} 354}
355 355
356/** 356/**
357* This plays an alarmSound 357* This plays an alarm sound
358*/ 358*/
359void ODevice::alarmSound() 359void ODevice::playAlarmSound()
360{ 360{
361#ifndef QT_NO_SOUND 361#ifndef QT_NO_SOUND
362 static Sound snd ( "alarm" ); 362 static Sound snd ( "alarm" );
363 363
364 if ( snd. isFinished()) 364 if ( snd. isFinished())
365 snd. play(); 365 snd. play();
366#endif 366#endif
367} 367}
368 368
369/** 369/**
370* This plays a key sound 370* This plays a key sound
371*/ 371*/
372void ODevice::keySound() 372void ODevice::playKeySound()
373{ 373{
374#ifndef QT_NO_SOUND 374#ifndef QT_NO_SOUND
375 static Sound snd ( "keysound" ); 375 static Sound snd ( "keysound" );
376 376
377 if ( snd. isFinished()) 377 if ( snd. isFinished())
378 snd. play(); 378 snd. play();
379#endif 379#endif
380} 380}
381 381
382/** 382/**
383* This plays a touch sound 383* This plays a touch sound
384*/ 384*/
385void ODevice::touchSound() 385void ODevice::playTouchSound()
386{ 386{
387#ifndef QT_NO_SOUND 387#ifndef QT_NO_SOUND
388 static Sound snd ( "touchsound" ); 388 static Sound snd ( "touchsound" );
389 389
390 if ( snd. isFinished()) 390 if ( snd. isFinished())
391 snd. play(); 391 snd. play();
392#endif 392#endif
393} 393}
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
@@ -220,20 +220,19 @@ public:
220 220
221 // don't add new virtual methods, use this: 221 // don't add new virtual methods, use this:
222 ///*virtual */ void boo(int i ) { return virtual_hook(1,&i); }; 222 ///*virtual */ void boo(int i ) { return virtual_hook(1,&i); };
223 // and in your subclass do do overwrite 223 // and in your subclass do do overwrite
224 //protected virtual int virtual_hook(int, void *) 224 //protected virtual int virtual_hook(int, void *)
225 // which is defined below 225 // which is defined below
226 226
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
233 virtual QValueList <OLed> ledList() const; 232 virtual QValueList <OLed> ledList() const;
234 virtual QValueList <OLedState> ledStateList ( OLed led ) const; 233 virtual QValueList <OLedState> ledStateList ( OLed led ) const;
235 virtual OLedState ledState ( OLed led ) const; 234 virtual OLedState ledState ( OLed led ) const;
236 virtual bool setLedState ( OLed led, OLedState st ); 235 virtual bool setLedState ( OLed led, OLedState st );
237 236
238 virtual bool hasLightSensor() const; 237 virtual bool hasLightSensor() const;
239 virtual int readLightSensor(); 238 virtual int readLightSensor();
@@ -245,18 +244,21 @@ public:
245 const QStrList &allowedCpuFrequencies() const; 244 const QStrList &allowedCpuFrequencies() const;
246 bool setCurrentCpuFrequency(uint index); 245 bool setCurrentCpuFrequency(uint index);
247 246
248 /** 247 /**
249 * Returns the available buttons on this device. The number and location 248 * Returns the available buttons on this device. The number and location
250 * of buttons will vary depending on the device. Button numbers will be assigned 249 * of buttons will vary depending on the device. Button numbers will be assigned
251 * by the device manufacturer and will be from most preferred button to least preffered 250 * by the device manufacturer and will be from most preferred button to least preffered
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
256 /** 258 /**
257 * Returns the DeviceButton for the \a keyCode. If \a keyCode is not found, it 259 * Returns the DeviceButton for the \a keyCode. If \a keyCode is not found, it
258 * returns 0L 260 * returns 0L
259 */ 261 */
260 const ODeviceButton *buttonForKeycode ( ushort keyCode ); 262 const ODeviceButton *buttonForKeycode ( ushort keyCode );
261 263
262 /** 264 /**
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
@@ -337,17 +337,17 @@ void iPAQ::timerEvent ( QTimerEvent * )
337{ 337{
338 killTimer ( m_power_timer ); 338 killTimer ( m_power_timer );
339 m_power_timer = 0; 339 m_power_timer = 0;
340 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false ); 340 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
341 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); 341 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
342} 342}
343 343
344 344
345void iPAQ::alarmSound() 345void iPAQ::playAlarmSound()
346{ 346{
347#ifndef QT_NO_SOUND 347#ifndef QT_NO_SOUND
348 static Sound snd ( "alarm" ); 348 static Sound snd ( "alarm" );
349 int fd; 349 int fd;
350 int vol; 350 int vol;
351 bool vol_reset = false; 351 bool vol_reset = false;
352 352
353 if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { 353 if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) {
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
@@ -45,17 +45,17 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter
45 virtual void initButtons(); 45 virtual void initButtons();
46 46
47 public: 47 public:
48 virtual bool setSoftSuspend( bool soft ); 48 virtual bool setSoftSuspend( bool soft );
49 49
50 virtual bool setDisplayBrightness( int b ); 50 virtual bool setDisplayBrightness( int b );
51 virtual int displayBrightnessResolution() const; 51 virtual int displayBrightnessResolution() const;
52 52
53 virtual void alarmSound(); 53 virtual void playAlarmSound();
54 54
55 virtual QValueList <OLed> ledList() const; 55 virtual QValueList <OLed> ledList() const;
56 virtual QValueList <OLedState> ledStateList( OLed led ) const; 56 virtual QValueList <OLedState> ledStateList( OLed led ) const;
57 virtual OLedState ledState( OLed led ) const; 57 virtual OLedState ledState( OLed led ) const;
58 virtual bool setLedState( OLed led, OLedState st ); 58 virtual bool setLedState( OLed led, OLedState st );
59 59
60 virtual bool hasLightSensor() const; 60 virtual bool hasLightSensor() const;
61 virtual int readLightSensor(); 61 virtual int readLightSensor();
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
@@ -276,17 +276,17 @@ void SIMpad::timerEvent ( QTimerEvent * )
276{ 276{
277 killTimer ( m_power_timer ); 277 killTimer ( m_power_timer );
278 m_power_timer = 0; 278 m_power_timer = 0;
279 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false ); 279 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
280 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); 280 QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
281} 281}
282 282
283 283
284void SIMpad::alarmSound() 284void SIMpad::playAlarmSound()
285{ 285{
286#ifndef QT_NO_SOUND 286#ifndef QT_NO_SOUND
287 static Sound snd ( "alarm" ); 287 static Sound snd ( "alarm" );
288 int fd; 288 int fd;
289 int vol; 289 int vol;
290 bool vol_reset = false; 290 bool vol_reset = false;
291 291
292 if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { 292 if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) {
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
@@ -46,17 +46,17 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter
46 public: 46 public:
47 virtual bool setSoftSuspend( bool soft ); 47 virtual bool setSoftSuspend( bool soft );
48 virtual bool suspend(); 48 virtual bool suspend();
49 49
50 virtual bool setDisplayStatus( bool on ); 50 virtual bool setDisplayStatus( bool on );
51 virtual bool setDisplayBrightness( int b ); 51 virtual bool setDisplayBrightness( int b );
52 virtual int displayBrightnessResolution() const; 52 virtual int displayBrightnessResolution() const;
53 53
54 virtual void alarmSound(); 54 virtual void playAlarmSound();
55 55
56 virtual QValueList <OLed> ledList() const; 56 virtual QValueList <OLed> ledList() const;
57 virtual QValueList <OLedState> ledStateList( OLed led ) const; 57 virtual QValueList <OLedState> ledStateList( OLed led ) const;
58 virtual OLedState ledState( OLed led ) const; 58 virtual OLedState ledState( OLed led ) const;
59 virtual bool setLedState( OLed led, OLedState st ); 59 virtual bool setLedState( OLed led, OLedState st );
60 60
61 protected: 61 protected:
62 virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); 62 virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
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
@@ -394,27 +394,27 @@ void Zaurus::buzzer ( int sound )
394 ::close ( fd ); 394 ::close ( fd );
395 } 395 }
396 396
397 } 397 }
398#endif 398#endif
399} 399}
400 400
401 401
402void Zaurus::alarmSound() 402void Zaurus::playAlarmSound()
403{ 403{
404 buzzer ( SHARP_BUZ_SCHEDULE_ALARM ); 404 buzzer ( SHARP_BUZ_SCHEDULE_ALARM );
405} 405}
406 406
407void Zaurus::touchSound() 407void Zaurus::playTouchSound()
408{ 408{
409 buzzer ( SHARP_BUZ_TOUCHSOUND ); 409 buzzer ( SHARP_BUZ_TOUCHSOUND );
410} 410}
411 411
412void Zaurus::keySound() 412void Zaurus::playKeySound()
413{ 413{
414 buzzer ( SHARP_BUZ_KEYSOUND ); 414 buzzer ( SHARP_BUZ_KEYSOUND );
415} 415}
416 416
417 417
418QValueList <OLed> Zaurus::ledList() const 418QValueList <OLed> Zaurus::ledList() const
419{ 419{
420 QValueList <OLed> vl; 420 QValueList <OLed> vl;
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
@@ -55,19 +55,19 @@ class Zaurus : public ODevice
55 virtual void initButtons(); 55 virtual void initButtons();
56 56
57 public: 57 public:
58 virtual bool setSoftSuspend ( bool soft ); 58 virtual bool setSoftSuspend ( bool soft );
59 59
60 virtual bool setDisplayBrightness ( int b ); 60 virtual bool setDisplayBrightness ( int b );
61 virtual int displayBrightnessResolution() const; 61 virtual int displayBrightnessResolution() const;
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
67 virtual QValueList <OLed> ledList() const; 67 virtual QValueList <OLed> ledList() const;
68 virtual QValueList <OLedState> ledStateList ( OLed led ) const; 68 virtual QValueList <OLedState> ledStateList ( OLed led ) const;
69 virtual OLedState ledState( OLed led ) const; 69 virtual OLedState ledState( OLed led ) const;
70 virtual bool setLedState( OLed led, OLedState st ); 70 virtual bool setLedState( OLed led, OLedState st );
71 71
72 virtual bool hasHingeSensor() const; 72 virtual bool hasHingeSensor() const;
73 virtual OHingeStatus readHingeSensor(); 73 virtual OHingeStatus readHingeSensor();