-rw-r--r-- | core/launcher/systray.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/launcher/systray.h b/core/launcher/systray.h index 5a6849a..77c581f 100644 --- a/core/launcher/systray.h +++ b/core/launcher/systray.h | |||
@@ -21,7 +21,9 @@ | |||
21 | #ifndef __SYSTRAY_H__ | 21 | #ifndef __SYSTRAY_H__ |
22 | #define __SYSTRAY_H__ | 22 | #define __SYSTRAY_H__ |
23 | 23 | ||
24 | #include <qpe/taskbarappletinterface.h> | 24 | #ifndef QT_NO_COMPONENT |
25 | #include <qtopia/taskbarappletinterface.h> | ||
26 | #endif | ||
25 | 27 | ||
26 | #include <qframe.h> | 28 | #include <qframe.h> |
27 | #include <qvaluelist.h> | 29 | #include <qvaluelist.h> |
@@ -33,25 +35,23 @@ struct TaskbarApplet | |||
33 | { | 35 | { |
34 | #ifndef QT_NO_COMPONENT | 36 | #ifndef QT_NO_COMPONENT |
35 | QLibrary *library; | 37 | QLibrary *library; |
36 | #endif | ||
37 | TaskbarAppletInterface *iface; | 38 | TaskbarAppletInterface *iface; |
39 | #endif | ||
38 | QWidget *applet; | 40 | QWidget *applet; |
41 | QString name; | ||
39 | }; | 42 | }; |
40 | 43 | ||
41 | class SysTray : public QFrame { | 44 | class SysTray : public QFrame { |
42 | Q_OBJECT | 45 | Q_OBJECT |
43 | public: | 46 | public: |
44 | SysTray( QWidget *parent ); | 47 | SysTray( QWidget *parent ); |
48 | ~SysTray(); | ||
45 | 49 | ||
46 | void clearApplets(); | 50 | void clearApplets(); |
47 | void addApplets(); | 51 | void addApplets(); |
48 | 52 | ||
49 | protected: | ||
50 | void timerEvent(QTimerEvent* e); | ||
51 | |||
52 | private: | 53 | private: |
53 | void loadApplets(); | 54 | void loadApplets(); |
54 | int safety_tid; | ||
55 | QHBoxLayout *layout; | 55 | QHBoxLayout *layout; |
56 | QValueList<TaskbarApplet> appletList; | 56 | QValueList<TaskbarApplet> appletList; |
57 | }; | 57 | }; |