summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-15 22:11:24 (UTC)
committer zecke <zecke>2002-09-15 22:11:24 (UTC)
commit62fd3b9ecd507d8d1c05d26c0c292eea5a67e06a (patch) (side-by-side diff)
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
@@ -1,18 +1,17 @@
#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;
};
#endif
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
@@ -109,31 +109,30 @@ void Today::init() {
// read config
Config cfg( "today" );
cfg.setGroup( "Applets" );
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;
for ( it = list.begin(); it != list.end(); ++it ) {
TodayPluginInterface *iface = 0;
QLibrary *lib = new QLibrary( path + "/" + *it );
@@ -150,25 +149,24 @@ void Today::loadPlugins() {
plugin.active = true;
} else {
plugin.active = false;
}
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() {
if ( pluginLayout ) {
delete pluginLayout;
}
pluginLayout = new QVBoxLayout( layout );
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,16 +1,16 @@
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
TRANSLATIONS = ../../../i18n/de/today.ts \
../../../i18n/en/today.ts \
../../../i18n/es/today.ts \
../../../i18n/fr/today.ts \
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
@@ -9,46 +9,45 @@
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (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;
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