This commit provides fixes that quiet warnings associated to device

information. It should cause no change in behavior.

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
@@ -106,15 +106,15 @@ struct htc_button htc_buttons_universal [] = {
     "opiemail", "newMail()" },
 
     { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"),
     "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},
 };
 
 
 //
@@ -354,9 +354,9 @@ OLedState HTC::ledState( OLed which ) const
     else
         return Led_Off;
 }
 
-bool HTC::setLedState( OLed which, OLedState st )
+bool HTC::setLedState( OLed, OLedState )
 {
     qDebug( "HTC::setLedState: ODevice handling not yet implemented" );
     return false;
 }
@@ -430,8 +430,10 @@ Transformation HTC::rotation() const
             if ( hs == CASE_PORTRAIT ) rot = Rot0;
             else if ( hs == CASE_UNKNOWN ) rot = Rot270;
         }
         break;
+        default:
+        break;
     }
 
     qDebug( "HTC::rotation() - returning '%d'", rot );
     return rot;
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
@@ -126,49 +126,8 @@ void Motorola_EZX::initButtons()
     if ( d->m_buttons )
         return;
 
     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();
 }
 
 void Motorola_EZX::playAlarmSound()
@@ -206,9 +165,9 @@ OLedState Motorola_EZX::ledState( OLed which ) const
     else
         return Led_Off;
 }
 
-bool Motorola_EZX::setLedState( OLed which, OLedState st )
+bool Motorola_EZX::setLedState( OLed, OLedState )
 {
      // Currently not supported
     qDebug( "Motorola_EZX::setLedState: ODevice handling not yet implemented" );
     return false;
@@ -279,9 +238,9 @@ bool Motorola_EZX::suspend() {
 
     bool res = false;
     QCopChannel::send( "QPE/System", "aboutToSuspend()" );
 
-    struct timeval tvs, tvn;
+    struct timeval tvs;
     ::gettimeofday ( &tvs, 0 );
 
     ::sync(); // flush fs caches
     res = ( ::system ( "apm --suspend" ) == 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
@@ -88,9 +88,9 @@ struct palm_button palm_buttons [] = {
         "QPE/TaskBar", "toggleStartMenu()" },
     { Model_Palm_LD,
       Qt::Key_F8, QT_TRANSLATE_NOOP( "Button", "Rotate Button" ),
         "devicebuttons/palm_rotate",
-        "QPE/Rotation", "flip()",0},
+        "QPE/Rotation", "flip()",0,0},
 };
 
 void Palm::init(const QString& cpu_info)
 {
@@ -217,8 +217,10 @@ bool Palm::suspend()
 
             QCopChannel::send( "QPE/System", "returnFromSuspend()" );
         }
         break;
+	default:
+	break;
     }
 
     return res;
 }
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
@@ -106,15 +106,15 @@ struct z_button z_buttons_c700 [] = {
     "opiemail", "newMail()" },
 
     { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"),
     "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},
 };
 
 struct z_button z_buttons_6000 [] = {
     { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
@@ -138,10 +138,10 @@ struct z_button z_buttons_6000 [] = {
     "opiemail", "raise()",
     "opiemail", "newMail()" },
     { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Rotate Button"),
     "devicebuttons/z_rotate",
-    0,
-    "QPE/Rotation", "rotateDefault()" },
+    0, "QPE/Rotation",
+    "rotateDefault()", 0 },
     { Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
     "devicebuttons/z_hinge3",
     "QPE/VMemo", "toggleRecord()",
     "sound", "raise()" },