summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/configwidget.h3
-rw-r--r--core/pim/today/plugins/datebook/datebook.pro2
-rw-r--r--core/pim/today/plugins/todolist/todolist.pro2
-rw-r--r--core/pim/today/today.pro2
-rw-r--r--core/pim/today/todaybase.h17
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
@@ -2,10 +2,11 @@
2#ifndef CONFIG_WIDGET_H 2#ifndef CONFIG_WIDGET_H
3#define CONFIG_WIDGET_H 3#define CONFIG_WIDGET_H
4 4
5#include <qwidget.h>
5 6
6 7
7class ConfigWidget : public QWidget { 8class ConfigWidget : public QWidget {
8 9 Q_OBJECT
9public: 10public:
10 11
11 ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; 12 ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {};
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
@@ -4,7 +4,7 @@ CONFIG += qt debug
4 4
5# Input 5# Input
6HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ 6HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
7 datebookevent.h datebookpluginwidget.h 7 datebookevent.h datebookpluginwidget.h ../../configwidget.h
8SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ 8SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
9 datebookevent.cpp datebookpluginwidget.cpp 9 datebookevent.cpp datebookpluginwidget.cpp
10 10
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
@@ -5,7 +5,7 @@ CONFIG += qt debug
5 5
6# Input 6# Input
7HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ 7HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \
8 todopluginwidget.h 8 todopluginwidget.h ../../configwidget.h
9SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ 9SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
10 todopluginwidget.cpp 10 todopluginwidget.cpp
11 11
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,7 +1,7 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on debug 2 CONFIG = qt warn_on debug
3 #CONFIG = qt warn_on release 3 #CONFIG = qt warn_on release
4 HEADERS = today.h todaybase.h todayconfig.h 4 HEADERS = today.h todaybase.h todayconfig.h configwidget.h
5 SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp 5 SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
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
@@ -18,6 +18,7 @@
18#define TODAYBASE_H 18#define TODAYBASE_H
19 19
20#include <qlayout.h> 20#include <qlayout.h>
21#include <qguardedptr.h>
21#include <opie/oclickablelabel.h> 22#include <opie/oclickablelabel.h>
22 23
23class QVBox; 24class QVBox;
@@ -36,14 +37,14 @@ public:
36 TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 37 TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
37 ~TodayBase(); 38 ~TodayBase();
38 39
39 QFrame* Frame4; 40 QGuardedPtr<QFrame> Frame4;
40 QPushButton* DatesButton; 41 QGuardedPtr<QPushButton> DatesButton;
41 QVBoxLayout* layout; 42 QGuardedPtr<QVBoxLayout> layout;
42 OClickableLabel* OwnerField; 43 QGuardedPtr<OClickableLabel> OwnerField;
43 QLabel* Frame; 44 QGuardedPtr<QLabel> Frame;
44 QLabel* DateLabel; 45 QGuardedPtr<QLabel> DateLabel;
45 QFrame* Frame15; 46 QGuardedPtr<QFrame> Frame15;
46 OClickableLabel* ConfigButton; 47 QGuardedPtr<OClickableLabel> ConfigButton;
47 48
48protected: 49protected:
49 50