-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 | |||
@@ -107,13 +107,13 @@ struct htc_button htc_buttons_universal [] = { | |||
107 | 107 | ||
108 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), | 108 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), |
109 | "devicebuttons/z_hinge1", | 109 | "devicebuttons/z_hinge1", |
110 | "QPE/Rotation", "rotateDefault()",0}, | 110 | "QPE/Rotation", "rotateDefault()",0,0}, |
111 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), | 111 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), |
112 | "devicebuttons/z_hinge2", | 112 | "devicebuttons/z_hinge2", |
113 | "QPE/Rotation", "rotateDefault()",0}, | 113 | "QPE/Rotation", "rotateDefault()",0,0}, |
114 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), | 114 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
115 | "devicebuttons/z_hinge3", | 115 | "devicebuttons/z_hinge3", |
116 | "QPE/Rotation", "rotateDefault()",0}, | 116 | "QPE/Rotation", "rotateDefault()",0,0}, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | 119 | ||
@@ -355,7 +355,7 @@ OLedState HTC::ledState( OLed which ) const | |||
355 | return Led_Off; | 355 | return Led_Off; |
356 | } | 356 | } |
357 | 357 | ||
358 | bool HTC::setLedState( OLed which, OLedState st ) | 358 | bool HTC::setLedState( OLed, OLedState ) |
359 | { | 359 | { |
360 | qDebug( "HTC::setLedState: ODevice handling not yet implemented" ); | 360 | qDebug( "HTC::setLedState: ODevice handling not yet implemented" ); |
361 | return false; | 361 | return false; |
@@ -431,6 +431,8 @@ Transformation HTC::rotation() const | |||
431 | else if ( hs == CASE_UNKNOWN ) rot = Rot270; | 431 | else if ( hs == CASE_UNKNOWN ) rot = Rot270; |
432 | } | 432 | } |
433 | break; | 433 | break; |
434 | default: | ||
435 | break; | ||
434 | } | 436 | } |
435 | 437 | ||
436 | qDebug( "HTC::rotation() - returning '%d'", rot ); | 438 | qDebug( "HTC::rotation() - returning '%d'", 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 | |||
@@ -127,47 +127,6 @@ void Motorola_EZX::initButtons() | |||
127 | return; | 127 | return; |
128 | 128 | ||
129 | d->m_buttons = new QValueList <ODeviceButton>; | 129 | d->m_buttons = new QValueList <ODeviceButton>; |
130 | |||
131 | struct ezx_button * ezx_buttons; | ||
132 | int buttoncount; | ||
133 | |||
134 | /* | ||
135 | |||
136 | switch ( d->m_model ) | ||
137 | { | ||
138 | case Model_Motorola_EZX_SL6000: | ||
139 | pezx_buttons = ezx_buttons_6000; | ||
140 | buttoncount = ARRAY_SIZE(ezx_buttons_6000); | ||
141 | break; | ||
142 | case Model_Motorola_EZX_SLC3100: // fallthrough | ||
143 | case Model_Motorola_EZX_SLC3000: // fallthrough | ||
144 | case Model_Motorola_EZX_SLC1000: // fallthrough | ||
145 | case Model_Motorola_EZX_SLC7x0: | ||
146 | if ( isQWS( ) ) | ||
147 | { | ||
148 | addPreHandler(this); | ||
149 | } | ||
150 | pezx_buttons = ezx_buttons_c700; | ||
151 | buttoncount = ARRAY_SIZE(ezx_buttons_c700); | ||
152 | break; | ||
153 | default: | ||
154 | pezx_buttons = ezx_buttons; | ||
155 | buttoncount = ARRAY_SIZE(ezx_buttons); | ||
156 | break; | ||
157 | } | ||
158 | |||
159 | for ( int i = 0; i < buttoncount; i++ ) { | ||
160 | struct ezx_button *zb = pezx_buttons + i; | ||
161 | ODeviceButton b; | ||
162 | |||
163 | b.setKeycode( zb->code ); | ||
164 | b.setUserText( QObject::tr( "Button", zb->utext )); | ||
165 | b.setPixmap( OResource::loadPixmap( zb->pix )); | ||
166 | b.setFactoryPresetPressedAction( OQCopMessage( makeChannel ( zb->fpressedservice ), zb->fpressedaction )); | ||
167 | b.setFactoryPresetHeldAction( OQCopMessage( makeChannel ( zb->fheldservice ), zb->fheldaction )); | ||
168 | d->m_buttons->append( b ); | ||
169 | } | ||
170 | */ | ||
171 | reloadButtonMapping(); | 130 | reloadButtonMapping(); |
172 | } | 131 | } |
173 | 132 | ||
@@ -207,7 +166,7 @@ OLedState Motorola_EZX::ledState( OLed which ) const | |||
207 | return Led_Off; | 166 | return Led_Off; |
208 | } | 167 | } |
209 | 168 | ||
210 | bool Motorola_EZX::setLedState( OLed which, OLedState st ) | 169 | bool Motorola_EZX::setLedState( OLed, OLedState ) |
211 | { | 170 | { |
212 | // Currently not supported | 171 | // Currently not supported |
213 | qDebug( "Motorola_EZX::setLedState: ODevice handling not yet implemented" ); | 172 | qDebug( "Motorola_EZX::setLedState: ODevice handling not yet implemented" ); |
@@ -280,7 +239,7 @@ bool Motorola_EZX::suspend() { | |||
280 | bool res = false; | 239 | bool res = false; |
281 | QCopChannel::send( "QPE/System", "aboutToSuspend()" ); | 240 | QCopChannel::send( "QPE/System", "aboutToSuspend()" ); |
282 | 241 | ||
283 | struct timeval tvs, tvn; | 242 | struct timeval tvs; |
284 | ::gettimeofday ( &tvs, 0 ); | 243 | ::gettimeofday ( &tvs, 0 ); |
285 | 244 | ||
286 | ::sync(); // flush fs caches | 245 | ::sync(); // flush fs caches |
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 | |||
@@ -89,7 +89,7 @@ struct palm_button palm_buttons [] = { | |||
89 | { Model_Palm_LD, | 89 | { Model_Palm_LD, |
90 | Qt::Key_F8, QT_TRANSLATE_NOOP( "Button", "Rotate Button" ), | 90 | Qt::Key_F8, QT_TRANSLATE_NOOP( "Button", "Rotate Button" ), |
91 | "devicebuttons/palm_rotate", | 91 | "devicebuttons/palm_rotate", |
92 | "QPE/Rotation", "flip()",0}, | 92 | "QPE/Rotation", "flip()",0,0}, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | void Palm::init(const QString& cpu_info) | 95 | void Palm::init(const QString& cpu_info) |
@@ -218,6 +218,8 @@ bool Palm::suspend() | |||
218 | QCopChannel::send( "QPE/System", "returnFromSuspend()" ); | 218 | QCopChannel::send( "QPE/System", "returnFromSuspend()" ); |
219 | } | 219 | } |
220 | break; | 220 | break; |
221 | default: | ||
222 | break; | ||
221 | } | 223 | } |
222 | 224 | ||
223 | return res; | 225 | 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 | |||
@@ -107,13 +107,13 @@ struct z_button z_buttons_c700 [] = { | |||
107 | 107 | ||
108 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), | 108 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), |
109 | "devicebuttons/z_hinge1", | 109 | "devicebuttons/z_hinge1", |
110 | "QPE/Rotation", "rotateDefault()",0}, | 110 | "QPE/Rotation", "rotateDefault()",0,0}, |
111 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), | 111 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), |
112 | "devicebuttons/z_hinge2", | 112 | "devicebuttons/z_hinge2", |
113 | "QPE/Rotation", "rotateDefault()",0}, | 113 | "QPE/Rotation", "rotateDefault()",0,0}, |
114 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), | 114 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
115 | "devicebuttons/z_hinge3", | 115 | "devicebuttons/z_hinge3", |
116 | "QPE/Rotation", "rotateDefault()",0}, | 116 | "QPE/Rotation", "rotateDefault()",0,0}, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | struct z_button z_buttons_6000 [] = { | 119 | struct z_button z_buttons_6000 [] = { |
@@ -139,8 +139,8 @@ struct z_button z_buttons_6000 [] = { | |||
139 | "opiemail", "newMail()" }, | 139 | "opiemail", "newMail()" }, |
140 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Rotate Button"), | 140 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Rotate Button"), |
141 | "devicebuttons/z_rotate", | 141 | "devicebuttons/z_rotate", |
142 | 0, | 142 | 0, "QPE/Rotation", |
143 | "QPE/Rotation", "rotateDefault()" }, | 143 | "rotateDefault()", 0 }, |
144 | { Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), | 144 | { Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), |
145 | "devicebuttons/z_hinge3", | 145 | "devicebuttons/z_hinge3", |
146 | "QPE/VMemo", "toggleRecord()", | 146 | "QPE/VMemo", "toggleRecord()", |