author | zecke <zecke> | 2003-09-30 08:28:21 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-09-30 08:28:21 (UTC) |
commit | 4dd842eacb6c04303932e4cbebedff14db7cbc87 (patch) (unidiff) | |
tree | fce6ebe83d9c3863b1cf9313a264c85014a716dc /library/qpeapplication.cpp | |
parent | 5430b226e390cc9af6a3257d6998e34bf806c9e2 (diff) | |
download | opie-4dd842eacb6c04303932e4cbebedff14db7cbc87.zip opie-4dd842eacb6c04303932e4cbebedff14db7cbc87.tar.gz opie-4dd842eacb6c04303932e4cbebedff14db7cbc87.tar.bz2 |
Use a QQueue as in Qtopia
-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 | |||
@@ -19,12 +19,13 @@ | |||
19 | */ | 19 | */ |
20 | #define QTOPIA_INTERNAL_LANGLIST | 20 | #define QTOPIA_INTERNAL_LANGLIST |
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include <unistd.h> | 22 | #include <unistd.h> |
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 |
27 | #if QT_VERSION <= 231 | 28 | #if QT_VERSION <= 231 |
28 | #define private public | 29 | #define private public |
29 | #define sendLocally processEvent | 30 | #define sendLocally processEvent |
30 | #include "qcopenvelope_qws.h" | 31 | #include "qcopenvelope_qws.h" |
@@ -97,15 +98,13 @@ class QPEApplicationData | |||
97 | public: | 98 | public: |
98 | QPEApplicationData ( ) | 99 | QPEApplicationData ( ) |
99 | : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), | 100 | : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), |
100 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), | 101 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), |
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; |
108 | QWidget* presswidget; | 107 | QWidget* presswidget; |
109 | QPoint presspos; | 108 | QPoint presspos; |
110 | 109 | ||
111 | bool rightpressed : 1; | 110 | bool rightpressed : 1; |
@@ -130,34 +129,37 @@ public: | |||
130 | QCString channel; | 129 | QCString channel; |
131 | QCString message; | 130 | QCString message; |
132 | QByteArray data; | 131 | QByteArray data; |
133 | }; | 132 | }; |
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; |
139 | 138 | ||
140 | void enqueueQCop( const QCString &ch, const QCString &msg, | 139 | void enqueueQCop( const QCString &ch, const QCString &msg, |
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() |
146 | { | 145 | { |
147 | if (!qcopQok ) | 146 | if (!qcopQok ) |
148 | return; | 147 | return; |
149 | 148 | ||
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 ) |
160 | { | 162 | { |
161 | 163 | ||
162 | // ugly hack, remove that later after finding a sane solution | 164 | // ugly hack, remove that later after finding a sane solution |
163 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, | 165 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, |