switched to common opie2-pluginloader.

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
@@ -31,8 +31,10 @@
 
 #include <opie2/odebug.h>
 #include <opie2/oholidaypluginif.h>
 #include <opie2/oholidayplugin.h>
+#include <opie2/opluginloader.h>
+#include <opie2/todayplugininterface.h>
 
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
@@ -1084,18 +1086,22 @@ Event DateBookDBHack::eventByUID(int uid) {
 
 DateBookHoliday::DateBookHoliday()
 {
     _pluginlist.clear();
+    m_pluginLoader = new Opie::Core::OPluginLoader("holidays",false);
+    m_pluginLoader->setAutoDelete(true);
     init();
 }
 
 DateBookHoliday::~DateBookHoliday()
 {
     deinit();
+    delete m_pluginLoader;
 }
 
 void DateBookHoliday::deinit()
 {
+/*
     QValueList<HPlugin*>::Iterator it;
     for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
         HPlugin*_pl = *it;
         // destructs itself?
@@ -1104,13 +1110,39 @@ void DateBookHoliday::deinit()
         delete _pl->_lib;
         delete _pl;
     }
     _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" );
     QStringList list = dir.entryList();
     QStringList::Iterator it;
@@ -1131,8 +1163,9 @@ void DateBookHoliday::init()
         } else {
             delete lib;
         }
     }
+#endif
 }
 
 QStringList DateBookHoliday::holidaylist(const QDate&aDate)
 {
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
@@ -10,8 +10,11 @@ namespace Opie {
 namespace Datebook {

     class HolidayPlugin;

     class HolidayPluginIf;

 }

+namespace Core {

+    class OPluginLoader;

+}

 }

 

 class QLibrary;

 

@@ -37,12 +40,13 @@ protected:
     void deinit();

 

     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;

 };

 

 class DateBookDBHoliday:virtual public DateBookDBHack {

 public: