author | wimpie <wimpie> | 2004-08-25 01:47:35 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-08-25 01:47:35 (UTC) |
commit | f6a6fe57c9e0047379f4b8b40da4776f1c4d7b25 (patch) (unidiff) | |
tree | 2db64e885b1a67058fa45533819993c8dcb4fb96 /library/qpeapplication.h | |
parent | 49c47e98bed6e35d0bdc8e1e4cc40bdbb07eab06 (diff) | |
download | opie-f6a6fe57c9e0047379f4b8b40da4776f1c4d7b25.zip opie-f6a6fe57c9e0047379f4b8b40da4776f1c4d7b25.tar.gz opie-f6a6fe57c9e0047379f4b8b40da4776f1c4d7b25.tar.bz2 |
Final changes for RoH Feedback
- changed *.pro file to compile in backend
- some more fixes to rohfeedback and qpeapplication
-rw-r--r-- | library/qpeapplication.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index d2782e4..b07802f 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -155,66 +155,64 @@ private slots: | |||
155 | void hideOrQuit(); | 155 | void hideOrQuit(); |
156 | 156 | ||
157 | protected: | 157 | protected: |
158 | bool qwsEventFilter( QWSEvent * ); | 158 | bool qwsEventFilter( QWSEvent * ); |
159 | void internalSetStyle( const QString &style ); | 159 | void internalSetStyle( const QString &style ); |
160 | void prepareForTermination(bool willrestart); | 160 | void prepareForTermination(bool willrestart); |
161 | virtual void restart(); | 161 | virtual void restart(); |
162 | virtual void shutdown(); | 162 | virtual void shutdown(); |
163 | bool eventFilter( QObject *, QEvent * ); | 163 | bool eventFilter( QObject *, QEvent * ); |
164 | void timerEvent( QTimerEvent * ); | 164 | void timerEvent( QTimerEvent * ); |
165 | bool raiseAppropriateWindow(); | 165 | bool raiseAppropriateWindow(); |
166 | virtual void tryQuit(); | 166 | virtual void tryQuit(); |
167 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | 167 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX |
168 | #if QT_VERSION > 233 | 168 | #if QT_VERSION > 233 |
169 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 169 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
170 | #endif | 170 | #endif |
171 | #endif | 171 | #endif |
172 | private: | 172 | private: |
173 | #ifndef QT_NO_TRANSLATION | 173 | #ifndef QT_NO_TRANSLATION |
174 | void installTranslation( const QString& baseName ); | 174 | void installTranslation( const QString& baseName ); |
175 | #endif | 175 | #endif |
176 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 176 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
177 | void processQCopFile(); | 177 | void processQCopFile(); |
178 | 178 | ||
179 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 179 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
180 | QCopChannel *sysChannel; | 180 | QCopChannel *sysChannel; |
181 | QCopChannel *pidChannel; | 181 | QCopChannel *pidChannel; |
182 | #endif | 182 | #endif |
183 | QPEApplicationData *d; | 183 | QPEApplicationData *d; |
184 | 184 | ||
185 | bool reserved_sh; | 185 | bool reserved_sh; |
186 | 186 | ||
187 | |||
188 | |||
189 | }; | 187 | }; |
190 | 188 | ||
191 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | 189 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) |
192 | { | 190 | { |
193 | showWidget( d, nomax ); | 191 | showWidget( d, nomax ); |
194 | } | 192 | } |
195 | 193 | ||
196 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | 194 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) |
197 | { | 195 | { |
198 | showDialog( d, nomax ); | 196 | showDialog( d, nomax ); |
199 | return d->exec(); | 197 | return d->exec(); |
200 | } | 198 | } |
201 | 199 | ||
202 | #ifdef Q_WS_QWS | 200 | #ifdef Q_WS_QWS |
203 | extern Q_EXPORT QRect qt_maxWindowRect; | 201 | extern Q_EXPORT QRect qt_maxWindowRect; |
204 | #endif | 202 | #endif |
205 | 203 | ||
206 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) | 204 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) |
207 | { | 205 | { |
208 | if ( wg->isVisible() ) | 206 | if ( wg->isVisible() ) |
209 | wg->show(); | 207 | wg->show(); |
210 | else | 208 | else |
211 | { | 209 | { |
212 | if ( !nomax | 210 | if ( !nomax |
213 | && ( qApp->desktop()->width() <= 320 ) ) | 211 | && ( qApp->desktop()->width() <= 320 ) ) |
214 | { | 212 | { |
215 | wg->showMaximized(); | 213 | wg->showMaximized(); |
216 | } else { | 214 | } else { |
217 | #ifdef Q_WS_QWS | 215 | #ifdef Q_WS_QWS |
218 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); | 216 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); |
219 | #else | 217 | #else |
220 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | 218 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); |