1 files changed, 9 insertions, 12 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index d7b9d925b..881e54644 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -184,7 +184,7 @@ QWakeUpActiveObject::~QWakeUpActiveObject()
 
 void QWakeUpActiveObject::DoCancel()
 {
-    if (iStatus.Int() & KRequestPending) {
+    if (iStatus.Int() == KRequestPending) {
         TRequestStatus *status = &iStatus;
         QEventDispatcherSymbian::RequestComplete(status, KErrNone);
     }
@@ -214,7 +214,7 @@ void QTimerActiveObject::DoCancel()
         m_rTimer.Cancel();
         m_rTimer.Close();
     } else {
-        if (iStatus.Int() & KRequestPending) {
+        if (iStatus.Int() == KRequestPending) {
             TRequestStatus *status = &iStatus;
             QEventDispatcherSymbian::RequestComplete(status, KErrNone);
         }
@@ -225,6 +225,7 @@ void QTimerActiveObject::RunL()
 {
     int error;
     QT_TRYCATCH_ERROR(error, Run());
+    // All Symbian error codes are negative.
     if (error < 0) {
         CActiveScheduler::Current()->Error(error);  // stop and report here, as this timer will be deleted on scope exit
     }
@@ -275,7 +276,7 @@ void QTimerActiveObject::Start()
 }
 
 SymbianTimerInfo::SymbianTimerInfo()
-: timerAO(0)
+    : timerAO(0)
 {
 }
 
@@ -300,7 +301,7 @@ QCompleteDeferredAOs::~QCompleteDeferredAOs()
 
 void QCompleteDeferredAOs::complete()
 {
-    if (iStatus.Int() & KRequestPending) {
+    if (iStatus.Int() == KRequestPending) {
         TRequestStatus *status = &iStatus;
         QEventDispatcherSymbian::RequestComplete(status, KErrNone);
     }
@@ -308,7 +309,7 @@ void QCompleteDeferredAOs::complete()
 
 void QCompleteDeferredAOs::DoCancel()
 {
-    if (iStatus.Int() & KRequestPending) {
+    if (iStatus.Int() == KRequestPending) {
         TRequestStatus *status = &iStatus;
         QEventDispatcherSymbian::RequestComplete(status, KErrNone);
     }
@@ -369,10 +370,8 @@ void QSelectThread::run()
 
         int ret;
         int savedSelectErrno;
-        //do {
-            ret = qt_socket_select(maxfd, &readfds, &writefds, &exceptionfds, 0);
-            savedSelectErrno = errno;
-        //} while (ret == 0);
+        ret = qt_socket_select(maxfd, &readfds, &writefds, &exceptionfds, 0);
+        savedSelectErrno = errno;
 
         char buffer;
 
@@ -405,7 +404,6 @@ void QSelectThread::run()
                 FD_ZERO(&readfds);
                 FD_ZERO(&writefds);
                 FD_ZERO(&exceptionfds);
-                {
                 for (QHash<QSocketNotifier *, TRequestStatus *>::const_iterator i = m_AOStatuses.begin();
                         i != m_AOStatuses.end(); ++i) {
 
@@ -434,7 +432,6 @@ void QSelectThread::run()
                     }
 
                 } // end for
-                }
 
                 // traversed all, so update
                 updateActivatedNotifiers(QSocketNotifier::Read, &readfds);
@@ -581,7 +578,7 @@ QSocketActiveObject::~QSocketActiveObject()
 
 void QSocketActiveObject::DoCancel()
 {
-    if (iStatus.Int() & KRequestPending) {
+    if (iStatus.Int() == KRequestPending) {
         TRequestStatus *status = &iStatus;
         QEventDispatcherSymbian::RequestComplete(status, KErrNone);
     }