author | zecke <zecke> | 2002-09-15 21:56:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-15 21:56:23 (UTC) |
commit | e288526f385ab520da2f625590d463d2bb1ff687 (patch) (unidiff) | |
tree | 9b6fe69cdac660e644f9264d550bcab5c57e84f7 | |
parent | 06dc621befb0dc8d0899a9cf80352ffc7fbb9443 (diff) | |
download | opie-e288526f385ab520da2f625590d463d2bb1ff687.zip opie-e288526f385ab520da2f625590d463d2bb1ff687.tar.gz opie-e288526f385ab520da2f625590d463d2bb1ff687.tar.bz2 |
Fix some runtime warnings
make configwidget.h include Q_OBJECT
add configwidget.h to the plugins
use QGuardedPtr inside TodayBase for better debugging
-rw-r--r-- | core/pim/today/configwidget.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebook.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todolist.pro | 2 | ||||
-rw-r--r-- | core/pim/today/today.pro | 2 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 17 |
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,17 +1,18 @@ | |||
1 | 1 | ||
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 | ||
7 | class ConfigWidget : public QWidget { | 8 | class ConfigWidget : public QWidget { |
8 | 9 | Q_OBJECT | |
9 | public: | 10 | public: |
10 | 11 | ||
11 | ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; | 12 | ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; |
12 | virtual ~ConfigWidget() {}; | 13 | virtual ~ConfigWidget() {}; |
13 | 14 | ||
14 | virtual void writeConfig() = 0; | 15 | virtual void writeConfig() = 0; |
15 | }; | 16 | }; |
16 | 17 | ||
17 | #endif | 18 | #endif |
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,19 +1,19 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += qt debug | 3 | CONFIG += qt debug |
4 | 4 | ||
5 | # Input | 5 | # Input |
6 | HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ | 6 | HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ |
7 | datebookevent.h datebookpluginwidget.h | 7 | datebookevent.h datebookpluginwidget.h ../../configwidget.h |
8 | SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ | 8 | SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ |
9 | datebookevent.cpp datebookpluginwidget.cpp | 9 | datebookevent.cpp datebookpluginwidget.cpp |
10 | 10 | ||
11 | INCLUDEPATH += $(OPIEDIR)/include \ | 11 | INCLUDEPATH += $(OPIEDIR)/include \ |
12 | ../ ../library | 12 | ../ ../library |
13 | DEPENDPATH += $(OPIEDIR)/include \ | 13 | DEPENDPATH += $(OPIEDIR)/include \ |
14 | ../ ../library | 14 | ../ ../library |
15 | 15 | ||
16 | LIBS+= -lqpe -lopie | 16 | LIBS+= -lqpe -lopie |
17 | 17 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | DESTDIR = $(OPIEDIR)/plugins/today |
19 | TARGET = todaydatebookplugin \ No newline at end of file | 19 | TARGET = todaydatebookplugin \ No newline at end of file |
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 | |||
@@ -1,20 +1,20 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #TEMPLATE = app | 2 | #TEMPLATE = app |
3 | CONFIG -= moc | 3 | CONFIG -= moc |
4 | CONFIG += qt debug | 4 | CONFIG += qt debug |
5 | 5 | ||
6 | # Input | 6 | # Input |
7 | HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ | 7 | HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ |
8 | todopluginwidget.h | 8 | todopluginwidget.h ../../configwidget.h |
9 | SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ | 9 | SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ |
10 | todopluginwidget.cpp | 10 | todopluginwidget.cpp |
11 | 11 | ||
12 | INCLUDEPATH += $(OPIEDIR)/include \ | 12 | INCLUDEPATH += $(OPIEDIR)/include \ |
13 | ../ ../library | 13 | ../ ../library |
14 | DEPENDPATH += $(OPIEDIR)/include \ | 14 | DEPENDPATH += $(OPIEDIR)/include \ |
15 | ../ ../library | 15 | ../ ../library |
16 | 16 | ||
17 | LIBS+= -lqpe -lopie | 17 | LIBS+= -lqpe -lopie |
18 | 18 | ||
19 | DESTDIR = $(OPIEDIR)/plugins/today | 19 | DESTDIR = $(OPIEDIR)/plugins/today |
20 | TARGET = todaytodolistplugin \ No newline at end of file | 20 | TARGET = todaytodolistplugin \ No newline at end of file |
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,27 +1,27 @@ | |||
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 |
8 | LIBS += -lqpe -lopie | 8 | LIBS += -lqpe -lopie |
9 | INTERFACES= | 9 | INTERFACES= |
10 | TARGET = today | 10 | TARGET = today |
11 | DESTDIR = $(OPIEDIR)/bin | 11 | DESTDIR = $(OPIEDIR)/bin |
12 | 12 | ||
13 | TRANSLATIONS = ../../../i18n/de/today.ts \ | 13 | TRANSLATIONS = ../../../i18n/de/today.ts \ |
14 | ../../../i18n/en/today.ts \ | 14 | ../../../i18n/en/today.ts \ |
15 | ../../../i18n/es/today.ts \ | 15 | ../../../i18n/es/today.ts \ |
16 | ../../../i18n/fr/today.ts \ | 16 | ../../../i18n/fr/today.ts \ |
17 | ../../../i18n/hu/today.ts \ | 17 | ../../../i18n/hu/today.ts \ |
18 | ../../../i18n/ja/today.ts \ | 18 | ../../../i18n/ja/today.ts \ |
19 | ../../../i18n/ko/today.ts \ | 19 | ../../../i18n/ko/today.ts \ |
20 | ../../../i18n/no/today.ts \ | 20 | ../../../i18n/no/today.ts \ |
21 | ../../../i18n/pl/today.ts \ | 21 | ../../../i18n/pl/today.ts \ |
22 | ../../../i18n/pt/today.ts \ | 22 | ../../../i18n/pt/today.ts \ |
23 | ../../../i18n/pt_BR/today.ts \ | 23 | ../../../i18n/pt_BR/today.ts \ |
24 | ../../../i18n/sl/today.ts \ | 24 | ../../../i18n/sl/today.ts \ |
25 | ../../../i18n/zh_CN/today.ts \ | 25 | ../../../i18n/zh_CN/today.ts \ |
26 | ../../../i18n/zh_TW/today.ts \ | 26 | ../../../i18n/zh_TW/today.ts \ |
27 | ../../../i18n/it/today.ts \ No newline at end of file | 27 | ../../../i18n/it/today.ts \ No newline at end of file |
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 | |||
@@ -1,53 +1,54 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.h | 2 | * todaybase.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef TODAYBASE_H | 17 | #ifndef TODAYBASE_H |
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 | ||
23 | class QVBox; | 24 | class QVBox; |
24 | class QGridLayout; | 25 | class QGridLayout; |
25 | class QFrame; | 26 | class QFrame; |
26 | class QLabel; | 27 | class QLabel; |
27 | class QPushButton; | 28 | class QPushButton; |
28 | class QBoxLayout; | 29 | class QBoxLayout; |
29 | 30 | ||
30 | 31 | ||
31 | class TodayBase : public QWidget | 32 | class TodayBase : public QWidget |
32 | { | 33 | { |
33 | Q_OBJECT | 34 | Q_OBJECT |
34 | 35 | ||
35 | public: | 36 | 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 | ||
48 | protected: | 49 | protected: |
49 | 50 | ||
50 | 51 | ||
51 | }; | 52 | }; |
52 | 53 | ||
53 | #endif | 54 | #endif |