summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp33
-rw-r--r--core/pim/datebook/datebooktypes.h8
2 files changed, 39 insertions, 2 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 36c4bd7..a7f6691 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -33,4 +33,6 @@
#include <opie2/oholidaypluginif.h>
#include <opie2/oholidayplugin.h>
+#include <opie2/opluginloader.h>
+#include <opie2/todayplugininterface.h>
#include <qpe/datebookmonth.h>
@@ -1086,4 +1088,6 @@ DateBookHoliday::DateBookHoliday()
{
_pluginlist.clear();
+ m_pluginLoader = new Opie::Core::OPluginLoader("holidays",false);
+ m_pluginLoader->setAutoDelete(true);
init();
}
@@ -1092,8 +1096,10 @@ DateBookHoliday::~DateBookHoliday()
{
deinit();
+ delete m_pluginLoader;
}
void DateBookHoliday::deinit()
{
+/*
QValueList<HPlugin*>::Iterator it;
for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
@@ -1106,9 +1112,35 @@ void DateBookHoliday::deinit()
}
_pluginlist.clear();
+*/
}
+#if 0
+void debugLst( const Opie::Core::OPluginItem::List& lst ) {
+ for ( Opie::Core::OPluginItem::List::ConstIterator it = lst.begin(); it != lst.end(); ++it )
+ odebug << "Name " << (*it).name() << " " << (*it).path() << " " << (*it).position() << oendl;
+}
+#endif
+
void DateBookHoliday::init()
{
+#if 0
deinit();
+#endif
+ Opie::Core::OPluginItem::List lst = m_pluginLoader->allAvailable( false );
+// debugLst( lst );
+ for( Opie::Core::OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ){
+ Opie::Datebook::HolidayPluginIf*hif = m_pluginLoader->load<Opie::Datebook::HolidayPluginIf>(*it,IID_HOLIDAY_PLUGIN);
+ if (hif) {
+ Opie::Datebook::HolidayPlugin*pl = hif->plugin();
+ if (pl) {
+ HPlugin*_pl=new HPlugin;
+ _pl->_plugin = pl;
+ odebug << "Found holiday " << pl->description()<<oendl;
+ _pluginlist.append(_pl);
+ //_pl->_if = hif;
+ }
+ }
+ }
+#if 0
QString path = QPEApplication::qpeDir() + "plugins/datebook/holiday";
QDir dir( path, "lib*.so" );
@@ -1133,4 +1165,5 @@ void DateBookHoliday::init()
}
}
+#endif
}
diff --git a/core/pim/datebook/datebooktypes.h b/core/pim/datebook/datebooktypes.h
index 9eb7e89..f944e84 100644
--- a/core/pim/datebook/datebooktypes.h
+++ b/core/pim/datebook/datebooktypes.h
@@ -12,4 +12,7 @@ namespace Datebook {
class HolidayPluginIf;
}
+namespace Core {
+ class OPluginLoader;
+}
}
@@ -39,8 +42,9 @@ protected:
struct HPlugin {
Opie::Datebook::HolidayPlugin*_plugin;
- QLibrary*_lib;
- Opie::Datebook::HolidayPluginIf*_if;
+ //QLibrary*_lib;
+ //Opie::Datebook::HolidayPluginIf*_if;
};
QValueList<HPlugin*>_pluginlist;
+ Opie::Core::OPluginLoader*m_pluginLoader;
};