-rw-r--r-- | library/qpeapplication.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 4d0b0ea..98af70a 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -23,4 +23,5 @@ | |||
23 | #include <linux/limits.h> // needed for some toolchains (PATH_MAX) | 23 | #include <linux/limits.h> // needed for some toolchains (PATH_MAX) |
24 | #include <qfile.h> | 24 | #include <qfile.h> |
25 | #include <qqueue.h> | ||
25 | #ifdef Q_WS_QWS | 26 | #ifdef Q_WS_QWS |
26 | #ifndef QT_NO_COP | 27 | #ifndef QT_NO_COP |
@@ -101,7 +102,5 @@ public: | |||
101 | keep_running( true ), qpe_main_widget( 0 ), qcopQok( false ) | 102 | keep_running( true ), qpe_main_widget( 0 ), qcopQok( false ) |
102 | 103 | ||
103 | { | 104 | {} |
104 | qcopq.setAutoDelete( TRUE ); | ||
105 | } | ||
106 | 105 | ||
107 | int presstimer; | 106 | int presstimer; |
@@ -134,5 +133,5 @@ public: | |||
134 | QWidget* qpe_main_widget; | 133 | QWidget* qpe_main_widget; |
135 | QGuardedPtr<QWidget> lastraised; | 134 | QGuardedPtr<QWidget> lastraised; |
136 | QList<QCopRec> qcopq; | 135 | QQueue<QCopRec> qcopq; |
137 | QString styleName; | 136 | QString styleName; |
138 | QString decorationName; | 137 | QString decorationName; |
@@ -141,5 +140,5 @@ public: | |||
141 | const QByteArray &data ) | 140 | const QByteArray &data ) |
142 | { | 141 | { |
143 | qcopq.append( new QCopRec( ch, msg, data ) ); | 142 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); |
144 | } | 143 | } |
145 | void sendQCopQ() | 144 | void sendQCopQ() |
@@ -150,10 +149,13 @@ public: | |||
150 | QCopRec * r; | 149 | QCopRec * r; |
151 | #ifndef QT_NO_COP | 150 | #ifndef QT_NO_COP |
152 | 151 | while((r=qcopq.dequeue())) { | |
153 | for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it ) | 152 | // remove from queue before sending... |
153 | // event loop can come around again before getting | ||
154 | // back from sendLocally | ||
154 | QCopChannel::sendLocally( r->channel, r->message, r->data ); | 155 | QCopChannel::sendLocally( r->channel, r->message, r->data ); |
155 | #endif | 156 | #endif |
156 | 157 | ||
157 | qcopq.clear(); | 158 | delete r; |
159 | } | ||
158 | } | 160 | } |
159 | static void show_mx(QWidget* mw, bool nomaximize, const QString & = QString::null ) | 161 | static void show_mx(QWidget* mw, bool nomaximize, const QString & = QString::null ) |