5 files changed, 14 insertions, 12 deletions

diff --git a/core/pim/today/configwidget.h b/core/pim/today/configwidget.h
index f449db4..f3a83f9 100644
--- a/core/pim/today/configwidget.h
+++ b/core/pim/today/configwidget.h
@@ -1,12 +1,13 @@
 
 #ifndef CONFIG_WIDGET_H
 #define CONFIG_WIDGET_H
 
+#include <qwidget.h>
 
 
 class ConfigWidget : public QWidget {
-
+    Q_OBJECT  
 public:
 
     ConfigWidget(  QWidget *parent,  const char *name ) : QWidget( parent,  name ) {};
     virtual ~ConfigWidget() {};
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index 615059a..7f5dfed 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -3,9 +3,9 @@ CONFIG -= moc
 CONFIG += qt debug
 
 # Input
 HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
-        datebookevent.h datebookpluginwidget.h
+        datebookevent.h datebookpluginwidget.h ../../configwidget.h
 SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
         datebookevent.cpp datebookpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 1f9c61c..8162985 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -4,9 +4,9 @@ CONFIG -= moc
 CONFIG += qt debug
 
 # Input
 HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h  \
-        todopluginwidget.h
+        todopluginwidget.h ../../configwidget.h
 SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
         todopluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 8596da3..5328d9f 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -1,8 +1,8 @@
         TEMPLATE= app
         CONFIG  = qt warn_on debug
         #CONFIG         = qt warn_on release
-        HEADERS         = today.h todaybase.h todayconfig.h 
+        HEADERS         = today.h todaybase.h todayconfig.h configwidget.h
         SOURCES         = main.cpp today.cpp todaybase.cpp todayconfig.cpp 
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 7c50f32..0e53510 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -17,8 +17,9 @@
 #ifndef TODAYBASE_H
 #define TODAYBASE_H
 
 #include <qlayout.h>
+#include <qguardedptr.h>
 #include <opie/oclickablelabel.h>
 
 class QVBox;
 class QGridLayout;
@@ -35,16 +36,16 @@ class TodayBase : public QWidget
 public:
     TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~TodayBase();
 
-    QFrame* Frame4;
-    QPushButton* DatesButton;
-    QVBoxLayout* layout;
-    OClickableLabel* OwnerField;
-    QLabel* Frame;
-    QLabel* DateLabel;
-    QFrame* Frame15;
-    OClickableLabel* ConfigButton;
+    QGuardedPtr<QFrame> Frame4;
+    QGuardedPtr<QPushButton> DatesButton;
+    QGuardedPtr<QVBoxLayout> layout;
+    QGuardedPtr<OClickableLabel> OwnerField;
+    QGuardedPtr<QLabel> Frame;
+    QGuardedPtr<QLabel> DateLabel;
+    QGuardedPtr<QFrame> Frame15;
+    QGuardedPtr<OClickableLabel> ConfigButton;
 
 protected: