author | jeremy <jeremy> | 2002-02-15 21:29:03 (UTC) |
---|---|---|
committer | jeremy <jeremy> | 2002-02-15 21:29:03 (UTC) |
commit | a176c76090a3ba74f350d2066d6762c9b9a7eb3b (patch) (unidiff) | |
tree | b2dd448bd0fa8bd3d1e1730b44427f5c2f5f052f /core/launcher | |
parent | b0768575b7bc1e4fe477d37a49cccc7e3d92bf85 (diff) | |
download | opie-a176c76090a3ba74f350d2066d6762c9b9a7eb3b.zip opie-a176c76090a3ba74f350d2066d6762c9b9a7eb3b.tar.gz opie-a176c76090a3ba74f350d2066d6762c9b9a7eb3b.tar.bz2 |
Added checking for an empty keyRegisterList for increased performance :)
-rw-r--r-- | core/launcher/desktop.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index ce99bad..a00fae2 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -179,31 +179,34 @@ enum MemState { Unknown, VeryLow, Low, Normal } memstate=Unknown; | |||
179 | 179 | ||
180 | #ifdef Q_WS_QWS | 180 | #ifdef Q_WS_QWS |
181 | bool DesktopApplication::qwsEventFilter( QWSEvent *e ) | 181 | bool DesktopApplication::qwsEventFilter( QWSEvent *e ) |
182 | { | 182 | { |
183 | qpedesktop->checkMemory(); | 183 | qpedesktop->checkMemory(); |
184 | 184 | ||
185 | if ( e->type == QWSEvent::Key ) { | 185 | if ( e->type == QWSEvent::Key ) { |
186 | QWSKeyEvent *ke = (QWSKeyEvent *)e; | 186 | QWSKeyEvent *ke = (QWSKeyEvent *)e; |
187 | if ( !loggedin && ke->simpleData.keycode != Key_F34 ) | 187 | if ( !loggedin && ke->simpleData.keycode != Key_F34 ) |
188 | return TRUE; | 188 | return TRUE; |
189 | bool press = ke->simpleData.is_press; | 189 | bool press = ke->simpleData.is_press; |
190 | 190 | ||
191 | KeyRegisterList::Iterator it; | 191 | if (!keyRegisterList.isEmpty()) |
192 | for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) | ||
193 | { | 192 | { |
194 | if ((*it).getKeyCode() == ke->simpleData.keycode) | 193 | KeyRegisterList::Iterator it; |
195 | QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8()); | 194 | for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) |
195 | { | ||
196 | if ((*it).getKeyCode() == ke->simpleData.keycode) | ||
197 | QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8()); | ||
198 | } | ||
196 | } | 199 | } |
197 | 200 | ||
198 | if ( !keyboardGrabbed() ) { | 201 | if ( !keyboardGrabbed() ) { |
199 | if ( ke->simpleData.keycode == Key_F9 ) { | 202 | if ( ke->simpleData.keycode == Key_F9 ) { |
200 | if ( press ) emit datebook(); | 203 | if ( press ) emit datebook(); |
201 | return TRUE; | 204 | return TRUE; |
202 | } | 205 | } |
203 | if ( ke->simpleData.keycode == Key_F10 ) { | 206 | if ( ke->simpleData.keycode == Key_F10 ) { |
204 | if ( !press && cardSendTimer ) { | 207 | if ( !press && cardSendTimer ) { |
205 | emit contacts(); | 208 | emit contacts(); |
206 | delete cardSendTimer; | 209 | delete cardSendTimer; |
207 | } else if ( press ) { | 210 | } else if ( press ) { |
208 | cardSendTimer = new QTimer(); | 211 | cardSendTimer = new QTimer(); |
209 | cardSendTimer->start( 2000, TRUE ); | 212 | cardSendTimer->start( 2000, TRUE ); |
@@ -219,30 +222,25 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) | |||
219 | */ | 222 | */ |
220 | if ( ke->simpleData.keycode == Key_F12 ) { | 223 | if ( ke->simpleData.keycode == Key_F12 ) { |
221 | while( activePopupWidget() ) | 224 | while( activePopupWidget() ) |
222 | activePopupWidget()->close(); | 225 | activePopupWidget()->close(); |
223 | if ( press ) emit launch(); | 226 | if ( press ) emit launch(); |
224 | return TRUE; | 227 | return TRUE; |
225 | } | 228 | } |
226 | if ( ke->simpleData.keycode == Key_F13 ) { | 229 | if ( ke->simpleData.keycode == Key_F13 ) { |
227 | if ( press ) emit email(); | 230 | if ( press ) emit email(); |
228 | return TRUE; | 231 | return TRUE; |
229 | } | 232 | } |
230 | } | 233 | } |
231 | /* | 234 | |
232 | if ( ke->simpleData.keycode == 4096 ) { | ||
233 | QCopEnvelope e("QPE/VMemo", "toggleRecord()"); | ||
234 | return TRUE; | ||
235 | } | ||
236 | */ | ||
237 | if ( ke->simpleData.keycode == Key_F34 ) { | 235 | if ( ke->simpleData.keycode == Key_F34 ) { |
238 | if ( press ) emit power(); | 236 | if ( press ) emit power(); |
239 | return TRUE; | 237 | return TRUE; |
240 | } | 238 | } |
241 | if ( ke->simpleData.keycode == Key_F35 ) { | 239 | if ( ke->simpleData.keycode == Key_F35 ) { |
242 | if ( press ) emit backlight(); | 240 | if ( press ) emit backlight(); |
243 | return TRUE; | 241 | return TRUE; |
244 | } | 242 | } |
245 | if ( ke->simpleData.keycode == Key_F32 ) { | 243 | if ( ke->simpleData.keycode == Key_F32 ) { |
246 | if ( press ) QCopEnvelope e( "QPE/Desktop", "startSync()" ); | 244 | if ( press ) QCopEnvelope e( "QPE/Desktop", "startSync()" ); |
247 | return TRUE; | 245 | return TRUE; |
248 | } | 246 | } |