summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -1,14 +1,15 @@
#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() {};
virtual void writeConfig() = 0;
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
@@ -1,13 +1,13 @@
TEMPLATE = lib
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 \
../ ../library
DEPENDPATH += $(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
@@ -2,13 +2,13 @@ TEMPLATE = lib
#TEMPLATE = app
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 \
../ ../library
DEPENDPATH += $(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,10 +1,10 @@
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
INTERFACES =
TARGET = today
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
@@ -15,12 +15,13 @@
***************************************************************************/
#ifndef TODAYBASE_H
#define TODAYBASE_H
#include <qlayout.h>
+#include <qguardedptr.h>
#include <opie/oclickablelabel.h>
class QVBox;
class QGridLayout;
class QFrame;
class QLabel;
@@ -33,20 +34,20 @@ class TodayBase : public QWidget
Q_OBJECT
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:
};