summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-15 22:11:24 (UTC)
committer zecke <zecke>2002-09-15 22:11:24 (UTC)
commit62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a (patch) (unidiff)
tree635a895479b4c93978b0fc0a9b55971a51f8afbe
parent7b2b6ecd7c26b983a0dd6a16412edf1e751082d0 (diff)
downloadopie-62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a.zip
opie-62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a.tar.gz
opie-62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a.tar.bz2
revert my changes they we're unwished
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/configwidget.h3
-rw-r--r--core/pim/today/today.cpp4
-rw-r--r--core/pim/today/today.pro2
-rw-r--r--core/pim/today/todaybase.h17
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
@@ -2,11 +2,10 @@
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
8class ConfigWidget : public QWidget { 7class ConfigWidget : public QWidget {
9 Q_OBJECT 8
10public: 9public:
11 10
12 ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; 11 ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {};
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
@@ -118,13 +118,12 @@ void Today::init() {
118 * Load the plugins 118 * Load the plugins
119 */ 119 */
120void Today::loadPlugins() { 120void 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" );
@@ -159,7 +158,6 @@ void Today::loadPlugins() {
159 delete lib; 158 delete lib;
160 } 159 }
161 } 160 }
162 qWarning("pluginList count end %d", pluginList.count() );
163} 161}
164 162
165 163
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,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 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
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
@@ -18,7 +18,6 @@
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
24class QVBox; 23class QVBox;
@@ -37,14 +36,14 @@ 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
49protected: 48protected:
50 49