author | zecke <zecke> | 2004-10-15 23:16:12 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-15 23:16:12 (UTC) |
commit | 419f9710c488f56a7a117eb1529970d3371e0094 (patch) (unidiff) | |
tree | 1072ae49cffa65318899bd72c10884d62f44e8de /library | |
parent | bc127247d5c74f05b58610cbc94ebc8682a16c7f (diff) | |
download | opie-419f9710c488f56a7a117eb1529970d3371e0094.zip opie-419f9710c488f56a7a117eb1529970d3371e0094.tar.gz opie-419f9710c488f56a7a117eb1529970d3371e0094.tar.bz2 |
Remove installTranslator also from the header
-rw-r--r-- | library/qpeapplication.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index b07802f..579fc44 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -109,131 +109,128 @@ public: | |||
109 | }; | 109 | }; |
110 | 110 | ||
111 | enum screenSaverHint { | 111 | enum screenSaverHint { |
112 | Disable = 0, | 112 | Disable = 0, |
113 | DisableLightOff = 1, | 113 | DisableLightOff = 1, |
114 | DisableSuspend = 2, | 114 | DisableSuspend = 2, |
115 | Enable = 100 | 115 | Enable = 100 |
116 | }; | 116 | }; |
117 | 117 | ||
118 | static void setInputMethodHint( QWidget *, InputMethodHint ); | 118 | static void setInputMethodHint( QWidget *, InputMethodHint ); |
119 | static InputMethodHint inputMethodHint( QWidget * ); | 119 | static InputMethodHint inputMethodHint( QWidget * ); |
120 | 120 | ||
121 | void showMainWidget( QWidget*, bool nomax=FALSE ); | 121 | void showMainWidget( QWidget*, bool nomax=FALSE ); |
122 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); | 122 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); |
123 | static void showDialog( QDialog*, bool nomax=FALSE ); | 123 | static void showDialog( QDialog*, bool nomax=FALSE ); |
124 | static int execDialog( QDialog*, bool nomax=FALSE ); | 124 | static int execDialog( QDialog*, bool nomax=FALSE ); |
125 | static void showWidget( QWidget*, bool nomax=FALSE ); | 125 | static void showWidget( QWidget*, bool nomax=FALSE ); |
126 | /* Merge setTempScreenSaverMode */ | 126 | /* Merge setTempScreenSaverMode */ |
127 | #ifdef QTOPIA_INTERNAL_INITAPP | 127 | #ifdef QTOPIA_INTERNAL_INITAPP |
128 | void initApp( int argv, char **argv ); | 128 | void initApp( int argv, char **argv ); |
129 | #endif | 129 | #endif |
130 | 130 | ||
131 | static void setKeepRunning(); | 131 | static void setKeepRunning(); |
132 | bool keepRunning() const; | 132 | bool keepRunning() const; |
133 | 133 | ||
134 | bool keyboardGrabbed() const; | 134 | bool keyboardGrabbed() const; |
135 | 135 | ||
136 | int exec(); | 136 | int exec(); |
137 | 137 | ||
138 | signals: | 138 | signals: |
139 | void clientMoused(); | 139 | void clientMoused(); |
140 | void timeChanged(); | 140 | void timeChanged(); |
141 | void clockChanged( bool pm ); | 141 | void clockChanged( bool pm ); |
142 | void micChanged( bool muted ); | 142 | void micChanged( bool muted ); |
143 | void volumeChanged( bool muted ); | 143 | void volumeChanged( bool muted ); |
144 | void appMessage( const QCString& msg, const QByteArray& data); | 144 | void appMessage( const QCString& msg, const QByteArray& data); |
145 | void weekChanged( bool startOnMonday ); | 145 | void weekChanged( bool startOnMonday ); |
146 | void dateFormatChanged( DateFormat ); | 146 | void dateFormatChanged( DateFormat ); |
147 | void flush(); | 147 | void flush(); |
148 | void reload(); | 148 | void reload(); |
149 | /* linkChanged signal */ | 149 | /* linkChanged signal */ |
150 | 150 | ||
151 | private slots: | 151 | private slots: |
152 | void systemMessage( const QCString &msg, const QByteArray &data ); | 152 | void systemMessage( const QCString &msg, const QByteArray &data ); |
153 | void pidMessage( const QCString &msg, const QByteArray &data ); | 153 | void pidMessage( const QCString &msg, const QByteArray &data ); |
154 | void removeSenderFromStylusDict(); | 154 | void removeSenderFromStylusDict(); |
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 | ||
174 | void installTranslation( const QString& baseName ); | ||
175 | #endif | ||
176 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 173 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
177 | void processQCopFile(); | 174 | void processQCopFile(); |
178 | 175 | ||
179 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 176 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
180 | QCopChannel *sysChannel; | 177 | QCopChannel *sysChannel; |
181 | QCopChannel *pidChannel; | 178 | QCopChannel *pidChannel; |
182 | #endif | 179 | #endif |
183 | QPEApplicationData *d; | 180 | QPEApplicationData *d; |
184 | 181 | ||
185 | bool reserved_sh; | 182 | bool reserved_sh; |
186 | 183 | ||
187 | }; | 184 | }; |
188 | 185 | ||
189 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | 186 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) |
190 | { | 187 | { |
191 | showWidget( d, nomax ); | 188 | showWidget( d, nomax ); |
192 | } | 189 | } |
193 | 190 | ||
194 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | 191 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) |
195 | { | 192 | { |
196 | showDialog( d, nomax ); | 193 | showDialog( d, nomax ); |
197 | return d->exec(); | 194 | return d->exec(); |
198 | } | 195 | } |
199 | 196 | ||
200 | #ifdef Q_WS_QWS | 197 | #ifdef Q_WS_QWS |
201 | extern Q_EXPORT QRect qt_maxWindowRect; | 198 | extern Q_EXPORT QRect qt_maxWindowRect; |
202 | #endif | 199 | #endif |
203 | 200 | ||
204 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) | 201 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) |
205 | { | 202 | { |
206 | if ( wg->isVisible() ) | 203 | if ( wg->isVisible() ) |
207 | wg->show(); | 204 | wg->show(); |
208 | else | 205 | else |
209 | { | 206 | { |
210 | if ( !nomax | 207 | if ( !nomax |
211 | && ( qApp->desktop()->width() <= 320 ) ) | 208 | && ( qApp->desktop()->width() <= 320 ) ) |
212 | { | 209 | { |
213 | wg->showMaximized(); | 210 | wg->showMaximized(); |
214 | } else { | 211 | } else { |
215 | #ifdef Q_WS_QWS | 212 | #ifdef Q_WS_QWS |
216 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); | 213 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); |
217 | #else | 214 | #else |
218 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | 215 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); |
219 | #endif | 216 | #endif |
220 | 217 | ||
221 | QSize sh = wg->sizeHint(); | 218 | QSize sh = wg->sizeHint(); |
222 | int w = QMAX( sh.width(), wg->width() ); | 219 | int w = QMAX( sh.width(), wg->width() ); |
223 | int h = QMAX( sh.height(), wg->height() ); | 220 | int h = QMAX( sh.height(), wg->height() ); |
224 | // desktop widget-frame taskbar | 221 | // desktop widget-frame taskbar |
225 | w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); | 222 | w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); |
226 | h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); | 223 | h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); |
227 | 224 | ||
228 | wg->resize( w, h ); | 225 | wg->resize( w, h ); |
229 | wg->show(); | 226 | wg->show(); |
230 | } | 227 | } |
231 | } | 228 | } |
232 | } | 229 | } |
233 | 230 | ||
234 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ | 231 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ |
235 | 232 | ||
236 | inline int TransToDeg ( Transformation t ) | 233 | inline int TransToDeg ( Transformation t ) |
237 | { | 234 | { |
238 | int d = static_cast<int>( t ); | 235 | int d = static_cast<int>( t ); |
239 | return d * 90; | 236 | return d * 90; |