Use a QQueue as in Qtopia

1 files changed, 11 insertions, 9 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 4d0b0ea..98af70a 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -21,8 +21,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <linux/limits.h> // needed for some toolchains (PATH_MAX)
 #include <qfile.h>
+#include <qqueue.h>
 #ifdef Q_WS_QWS
 #ifndef QT_NO_COP
 #if QT_VERSION <= 231
 #define private public
@@ -99,11 +100,9 @@ public:
                 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
                   notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
                   keep_running( true ), qpe_main_widget( 0 ), qcopQok( false )
 
-        {
-                qcopq.setAutoDelete( TRUE );
-        }
+        {}
 
         int presstimer;
         QWidget* presswidget;
         QPoint presspos;
@@ -132,30 +131,33 @@ public:
                 QByteArray data;
         };
         QWidget* qpe_main_widget;
         QGuardedPtr<QWidget> lastraised;
-        QList<QCopRec> qcopq;
+        QQueue<QCopRec> qcopq;
         QString styleName;
         QString decorationName;
 
         void enqueueQCop( const QCString &ch, const QCString &msg,
                           const QByteArray &data )
         {
-                qcopq.append( new QCopRec( ch, msg, data ) );
+                qcopq.enqueue( new QCopRec( ch, msg, data ) );
         }
         void sendQCopQ()
         {
             if (!qcopQok )
                 return;
 
                 QCopRec * r;
 #ifndef QT_NO_COP
-
-                for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it )
-                        QCopChannel::sendLocally( r->channel, r->message, r->data );
+           while((r=qcopq.dequeue())) {
+               // remove from queue before sending...
+               // event loop can come around again before getting
+               // back from sendLocally
+               QCopChannel::sendLocally( r->channel, r->message, r->data );
 #endif
 
-                qcopq.clear();
+               delete r;
+           }
         }
         static void show_mx(QWidget* mw, bool nomaximize,  const QString & = QString::null )
         {