Added checking for an empty keyRegisterList for increased performance :)

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
@@ -95,238 +95,236 @@ bool Desktop::screenLocked()
  */
 class DesktopPowerAlerter : public QMessageBox
 {
 public:
     DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
         : QMessageBox( tr("Battery Status"), "Low Battery",
                        QMessageBox::Critical,
                        QMessageBox::Ok | QMessageBox::Default,
                        QMessageBox::NoButton, QMessageBox::NoButton,
                        parent, name, FALSE )
     {
         currentPriority = INT_MAX;
         alertCount = 0;
     }
 
     void alert( const QString &text, int priority );
     void hideEvent( QHideEvent * );
 private:
     int currentPriority;
     int alertCount;
 };
 
 void DesktopPowerAlerter::alert( const QString &text, int priority )
 {
     alertCount++;
     if ( alertCount < priority )
         return;
     if ( priority > currentPriority )
         return;
     currentPriority = priority;
     setText( text );
     show();
 }
 
 
 void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 {
     QMessageBox::hideEvent( e );
     alertCount = 0;
     currentPriority = INT_MAX;
 }
 
 
 
 DesktopApplication::DesktopApplication( int& argc, char **argv, Type t )
     : QPEApplication( argc, argv, t )
 {
 
     QTimer *t = new QTimer( this );
     connect( t, SIGNAL(timeout()), this, SLOT(psTimeout()) );
     t->start( 10000 );
     ps = new PowerStatus;
     pa = new DesktopPowerAlerter( 0 );
 
   channel = new QCopChannel( "QPE/Desktop", this );
   connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
                    this, SLOT(receive(const QCString&, const QByteArray&)) );
 }
 
 
 DesktopApplication::~DesktopApplication()
 {
     delete ps;
     delete pa;
 }
 
 void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
 {
   QDataStream stream( data, IO_ReadOnly );
   if (msg == "keyRegister(int key, QString channel, QString message)")
         {
           int k;
           QString c, m;
 
           stream >> k;
           stream >> c;
           stream >> m;
           
           qWarning("KeyRegisterRecieved: %i, %s, %s", k, (const char*)c, (const char *)m);
           keyRegisterList.append(QCopKeyRegister(k,c,m));
         }
 }
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate=Unknown;
 
 #ifdef Q_WS_QWS
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 {
     qpedesktop->checkMemory();
 
     if ( e->type == QWSEvent::Key ) {
           QWSKeyEvent *ke = (QWSKeyEvent *)e;
           if ( !loggedin && ke->simpleData.keycode != Key_F34 )
             return TRUE;
           bool press = ke->simpleData.is_press;
 
-          KeyRegisterList::Iterator it;
-          for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it )
+          if (!keyRegisterList.isEmpty())
                 {
-                  if ((*it).getKeyCode() == ke->simpleData.keycode)
-                        QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
+                  KeyRegisterList::Iterator it;
+                  for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it )
+                        {
+                          if ((*it).getKeyCode() == ke->simpleData.keycode)
+                                QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
+                        }
                 }
-          
+
           if ( !keyboardGrabbed() ) {
             if ( ke->simpleData.keycode == Key_F9 ) {
                   if ( press ) emit datebook();
                   return TRUE;
             }
             if ( ke->simpleData.keycode == Key_F10 ) {
               if ( !press && cardSendTimer ) {
                     emit contacts();
                     delete cardSendTimer;
                   } else if ( press ) {
                     cardSendTimer = new QTimer();
                     cardSendTimer->start( 2000, TRUE );
                     connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
                   }
                   return TRUE;
             }
             /* menu key now opens application menu/toolbar
                    if ( ke->simpleData.keycode == Key_F11 ) {
                    if ( press ) emit menu();
                    return TRUE;
                    }
             */
             if ( ke->simpleData.keycode == Key_F12 ) {
                   while( activePopupWidget() )
                     activePopupWidget()->close();
                   if ( press ) emit launch();
                   return TRUE;
             }
             if ( ke->simpleData.keycode == Key_F13 ) {
                   if ( press ) emit email();
                   return TRUE;
             }
           }
-          /*
-          if ( ke->simpleData.keycode == 4096 ) {
-                QCopEnvelope e("QPE/VMemo", "toggleRecord()");
-                return TRUE;
-          }
-          */
+
           if ( ke->simpleData.keycode == Key_F34 ) {
             if ( press ) emit power();
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_F35 ) {
             if ( press ) emit backlight();
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_F32 ) {
             if ( press ) QCopEnvelope e( "QPE/Desktop", "startSync()" );
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_F31 && !ke->simpleData.modifiers ) {
             if ( press ) emit symbol();
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_NumLock ) {
             if ( press ) emit numLockStateToggle();
           }
           if ( ke->simpleData.keycode == Key_CapsLock ) {
             if ( press ) emit capsLockStateToggle();
           }
           if ( press )
             qpedesktop->keyClick();
     } else {
           if ( e->type == QWSEvent::Mouse ) {
             QWSMouseEvent *me = (QWSMouseEvent *)e;
             static bool up = TRUE;
             if ( me->simpleData.state&LeftButton ) {
                   if ( up ) {
                     up = FALSE;
                     qpedesktop->screenClick();
                   }
             } else {
                   up = TRUE;
             }
           }
     }
         
     return QPEApplication::qwsEventFilter( e );
 }
 #endif
 
 void DesktopApplication::psTimeout()
 {
     qpedesktop->checkMemory(); // in case no events are being generated
 
     *ps = PowerStatusManager::readStatus();
 
     if ( (ps->batteryStatus() == PowerStatus::VeryLow ) ) {
         pa->alert( tr( "Battery is running very low." ), 6 );
     }
 
     if (  ps->batteryStatus() == PowerStatus::Critical ) {
         pa->alert(  tr( "Battery level is critical!\n"
                         "Keep power off until power restored!" ), 1 );
     }
 
     if (  ps->backupBatteryStatus() == PowerStatus::VeryLow ) {
         pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 3 );
     }
 }
 
 
 void DesktopApplication::sendCard()
 {
     delete cardSendTimer;
     cardSendTimer = 0;
     QString card = getenv("HOME");
     card += "/Applications/addressbook/businesscard.vcf";
 
     if ( QFile::exists( card ) ) {
         QCopEnvelope e("QPE/Obex", "send(QString,QString,QString)");
         QString mimetype = "text/x-vCard";
         e << tr("business card") << card << mimetype;
     }
 }
 
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
 #endif
 
 #if defined(CUSTOM_SOUND_IMPL)
 CUSTOM_SOUND_IMPL
 #endif
 
 //===========================================================================
 
 Desktop::Desktop() :
     QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
     qcopBridge( 0 ),
     transferServer( 0 ),
     packageSlave( 0 )
 {
 #ifdef CUSTOM_SOUND_INIT
     CUSTOM_SOUND_INIT;