author | erik <erik> | 2007-02-08 23:11:26 (UTC) |
---|---|---|
committer | erik <erik> | 2007-02-08 23:11:26 (UTC) |
commit | 98353ac16bb90ee4b5df18945acf4fa7f05f9a85 (patch) (unidiff) | |
tree | 67ccd74ecfcc9006bece74089b6739736d78243f /libopie2/opiecore/device/odevice_palm.cpp | |
parent | 497621fb3ba39ea511842a30cddfcdbda090e7ba (diff) | |
download | opie-98353ac16bb90ee4b5df18945acf4fa7f05f9a85.zip opie-98353ac16bb90ee4b5df18945acf4fa7f05f9a85.tar.gz opie-98353ac16bb90ee4b5df18945acf4fa7f05f9a85.tar.bz2 |
This commit provides fixes that quiet warnings associated to device
information. It should cause no change in behavior.
Diffstat (limited to 'libopie2/opiecore/device/odevice_palm.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_palm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
@@ -68,49 +68,49 @@ struct palm_button palm_buttons [] = { | |||
68 | "buttonsettings", "raise()" }, | 68 | "buttonsettings", "raise()" }, |
69 | { Model_Palm_TX | Model_Palm_LD | Model_Palm_Z72, | 69 | { Model_Palm_TX | Model_Palm_LD | Model_Palm_Z72, |
70 | Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Calendar Button" ), | 70 | Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Calendar Button" ), |
71 | "devicebuttons/palm_calendar", | 71 | "devicebuttons/palm_calendar", |
72 | "datebook", "nextView()", | 72 | "datebook", "nextView()", |
73 | "today", "raise()" }, | 73 | "today", "raise()" }, |
74 | { Model_Palm_TX | Model_Palm_LD | Model_Palm_Z72, | 74 | { Model_Palm_TX | Model_Palm_LD | Model_Palm_Z72, |
75 | Qt::Key_F11, QT_TRANSLATE_NOOP( "Button", "Todo Button" ), | 75 | Qt::Key_F11, QT_TRANSLATE_NOOP( "Button", "Todo Button" ), |
76 | "devicebuttons/palm_todo", | 76 | "devicebuttons/palm_todo", |
77 | "todolist", "raise()", | 77 | "todolist", "raise()", |
78 | "todolist", "create()" }, | 78 | "todolist", "create()" }, |
79 | { Model_Palm_TX | Model_Palm_LD | Model_Palm_Z72, | 79 | { Model_Palm_TX | Model_Palm_LD | Model_Palm_Z72, |
80 | Qt::Key_F12, QT_TRANSLATE_NOOP( "Button", "Mail Button" ), | 80 | Qt::Key_F12, QT_TRANSLATE_NOOP( "Button", "Mail Button" ), |
81 | "devicebuttons/palm_mail", | 81 | "devicebuttons/palm_mail", |
82 | "opiemail", "raise()", | 82 | "opiemail", "raise()", |
83 | "opiemail", "newmail()" }, | 83 | "opiemail", "newmail()" }, |
84 | { Model_Palm_LD, | 84 | { Model_Palm_LD, |
85 | Qt::Key_F7, QT_TRANSLATE_NOOP( "Button", "Voice Memo Button" ), | 85 | Qt::Key_F7, QT_TRANSLATE_NOOP( "Button", "Voice Memo Button" ), |
86 | "devicebuttons/palm_voice_memo", | 86 | "devicebuttons/palm_voice_memo", |
87 | "QPE/TaskBar", "toggleMenu()", | 87 | "QPE/TaskBar", "toggleMenu()", |
88 | "QPE/TaskBar", "toggleStartMenu()" }, | 88 | "QPE/TaskBar", "toggleStartMenu()" }, |
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) |
96 | { | 96 | { |
97 | d->m_vendorstr = "Palm"; | 97 | d->m_vendorstr = "Palm"; |
98 | d->m_vendor = Vendor_Palm; | 98 | d->m_vendor = Vendor_Palm; |
99 | 99 | ||
100 | QString model = "unknown"; | 100 | QString model = "unknown"; |
101 | 101 | ||
102 | int loc = cpu_info.find( ":" ); | 102 | int loc = cpu_info.find( ":" ); |
103 | if ( loc != -1 ) | 103 | if ( loc != -1 ) |
104 | model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); | 104 | model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); |
105 | else | 105 | else |
106 | model = cpu_info; | 106 | model = cpu_info; |
107 | 107 | ||
108 | if ( model == "Palm LifeDrive" ) { | 108 | if ( model == "Palm LifeDrive" ) { |
109 | d->m_modelstr = "Palm LifeDrive"; | 109 | d->m_modelstr = "Palm LifeDrive"; |
110 | d->m_model = Model_Palm_LD; | 110 | d->m_model = Model_Palm_LD; |
111 | } | 111 | } |
112 | else if ( model == "Palm TX" ) { | 112 | else if ( model == "Palm TX" ) { |
113 | d->m_modelstr = "Palm TX"; | 113 | d->m_modelstr = "Palm TX"; |
114 | d->m_model = Model_Palm_TX; | 114 | d->m_model = Model_Palm_TX; |
115 | } | 115 | } |
116 | else if ( model == "Palm Zire 72" ) { | 116 | else if ( model == "Palm Zire 72" ) { |
@@ -197,48 +197,50 @@ bool Palm::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
197 | } | 197 | } |
198 | 198 | ||
199 | 199 | ||
200 | bool Palm::suspend() | 200 | bool Palm::suspend() |
201 | { | 201 | { |
202 | // some Palms do not implement their own power management at the moment. | 202 | // some Palms do not implement their own power management at the moment. |
203 | 203 | ||
204 | bool res = false; | 204 | bool res = false; |
205 | 205 | ||
206 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 206 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
207 | return false; | 207 | return false; |
208 | 208 | ||
209 | switch ( d->m_model ) { | 209 | switch ( d->m_model ) { |
210 | case Model_Palm_LD: | 210 | case Model_Palm_LD: |
211 | case Model_Palm_Z72: | 211 | case Model_Palm_Z72: |
212 | { | 212 | { |
213 | QCopChannel::send( "QPE/System", "aboutToSuspend()" ); | 213 | QCopChannel::send( "QPE/System", "aboutToSuspend()" ); |
214 | 214 | ||
215 | ::sync(); // flush fs caches | 215 | ::sync(); // flush fs caches |
216 | res = ( ::system ( "apm --suspend" ) == 0 ); | 216 | res = ( ::system ( "apm --suspend" ) == 0 ); |
217 | 217 | ||
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; |
224 | } | 226 | } |
225 | 227 | ||
226 | 228 | ||
227 | int Palm::displayBrightnessResolution() const | 229 | int Palm::displayBrightnessResolution() const |
228 | { | 230 | { |
229 | int res = 1; | 231 | int res = 1; |
230 | 232 | ||
231 | switch ( d->m_model ) | 233 | switch ( d->m_model ) |
232 | { | 234 | { |
233 | case Model_Palm_LD: | 235 | case Model_Palm_LD: |
234 | case Model_Palm_TX: | 236 | case Model_Palm_TX: |
235 | case Model_Palm_Z72: | 237 | case Model_Palm_Z72: |
236 | int fd = ::open( m_backlightdev + "max_brightness", O_RDONLY|O_NONBLOCK ); | 238 | int fd = ::open( m_backlightdev + "max_brightness", O_RDONLY|O_NONBLOCK ); |
237 | if ( fd ) | 239 | if ( fd ) |
238 | { | 240 | { |
239 | char buf[100]; | 241 | char buf[100]; |
240 | if ( ::read( fd, &buf[0], sizeof buf ) ) ::sscanf( &buf[0], "%d", &res ); | 242 | if ( ::read( fd, &buf[0], sizeof buf ) ) ::sscanf( &buf[0], "%d", &res ); |
241 | ::close( fd ); | 243 | ::close( fd ); |
242 | } | 244 | } |
243 | break; | 245 | break; |
244 | 246 | ||