| -rw-r--r-- | libopie2/opiecore/device/odevice_htc.cpp | 10 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_motorola_ezx.cpp | 45 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_palm.cpp | 4 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 10 |
4 files changed, 16 insertions, 53 deletions
diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp index a6ade11..44b33c0 100644 --- a/libopie2/opiecore/device/odevice_htc.cpp +++ b/libopie2/opiecore/device/odevice_htc.cpp @@ -109,9 +109,9 @@ struct htc_button htc_buttons_universal [] = { "devicebuttons/z_hinge1", - "QPE/Rotation", "rotateDefault()",0}, + "QPE/Rotation", "rotateDefault()",0,0}, { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), "devicebuttons/z_hinge2", - "QPE/Rotation", "rotateDefault()",0}, + "QPE/Rotation", "rotateDefault()",0,0}, { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), "devicebuttons/z_hinge3", - "QPE/Rotation", "rotateDefault()",0}, + "QPE/Rotation", "rotateDefault()",0,0}, }; @@ -357,3 +357,3 @@ OLedState HTC::ledState( OLed which ) const -bool HTC::setLedState( OLed which, OLedState st ) +bool HTC::setLedState( OLed, OLedState ) { @@ -433,2 +433,4 @@ Transformation HTC::rotation() const break; + default: + break; } diff --git a/libopie2/opiecore/device/odevice_motorola_ezx.cpp b/libopie2/opiecore/device/odevice_motorola_ezx.cpp index eed81ac..67a2b9b 100644 --- a/libopie2/opiecore/device/odevice_motorola_ezx.cpp +++ b/libopie2/opiecore/device/odevice_motorola_ezx.cpp @@ -129,43 +129,2 @@ void Motorola_EZX::initButtons() d->m_buttons = new QValueList <ODeviceButton>; - - struct ezx_button * ezx_buttons; - int buttoncount; - -/* - - switch ( d->m_model ) - { - case Model_Motorola_EZX_SL6000: - pezx_buttons = ezx_buttons_6000; - buttoncount = ARRAY_SIZE(ezx_buttons_6000); - break; - case Model_Motorola_EZX_SLC3100: // fallthrough - case Model_Motorola_EZX_SLC3000: // fallthrough - case Model_Motorola_EZX_SLC1000: // fallthrough - case Model_Motorola_EZX_SLC7x0: - if ( isQWS( ) ) - { - addPreHandler(this); - } - pezx_buttons = ezx_buttons_c700; - buttoncount = ARRAY_SIZE(ezx_buttons_c700); - break; - default: - pezx_buttons = ezx_buttons; - buttoncount = ARRAY_SIZE(ezx_buttons); - break; - } - - for ( int i = 0; i < buttoncount; i++ ) { - struct ezx_button *zb = pezx_buttons + i; - ODeviceButton b; - - b.setKeycode( zb->code ); - b.setUserText( QObject::tr( "Button", zb->utext )); - b.setPixmap( OResource::loadPixmap( zb->pix )); - b.setFactoryPresetPressedAction( OQCopMessage( makeChannel ( zb->fpressedservice ), zb->fpressedaction )); - b.setFactoryPresetHeldAction( OQCopMessage( makeChannel ( zb->fheldservice ), zb->fheldaction )); - d->m_buttons->append( b ); - } -*/ reloadButtonMapping(); @@ -209,3 +168,3 @@ OLedState Motorola_EZX::ledState( OLed which ) const -bool Motorola_EZX::setLedState( OLed which, OLedState st ) +bool Motorola_EZX::setLedState( OLed, OLedState ) { @@ -282,3 +241,3 @@ bool Motorola_EZX::suspend() { - struct timeval tvs, tvn; + struct timeval tvs; ::gettimeofday ( &tvs, 0 ); diff --git a/libopie2/opiecore/device/odevice_palm.cpp b/libopie2/opiecore/device/odevice_palm.cpp index 76399f8..399c08c 100644 --- a/libopie2/opiecore/device/odevice_palm.cpp +++ b/libopie2/opiecore/device/odevice_palm.cpp @@ -91,3 +91,3 @@ struct palm_button palm_buttons [] = { "devicebuttons/palm_rotate", - "QPE/Rotation", "flip()",0}, + "QPE/Rotation", "flip()",0,0}, }; @@ -220,2 +220,4 @@ bool Palm::suspend() break; + default: + break; } diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 4963f54..9d2ebbb 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp @@ -109,9 +109,9 @@ struct z_button z_buttons_c700 [] = { "devicebuttons/z_hinge1", - "QPE/Rotation", "rotateDefault()",0}, + "QPE/Rotation", "rotateDefault()",0,0}, { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), "devicebuttons/z_hinge2", - "QPE/Rotation", "rotateDefault()",0}, + "QPE/Rotation", "rotateDefault()",0,0}, { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), "devicebuttons/z_hinge3", - "QPE/Rotation", "rotateDefault()",0}, + "QPE/Rotation", "rotateDefault()",0,0}, }; @@ -141,4 +141,4 @@ struct z_button z_buttons_6000 [] = { "devicebuttons/z_rotate", - 0, - "QPE/Rotation", "rotateDefault()" }, + 0, "QPE/Rotation", + "rotateDefault()", 0 }, { Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), |