using now QInterfacePtr as Simon suggested, and another leak fix in datebook plugin

2 files changed, 6 insertions, 5 deletions

diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
index 4159b49..45736bb 100644
--- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
@@ -24,2 +24,3 @@ DatebookPluginImpl::DatebookPluginImpl() {
 DatebookPluginImpl::~DatebookPluginImpl() {
+    delete datebookPlugin;
 }
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 01ef02d..1b31cfd 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -41,4 +41,5 @@
 struct TodayPlugin {
+    TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
     QLibrary *library;
-    TodayPluginInterface *iface;
+    QInterfacePtr<TodayPluginInterface> iface;
     TodayPluginObject *guiPart;
@@ -163,3 +164,2 @@ void Today::loadPlugins() {
 
-
     QString path = QPEApplication::qpeDir() + "/plugins/today";
@@ -173,3 +173,4 @@ void Today::loadPlugins() {
     for ( it = list.begin(); it != list.end(); ++it ) {
-	TodayPluginInterface *iface = 0;
+//	TodayPluginInterface *iface = 0;
+        QInterfacePtr<TodayPluginInterface> iface;
 	QLibrary *lib = new QLibrary( path + "/" + *it );
@@ -184,3 +185,2 @@ void Today::loadPlugins() {
             if ( pluginListRefreshExclude.contains( (*it) ) ) {
-
                 // if its not in allApplets list, add it to a layout
@@ -245,3 +245,3 @@ void Today::loadPlugins() {
                 // if plugin is not yet in the list, add it to the layout too
-                if ( !m_allApplets.contains( plugin.name ) ) {
+                else if ( !m_allApplets.contains( plugin.name ) ) {
                     layout->addWidget( plugin.guiBox );