-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,17 +1,16 @@ #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/today.cpp b/core/pim/today/today.cpp index 7decf8e..09540bd 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -113,23 +113,22 @@ void Today::init() { m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); } /** * Load the plugins */ void Today::loadPlugins() { - qWarning("pluginList count %d", pluginList.count() ); + QValueList<TodayPlugin>::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" ); QStringList list = dir.entryList(); QStringList::Iterator it; uint count = 0; @@ -154,17 +153,16 @@ void Today::loadPlugins() { plugin.guiPart = plugin.iface->guiPart(); pluginList.append( plugin ); count++; } else { qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); delete lib; } } - qWarning("pluginList count end %d", pluginList.count() ); } /** * Repaint method. Reread all fields. */ void Today::draw() { 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,12 +1,12 @@ 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 LIBS += -lqpe -lopie INTERFACES = TARGET = today DESTDIR = $(OPIEDIR)/bin 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 @@ -13,17 +13,16 @@ * (at your option) any later version. * * * ***************************************************************************/ #ifndef TODAYBASE_H #define TODAYBASE_H #include <qlayout.h> -#include <qguardedptr.h> #include <opie/oclickablelabel.h> class QVBox; class QGridLayout; class QFrame; class QLabel; class QPushButton; class QBoxLayout; @@ -32,23 +31,23 @@ class QBoxLayout; class TodayBase : public QWidget { Q_OBJECT public: TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~TodayBase(); - QGuardedPtr<QFrame> Frame4; - QGuardedPtr<QPushButton> DatesButton; - QGuardedPtr<QVBoxLayout> layout; - QGuardedPtr<OClickableLabel> OwnerField; - QGuardedPtr<QLabel> Frame; - QGuardedPtr<QLabel> DateLabel; - QGuardedPtr<QFrame> Frame15; - QGuardedPtr<OClickableLabel> ConfigButton; + QFrame* Frame4; + QPushButton* DatesButton; + QVBoxLayout* layout; + OClickableLabel* OwnerField; + QLabel* Frame; + QLabel* DateLabel; + QFrame* Frame15; + OClickableLabel* ConfigButton; protected: }; #endif |