Diffstat (limited to 'pwmanager/pwmanager/pwminit.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/pwminit.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pwmanager/pwmanager/pwminit.h b/pwmanager/pwmanager/pwminit.h index bf72093..32d1b4f 100644 --- a/pwmanager/pwmanager/pwminit.h +++ b/pwmanager/pwmanager/pwminit.h | |||
@@ -15,27 +15,26 @@ | |||
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #ifndef __PWMINIT_H | 20 | #ifndef __PWMINIT_H |
21 | #define __PWMINIT_H | 21 | #define __PWMINIT_H |
22 | 22 | ||
23 | #include <qvaluelist.h> | 23 | #include <q3valuelist.h> |
24 | #include <qobject.h> | 24 | #include <qobject.h> |
25 | #ifndef PWM_EMBEDDED | 25 | #ifndef PWM_EMBEDDED |
26 | #include <kuniqueapplication.h> | 26 | #include <kuniqueapplication.h> |
27 | #else //PWM_EMBEDDED | 27 | #else //PWM_EMBEDDED |
28 | 28 | ||
29 | #ifndef DESKTOP_VERSION | 29 | #ifndef DESKTOP_VERSION |
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #else //DESKTOP_VERSION | 31 | #else //DESKTOP_VERSION |
32 | #include <qapplication.h> | 32 | #include <qapplication.h> |
33 | #include <qplatinumstyle.h> | ||
34 | #endif //DESKTOP_VERSION | 33 | #endif //DESKTOP_VERSION |
35 | 34 | ||
36 | #include <kapplication.h> | 35 | #include <kapplication.h> |
37 | #endif //PWM_EMBEDDED | 36 | #endif //PWM_EMBEDDED |
38 | 37 | ||
39 | #include "globalstuff.h" | 38 | #include "globalstuff.h" |
40 | 39 | ||
41 | class DCOPClient; | 40 | class DCOPClient; |
@@ -45,17 +44,17 @@ class KApplication; | |||
45 | class QWidget; | 44 | class QWidget; |
46 | class PwM; | 45 | class PwM; |
47 | class PwMTray; | 46 | class PwMTray; |
48 | class PwMDoc; | 47 | class PwMDoc; |
49 | class PwMInit; | 48 | class PwMInit; |
50 | 49 | ||
51 | /** main application class */ | 50 | /** main application class */ |
52 | #ifndef PWM_EMBEDDED | 51 | #ifndef PWM_EMBEDDED |
53 | //MOC_SKIP_BEGIN | 52 | #ifndef Q_MOC_RUN |
54 | class PwMApplication : public KUniqueApplication | 53 | class PwMApplication : public KUniqueApplication |
55 | { | 54 | { |
56 | public: | 55 | public: |
57 | PwMApplication(bool allowStyles=true, | 56 | PwMApplication(bool allowStyles=true, |
58 | bool GUIenabled=true, | 57 | bool GUIenabled=true, |
59 | bool configUnique=false) | 58 | bool configUnique=false) |
60 | : KUniqueApplication(allowStyles, GUIenabled, configUnique) | 59 | : KUniqueApplication(allowStyles, GUIenabled, configUnique) |
61 | , init (0) | 60 | , init (0) |
@@ -63,17 +62,17 @@ public: | |||
63 | ~PwMApplication() | 62 | ~PwMApplication() |
64 | { delete_ifnot_null(init); } | 63 | { delete_ifnot_null(init); } |
65 | 64 | ||
66 | int newInstance(); | 65 | int newInstance(); |
67 | 66 | ||
68 | protected: | 67 | protected: |
69 | PwMInit *init; | 68 | PwMInit *init; |
70 | }; | 69 | }; |
71 | //MOC_SKIP_END | 70 | #endif |
72 | #else //PWM_EMBEDDED | 71 | #else //PWM_EMBEDDED |
73 | 72 | ||
74 | #ifndef DESKTOP_VERSION | 73 | #ifndef DESKTOP_VERSION |
75 | class PwMApplication : public QPEApplication | 74 | class PwMApplication : public QPEApplication |
76 | { | 75 | { |
77 | public: | 76 | public: |
78 | PwMApplication(int & argc, char ** argv); | 77 | PwMApplication(int & argc, char ** argv); |
79 | ~PwMApplication(); | 78 | ~PwMApplication(); |
@@ -149,17 +148,17 @@ public: | |||
149 | { return _kwalletEmu; } | 148 | { return _kwalletEmu; } |
150 | /** returns a pointer to the keycard interface */ | 149 | /** returns a pointer to the keycard interface */ |
151 | PwMKeyCard * keycard() | 150 | PwMKeyCard * keycard() |
152 | { return _keycard; } | 151 | { return _keycard; } |
153 | /** returns a pointer to the tray icon */ | 152 | /** returns a pointer to the tray icon */ |
154 | PwMTray * tray() | 153 | PwMTray * tray() |
155 | { return _tray; } | 154 | { return _tray; } |
156 | /** returns a list of all open main windows */ | 155 | /** returns a list of all open main windows */ |
157 | const QValueList<PwM *> * mainWndList() | 156 | const Q3ValueList<PwM *> * mainWndList() |
158 | { return &_mainWndList; } | 157 | { return &_mainWndList; } |
159 | /** create a new document */ | 158 | /** create a new document */ |
160 | PwMDoc * createDoc(); | 159 | PwMDoc * createDoc(); |
161 | /** create a new PwM main window */ | 160 | /** create a new PwM main window */ |
162 | PwM * createMainWnd(const QString &loadFile = QString::null, | 161 | PwM * createMainWnd(const QString &loadFile = QString::null, |
163 | bool loadFileDeepLocked = false, | 162 | bool loadFileDeepLocked = false, |
164 | bool virginity = true, | 163 | bool virginity = true, |
165 | PwMDoc *doc = 0, | 164 | PwMDoc *doc = 0, |
@@ -209,14 +208,14 @@ protected: | |||
209 | DCOPClient *_dcopClient; | 208 | DCOPClient *_dcopClient; |
210 | /** pointer to the KWallet emulation */ | 209 | /** pointer to the KWallet emulation */ |
211 | KWalletEmu *_kwalletEmu; | 210 | KWalletEmu *_kwalletEmu; |
212 | /** pointer to the keycard interface */ | 211 | /** pointer to the keycard interface */ |
213 | PwMKeyCard *_keycard; | 212 | PwMKeyCard *_keycard; |
214 | /** pointer to the tray icon */ | 213 | /** pointer to the tray icon */ |
215 | PwMTray *_tray; | 214 | PwMTray *_tray; |
216 | /** list of all open main windows */ | 215 | /** list of all open main windows */ |
217 | QValueList<PwM *> _mainWndList; | 216 | Q3ValueList<PwM *> _mainWndList; |
218 | /** saved command line options. */ | 217 | /** saved command line options. */ |
219 | savedCmd_t savedCmd; | 218 | savedCmd_t savedCmd; |
220 | }; | 219 | }; |
221 | 220 | ||
222 | #endif // __PWMINIT_H | 221 | #endif // __PWMINIT_H |