summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-17 23:54:29 (UTC)
committer alwin <alwin>2005-03-17 23:54:29 (UTC)
commitc87b38dc7b0acc53f5c92ac5e53f40cfff15d956 (patch) (side-by-side diff)
tree70ab1ebf36663b6f0b6be23ed8201d3f097c70fd
parente77a2f39c95855f95dcba004581ab6af7f5bd0f9 (diff)
downloadopie-c87b38dc7b0acc53f5c92ac5e53f40cfff15d956.zip
opie-c87b38dc7b0acc53f5c92ac5e53f40cfff15d956.tar.gz
opie-c87b38dc7b0acc53f5c92ac5e53f40cfff15d956.tar.bz2
switched to common opie2-pluginloader.
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
@@ -34,2 +34,4 @@
#include <opie2/oholidayplugin.h>
+#include <opie2/opluginloader.h>
+#include <opie2/todayplugininterface.h>
@@ -1087,2 +1089,4 @@ DateBookHoliday::DateBookHoliday()
_pluginlist.clear();
+ m_pluginLoader = new Opie::Core::OPluginLoader("holidays",false);
+ m_pluginLoader->setAutoDelete(true);
init();
@@ -1093,2 +1097,3 @@ DateBookHoliday::~DateBookHoliday()
deinit();
+ delete m_pluginLoader;
}
@@ -1097,2 +1102,3 @@ void DateBookHoliday::deinit()
{
+/*
QValueList<HPlugin*>::Iterator it;
@@ -1107,7 +1113,33 @@ 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";
@@ -1134,2 +1166,3 @@ 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
@@ -13,2 +13,5 @@ namespace Datebook {
}
+namespace Core {
+ class OPluginLoader;
+}
}
@@ -40,6 +43,7 @@ protected:
Opie::Datebook::HolidayPlugin*_plugin;
- QLibrary*_lib;
- Opie::Datebook::HolidayPluginIf*_if;
+ //QLibrary*_lib;
+ //Opie::Datebook::HolidayPluginIf*_if;
};
QValueList<HPlugin*>_pluginlist;
+ Opie::Core::OPluginLoader*m_pluginLoader;
};