From 62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a Mon Sep 17 00:00:00 2001 From: zecke Date: Sun, 15 Sep 2002 22:11:24 +0000 Subject: revert my changes they we're unwished --- 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 @@ #ifndef CONFIG_WIDGET_H #define CONFIG_WIDGET_H -#include class ConfigWidget : public QWidget { - Q_OBJECT + public: 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() { * Load the plugins */ void Today::loadPlugins() { - qWarning("pluginList count %d", pluginList.count() ); + QValueList::Iterator tit; for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { (*tit).library->unload(); delete (*tit).library; } - pluginList.clear(); QString path = QPEApplication::qpeDir() + "/plugins/today"; QDir dir( path, "lib*.so" ); @@ -159,7 +158,6 @@ void Today::loadPlugins() { delete lib; } } - qWarning("pluginList count end %d", pluginList.count() ); } 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 @@ TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release -HEADERS = today.h todaybase.h todayconfig.h configwidget.h +HEADERS = today.h todaybase.h todayconfig.h SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp INCLUDEPATH += $(OPIEDIR)/include 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 @@ #define TODAYBASE_H #include -#include #include class QVBox; @@ -37,14 +36,14 @@ public: TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~TodayBase(); - QGuardedPtr Frame4; - QGuardedPtr DatesButton; - QGuardedPtr layout; - QGuardedPtr OwnerField; - QGuardedPtr Frame; - QGuardedPtr DateLabel; - QGuardedPtr Frame15; - QGuardedPtr ConfigButton; + QFrame* Frame4; + QPushButton* DatesButton; + QVBoxLayout* layout; + OClickableLabel* OwnerField; + QLabel* Frame; + QLabel* DateLabel; + QFrame* Frame15; + OClickableLabel* ConfigButton; protected: -- cgit v0.9.0.2