author | harlekin <harlekin> | 2004-06-03 20:36:44 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-06-03 20:36:44 (UTC) |
commit | 52f849d3031f9d2fad2272ad069e7a1456c0ee54 (patch) (unidiff) | |
tree | 7d03d229363b81c40d180ee99d168e99c4f6c06e /core/pim/today/today.h | |
parent | 74109985fd9ebdffd6cf0416207a69b17b563fd6 (diff) | |
download | opie-52f849d3031f9d2fad2272ad069e7a1456c0ee54.zip opie-52f849d3031f9d2fad2272ad069e7a1456c0ee54.tar.gz opie-52f849d3031f9d2fad2272ad069e7a1456c0ee54.tar.bz2 |
updated today to use the new opluginloader, migration not finished yet but mostly working
-rw-r--r-- | core/pim/today/today.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 89170e1..c947ae1 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -22,23 +22,33 @@ | |||
22 | 22 | ||
23 | #include <opie2/todayplugininterface.h> | 23 | #include <opie2/todayplugininterface.h> |
24 | #include <opie2/oclickablelabel.h> | 24 | #include <opie2/oclickablelabel.h> |
25 | #include <opie2/opluginloader.h> | ||
25 | 26 | ||
26 | #include <qpe/qlibrary.h> | 27 | #include <qpe/qlibrary.h> |
27 | 28 | ||
28 | #include <qscrollview.h> | 29 | #include <qscrollview.h> |
29 | #include <qvbox.h> | 30 | #include <qvbox.h> |
30 | 31 | ||
31 | 32 | ||
32 | class QVBoxLayout; | 33 | class QVBoxLayout; |
33 | 34 | ||
35 | namespace Opie { | ||
36 | namespace Core { | ||
37 | class OPluginManager; | ||
38 | class OPluginLoader; | ||
39 | } | ||
40 | } | ||
41 | |||
34 | class Today : public TodayBase { | 42 | class Today : public TodayBase { |
35 | 43 | ||
36 | Q_OBJECT | 44 | Q_OBJECT |
37 | 45 | ||
38 | public: | 46 | public: |
39 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 47 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
40 | ~Today(); | 48 | ~Today(); |
41 | static QString appName() { return QString::fromLatin1("today"); } | 49 | static QString appName() { |
50 | return QString::fromLatin1("today"); | ||
51 | } | ||
42 | 52 | ||
43 | private slots: | 53 | private slots: |
44 | void startConfig(); | 54 | void startConfig(); |
@@ -50,16 +60,15 @@ private: | |||
50 | void init(); | 60 | void init(); |
51 | void setOwnerField(); | 61 | void setOwnerField(); |
52 | void setOwnerField(QString &string); | 62 | void setOwnerField(QString &string); |
53 | void loadPlugins(); | 63 | void initialize(); |
54 | void draw(); | ||
55 | void reinitialize(); | ||
56 | 64 | ||
57 | void setRefreshTimer( int ); | 65 | void setRefreshTimer( int ); |
58 | 66 | ||
59 | private slots: | 67 | private slots: |
60 | void channelReceived(const QCString &msg, const QByteArray & data); | 68 | void channelReceived(const QCString &msg, const QByteArray & data); |
69 | void loadPlugins(); | ||
61 | 70 | ||
62 | private: | 71 | private: |
63 | TodayConfig *conf; | 72 | TodayConfig *conf; |
64 | QStringList m_excludeApplets; | 73 | QStringList m_excludeApplets; |
65 | QStringList m_allApplets; | 74 | QStringList m_allApplets; |
@@ -68,7 +77,8 @@ private slots: | |||
68 | QWidget* m_big_box; | 77 | QWidget* m_big_box; |
69 | QVBoxLayout *m_bblayout; | 78 | QVBoxLayout *m_bblayout; |
70 | 79 | ||
71 | 80 | Opie::Core::OPluginLoader *m_pluginLoader; | |
81 | Opie::Core::OPluginManager *m_manager; | ||
72 | 82 | ||
73 | QTimer *m_refreshTimer; | 83 | QTimer *m_refreshTimer; |
74 | 84 | ||
@@ -78,5 +88,4 @@ private slots: | |||
78 | int m_maxCharClip; | 88 | int m_maxCharClip; |
79 | int m_hideBanner; | 89 | int m_hideBanner; |
80 | }; | 90 | }; |
81 | |||
82 | #endif | 91 | #endif |