author | zecke <zecke> | 2002-09-15 22:11:24 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-15 22:11:24 (UTC) |
commit | 62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a (patch) (unidiff) | |
tree | 635a895479b4c93978b0fc0a9b55971a51f8afbe /core/pim | |
parent | 7b2b6ecd7c26b983a0dd6a16412edf1e751082d0 (diff) | |
download | opie-62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a.zip opie-62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a.tar.gz opie-62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a.tar.bz2 |
revert my changes they we're unwished
-rw-r--r-- | core/pim/today/configwidget.h | 3 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/today.pro | 2 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 17 |
4 files changed, 11 insertions, 15 deletions
diff --git a/core/pim/today/configwidget.h b/core/pim/today/configwidget.h index f3a83f9..f449db4 100644 --- a/core/pim/today/configwidget.h +++ b/core/pim/today/configwidget.h | |||
@@ -1,15 +1,14 @@ | |||
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> | ||
6 | 5 | ||
7 | 6 | ||
8 | class ConfigWidget : public QWidget { | 7 | class ConfigWidget : public QWidget { |
9 | Q_OBJECT | 8 | |
10 | public: | 9 | public: |
11 | 10 | ||
12 | ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; | 11 | ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; |
13 | virtual ~ConfigWidget() {}; | 12 | virtual ~ConfigWidget() {}; |
14 | 13 | ||
15 | virtual void writeConfig() = 0; | 14 | virtual void writeConfig() = 0; |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 7decf8e..09540bd 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -115,19 +115,18 @@ void Today::init() { | |||
115 | 115 | ||
116 | 116 | ||
117 | /** | 117 | /** |
118 | * Load the plugins | 118 | * Load the plugins |
119 | */ | 119 | */ |
120 | void Today::loadPlugins() { | 120 | void Today::loadPlugins() { |
121 | qWarning("pluginList count %d", pluginList.count() ); | 121 | |
122 | QValueList<TodayPlugin>::Iterator tit; | 122 | QValueList<TodayPlugin>::Iterator tit; |
123 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { | 123 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { |
124 | (*tit).library->unload(); | 124 | (*tit).library->unload(); |
125 | delete (*tit).library; | 125 | delete (*tit).library; |
126 | } | 126 | } |
127 | pluginList.clear(); | ||
128 | 127 | ||
129 | QString path = QPEApplication::qpeDir() + "/plugins/today"; | 128 | QString path = QPEApplication::qpeDir() + "/plugins/today"; |
130 | QDir dir( path, "lib*.so" ); | 129 | QDir dir( path, "lib*.so" ); |
131 | 130 | ||
132 | QStringList list = dir.entryList(); | 131 | QStringList list = dir.entryList(); |
133 | QStringList::Iterator it; | 132 | QStringList::Iterator it; |
@@ -156,13 +155,12 @@ void Today::loadPlugins() { | |||
156 | count++; | 155 | count++; |
157 | } else { | 156 | } else { |
158 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); | 157 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); |
159 | delete lib; | 158 | delete lib; |
160 | } | 159 | } |
161 | } | 160 | } |
162 | qWarning("pluginList count end %d", pluginList.count() ); | ||
163 | } | 161 | } |
164 | 162 | ||
165 | 163 | ||
166 | /** | 164 | /** |
167 | * Repaint method. Reread all fields. | 165 | * Repaint method. Reread all fields. |
168 | */ | 166 | */ |
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index 5328d9f..8596da3 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro | |||
@@ -1,10 +1,10 @@ | |||
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 configwidget.h | 4 | HEADERS = today.h todaybase.h todayconfig.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 |
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index 0e53510..7c50f32 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h | |||
@@ -15,13 +15,12 @@ | |||
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> | ||
22 | #include <opie/oclickablelabel.h> | 21 | #include <opie/oclickablelabel.h> |
23 | 22 | ||
24 | class QVBox; | 23 | class QVBox; |
25 | class QGridLayout; | 24 | class QGridLayout; |
26 | class QFrame; | 25 | class QFrame; |
27 | class QLabel; | 26 | class QLabel; |
@@ -34,20 +33,20 @@ class TodayBase : public QWidget | |||
34 | Q_OBJECT | 33 | Q_OBJECT |
35 | 34 | ||
36 | public: | 35 | public: |
37 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 36 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
38 | ~TodayBase(); | 37 | ~TodayBase(); |
39 | 38 | ||
40 | QGuardedPtr<QFrame> Frame4; | 39 | QFrame* Frame4; |
41 | QGuardedPtr<QPushButton> DatesButton; | 40 | QPushButton* DatesButton; |
42 | QGuardedPtr<QVBoxLayout> layout; | 41 | QVBoxLayout* layout; |
43 | QGuardedPtr<OClickableLabel> OwnerField; | 42 | OClickableLabel* OwnerField; |
44 | QGuardedPtr<QLabel> Frame; | 43 | QLabel* Frame; |
45 | QGuardedPtr<QLabel> DateLabel; | 44 | QLabel* DateLabel; |
46 | QGuardedPtr<QFrame> Frame15; | 45 | QFrame* Frame15; |
47 | QGuardedPtr<OClickableLabel> ConfigButton; | 46 | OClickableLabel* ConfigButton; |
48 | 47 | ||
49 | protected: | 48 | protected: |
50 | 49 | ||
51 | 50 | ||
52 | }; | 51 | }; |
53 | 52 | ||