author | harlekin <harlekin> | 2002-11-21 16:25:44 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-21 16:25:44 (UTC) |
commit | 7edc36774d1deec4806ee9273e25a059f9ac1f9e (patch) (side-by-side diff) | |
tree | b672261ed87ae17b33e4ed47a70d4a82fccb8406 /core/pim | |
parent | 10cd03eb7108ef66614790ba2b5482a9bc9a87fd (diff) | |
download | opie-7edc36774d1deec4806ee9273e25a059f9ac1f9e.zip opie-7edc36774d1deec4806ee9273e25a059f9ac1f9e.tar.gz opie-7edc36774d1deec4806ee9273e25a059f9ac1f9e.tar.bz2 |
using now QInterfacePtr as Simon suggested, and another leak fix in datebook plugin
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginimpl.cpp | 1 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 10 |
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 @@ -22,6 +22,7 @@ DatebookPluginImpl::DatebookPluginImpl() { } DatebookPluginImpl::~DatebookPluginImpl() { + delete datebookPlugin; } TodayPluginObject* DatebookPluginImpl::guiPart() { 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 @@ -39,8 +39,9 @@ struct TodayPlugin { + TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} QLibrary *library; - TodayPluginInterface *iface; + QInterfacePtr<TodayPluginInterface> iface; TodayPluginObject *guiPart; QWidget *guiBox; QString name; @@ -161,7 +162,6 @@ void Today::loadPlugins() { pluginList.clear(); } - QString path = QPEApplication::qpeDir() + "/plugins/today"; QDir dir( path, "lib*.so" ); @@ -171,7 +171,8 @@ void Today::loadPlugins() { QMap<QString, TodayPlugin> tempList; for ( it = list.begin(); it != list.end(); ++it ) { - TodayPluginInterface *iface = 0; +// TodayPluginInterface *iface = 0; + QInterfacePtr<TodayPluginInterface> iface; QLibrary *lib = new QLibrary( path + "/" + *it ); qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); @@ -182,7 +183,6 @@ void Today::loadPlugins() { // If plugin is exludes from refresh, get it in the list again here. if ( pluginListRefreshExclude.contains( (*it) ) ) { - // if its not in allApplets list, add it to a layout if ( !m_allApplets.contains( pluginListRefreshExclude[(*it)].name ) ) { qDebug( "NUGASDA" ); @@ -243,7 +243,7 @@ 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 ); pluginList.append( plugin ); } |