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
@@ -13,70 +13,79 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 #ifndef TODAY_H
 #define TODAY_H
 
 
 #include "todayconfig.h"
 #include "todaybase.h"
 
 #include <opie2/todayplugininterface.h>
 #include <opie2/oclickablelabel.h>
+#include <opie2/opluginloader.h>
 
 #include <qpe/qlibrary.h>
 
 #include <qscrollview.h>
 #include <qvbox.h>
 
- 
+
 class QVBoxLayout;
 
+namespace Opie {
+    namespace Core {
+        class OPluginManager;
+        class OPluginLoader;
+    }
+}
+
 class Today : public TodayBase {
 
     Q_OBJECT
 
-  public:
+public:
     Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Today();
-    static QString appName() { return QString::fromLatin1("today"); }
+    static QString appName() {
+        return QString::fromLatin1("today");
+    }
 
 private slots:
     void startConfig();
     void startApplication();
     void editCard();
     void refresh();
 
 private:
     void init();
     void setOwnerField();
     void setOwnerField(QString &string);
-    void loadPlugins();
-    void draw();
-    void reinitialize();
+    void initialize();
 
     void setRefreshTimer( int );
 
 private slots:
     void channelReceived(const QCString &msg, const QByteArray & data);
+    void loadPlugins();
 
- private:
+private:
     TodayConfig *conf;
     QStringList m_excludeApplets;
     QStringList m_allApplets;
 
     QScrollView *m_sv;
     QWidget* m_big_box;
     QVBoxLayout *m_bblayout;
 
-   
+    Opie::Core::OPluginLoader *m_pluginLoader;
+    Opie::Core::OPluginManager *m_manager;
 
     QTimer *m_refreshTimer;
 
     bool m_refreshTimerEnabled;
     int m_newStart;
     int m_iconSize;
     int m_maxCharClip;
     int m_hideBanner;
 };
-
 #endif