author | erik <erik> | 2007-01-19 01:15:31 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-19 01:15:31 (UTC) |
commit | ac0ce844e90a64247c0adb210e0a23021b011d57 (patch) (unidiff) | |
tree | 1fd3b8d0c24d8f2054ed45e7e2e102f940343462 /library/qpeapplication.h | |
parent | 1ab92f1d2b346de7da8ca5c3aaa6bc75b43981e7 (diff) | |
download | opie-ac0ce844e90a64247c0adb210e0a23021b011d57.zip opie-ac0ce844e90a64247c0adb210e0a23021b011d57.tar.gz opie-ac0ce844e90a64247c0adb210e0a23021b011d57.tar.bz2 |
Commit of Paul's patch to remove a macro and substitute it with a
class variable.
-rw-r--r-- | library/qpeapplication.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 6486cad..7c99a9a 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -92,96 +92,98 @@ public: | |||
92 | static void setDefaultRotation(int r); | 92 | static void setDefaultRotation(int r); |
93 | static void setCurrentRotation(int r); | 93 | static void setCurrentRotation(int r); |
94 | static void setCurrentMode(int x, int y, int depth ); | 94 | static void setCurrentMode(int x, int y, int depth ); |
95 | static void grabKeyboard(); | 95 | static void grabKeyboard(); |
96 | static void ungrabKeyboard(); | 96 | static void ungrabKeyboard(); |
97 | 97 | ||
98 | enum StylusMode { | 98 | enum StylusMode { |
99 | LeftOnly, | 99 | LeftOnly, |
100 | RightOnHold | 100 | RightOnHold |
101 | // RightOnHoldLeftDelayed, etc. | 101 | // RightOnHoldLeftDelayed, etc. |
102 | }; | 102 | }; |
103 | static void setStylusOperation( QWidget*, StylusMode ); | 103 | static void setStylusOperation( QWidget*, StylusMode ); |
104 | static StylusMode stylusOperation( QWidget* ); | 104 | static StylusMode stylusOperation( QWidget* ); |
105 | 105 | ||
106 | enum InputMethodHint { | 106 | enum InputMethodHint { |
107 | Normal, | 107 | Normal, |
108 | AlwaysOff, | 108 | AlwaysOff, |
109 | AlwaysOn | 109 | AlwaysOn |
110 | }; | 110 | }; |
111 | 111 | ||
112 | enum screenSaverHint { | 112 | enum screenSaverHint { |
113 | Disable = 0, | 113 | Disable = 0, |
114 | DisableLightOff = 1, | 114 | DisableLightOff = 1, |
115 | DisableSuspend = 2, | 115 | DisableSuspend = 2, |
116 | Enable = 100 | 116 | Enable = 100 |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static void setInputMethodHint( QWidget *, InputMethodHint ); | 119 | static void setInputMethodHint( QWidget *, InputMethodHint ); |
120 | static InputMethodHint inputMethodHint( QWidget * ); | 120 | static InputMethodHint inputMethodHint( QWidget * ); |
121 | 121 | ||
122 | void showMainWidget( QWidget*, bool nomax=FALSE ); | 122 | void showMainWidget( QWidget*, bool nomax=FALSE ); |
123 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); | 123 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); |
124 | 124 | ||
125 | static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; | 125 | static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; |
126 | static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; | 126 | static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; |
127 | static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; | 127 | static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; |
128 | /* Merge setTempScreenSaverMode */ | 128 | /* Merge setTempScreenSaverMode */ |
129 | #ifdef QTOPIA_INTERNAL_INITAPP | 129 | #ifdef QTOPIA_INTERNAL_INITAPP |
130 | void initApp( int argv, char **argv ); | 130 | void initApp( int argv, char **argv ); |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | static void setKeepRunning(); | 133 | static void setKeepRunning(); |
134 | bool keepRunning() const; | 134 | bool keepRunning() const; |
135 | 135 | ||
136 | bool keyboardGrabbed() const; | 136 | bool keyboardGrabbed() const; |
137 | 137 | ||
138 | int exec(); | 138 | int exec(); |
139 | 139 | ||
140 | static bool isSaveWindowsPos(); | ||
141 | |||
140 | signals: | 142 | signals: |
141 | void clientMoused(); | 143 | void clientMoused(); |
142 | void timeChanged(); | 144 | void timeChanged(); |
143 | void clockChanged( bool pm ); | 145 | void clockChanged( bool pm ); |
144 | void micChanged( bool muted ); | 146 | void micChanged( bool muted ); |
145 | void volumeChanged( bool muted ); | 147 | void volumeChanged( bool muted ); |
146 | void appMessage( const QCString& msg, const QByteArray& data); | 148 | void appMessage( const QCString& msg, const QByteArray& data); |
147 | void weekChanged( bool startOnMonday ); | 149 | void weekChanged( bool startOnMonday ); |
148 | void dateFormatChanged( DateFormat ); | 150 | void dateFormatChanged( DateFormat ); |
149 | void flush(); | 151 | void flush(); |
150 | void reload(); | 152 | void reload(); |
151 | /* linkChanged signal */ | 153 | /* linkChanged signal */ |
152 | 154 | ||
153 | private slots: | 155 | private slots: |
154 | void systemMessage( const QCString &msg, const QByteArray &data ); | 156 | void systemMessage( const QCString &msg, const QByteArray &data ); |
155 | void pidMessage( const QCString &msg, const QByteArray &data ); | 157 | void pidMessage( const QCString &msg, const QByteArray &data ); |
156 | void removeSenderFromStylusDict(); | 158 | void removeSenderFromStylusDict(); |
157 | void hideOrQuit(); | 159 | void hideOrQuit(); |
158 | 160 | ||
159 | protected: | 161 | protected: |
160 | bool qwsEventFilter( QWSEvent * ); | 162 | bool qwsEventFilter( QWSEvent * ); |
161 | void internalSetStyle( const QString &style ); | 163 | void internalSetStyle( const QString &style ); |
162 | void prepareForTermination(bool willrestart); | 164 | void prepareForTermination(bool willrestart); |
163 | virtual void restart(); | 165 | virtual void restart(); |
164 | virtual void shutdown(); | 166 | virtual void shutdown(); |
165 | bool eventFilter( QObject *, QEvent * ); | 167 | bool eventFilter( QObject *, QEvent * ); |
166 | void timerEvent( QTimerEvent * ); | 168 | void timerEvent( QTimerEvent * ); |
167 | bool raiseAppropriateWindow(); | 169 | bool raiseAppropriateWindow(); |
168 | virtual void tryQuit(); | 170 | virtual void tryQuit(); |
169 | private: | 171 | private: |
170 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 172 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
171 | void processQCopFile(); | 173 | void processQCopFile(); |
172 | 174 | ||
173 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 175 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
174 | QCopChannel *sysChannel; | 176 | QCopChannel *sysChannel; |
175 | QCopChannel *pidChannel; | 177 | QCopChannel *pidChannel; |
176 | #endif | 178 | #endif |
177 | QPEApplicationData *d; | 179 | QPEApplicationData *d; |
178 | 180 | ||
179 | bool reserved_sh; | 181 | bool reserved_sh; |
180 | 182 | ||
181 | }; | 183 | }; |
182 | 184 | ||
183 | 185 | ||
184 | 186 | ||
185 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ | 187 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ |
186 | 188 | ||
187 | inline int TransToDeg ( Transformation t ) | 189 | inline int TransToDeg ( Transformation t ) |