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
@@ -1,130 +1,132 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "datebook.h"
 #include "datebookday.h"
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "datebookweeklst.h"
 #include "dateentryimpl.h"
 
 #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>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/tzselect.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qtl.h>
 #include <qtoolbar.h>
 #include <qwidgetstack.h>
 #include <qdir.h>
 #include <qtopia/qlibrary.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     : QMainWindow( parent, "datebook", f ),
       aPreset( FALSE ),
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
       rowStyle( 0 ),
       bJumpToCurTime(FALSE),
       syncing(FALSE),
       inSearch(FALSE),
       alarmCounter(0)
 {
     bool needEvilHack= false; // if we need an Evil Hack
     QTime t;
     t.start();
     db = new DateBookDBHoliday;
     odebug << "loading db t=" << t.elapsed() << oendl;
     db_holiday = new DateBookHoliday();
     db->db_holiday=db_holiday;
 
     loadSettings();
     setCaption( tr("Calendar") );
     setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
     setToolBarsMovable( FALSE );
 
     views = new QWidgetStack( this );
     setCentralWidget( views );
 
     dayView = 0;
     weekView = 0;
     weekLstView = 0;
     monthView = 0;
 
 //    QToolBar *bar = new QToolBar( this );
 //    bar->setHorizontalStretchable( TRUE );
 
 //    QMenuBar *mb = new QMenuBar( bar );
 //    mb->setMargin( 0 );
 
 //    QPopupMenu *view = new QPopupMenu( this );
 //    mb->insertItem( tr( "View" ), view );
 
     QToolBar *sub_bar = new QToolBar(this);
     sub_bar->setHorizontalStretchable(TRUE);
 
     QActionGroup *g = new QActionGroup( this );
     g->setExclusive( TRUE );
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( sub_bar );
 
     sub_bar->addSeparator();
 
     a = new QAction( tr( "Today" ), Resource::loadPixmap( "datebook/to_day" ),  QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
     a->addTo( sub_bar );
 //  a->addTo( view );
 
     sub_bar->addSeparator();
 
     a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
     a->addTo( sub_bar );
 //    a->addTo( view );
     a->setToggleAction( TRUE );
     a->setOn( TRUE );
@@ -992,203 +994,234 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt,
     nonrev.setStart( rev.start() );
     inSearch = true;
     }
     static QDate searchDate = dt;
     // if true at the end we will start at the begin again and afterwards
     // we will emit string not found
     static bool wrapAround = true;
     bool candidtate;
     candidtate = false;
 
     QValueList<Event> repeats = db->getRawRepeats();
 
     // find the candidate for the first repeat that matches...
     // first check if there can ever be a match and then compute
     // the next occurence from start. See if this event is  closer
     // to the beginning (start. next < dtEnd) and not smaller then the last
     // result. If we find a canditate we set the dtEnd to the time
     // of the ocurrence and rev to this occurence.
     // set wrap around to true because there might be more events coming
     // and we're not at the end.
     QValueListConstIterator<Event> it;
     QDate start = dt;
     for ( it = repeats.begin(); it != repeats.end(); ++it ) {
     if ( catComp( (*it).categories(), category ) ) {
             if ( (*it).match( r ) ) {
                 if ( nextOccurance( *it, start, next ) ) {
                     if ( next < dtEnd && !(next <= rev.start() ) ) {
                         rev = *it;
                         dtEnd = next;
                         rev.setStart( next );
                         candidtate = true;
                         wrapAround = true;
                     }
                 }
             }
         }
     }
 
     // now the for first non repeat...
     // dtEnd is set by the previous iteration of repeatingEvents
     // check if we find a closer item. Also set dtEnd to find even
     // more close occurrence
     QValueList<Event> nonRepeats = db->getNonRepeatingEvents( dt, dtEnd.date() );
     qHeapSort( nonRepeats.begin(), nonRepeats.end() );
     for ( it = nonRepeats.begin(); it != nonRepeats.end(); ++it ) {
     if ( catComp( (*it).categories(), category ) ) {
         if ( (*it).start() < dtEnd ) {
         if ( (*it).match( r ) && !(*it <= nonrev) ) {
             nonrev = *it;
             dtEnd = nonrev.start();
             candidtate = true;
             wrapAround = true;
             break;
         }
         }
     }
     }
     if ( candidtate ) {
     dayView->setStartViewTime( dtEnd.time().hour() );
     dayView->setDate( dtEnd.date().year(), dtEnd.date().month(),
               dtEnd.date().day() );
     } else {
     if ( wrapAround ) {
         emit signalWrapAround();
         rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
         nonrev.setStart( rev.start() );
     } else
         emit signalNotFound();
     wrapAround = !wrapAround;
     }
 }
 
 Event DateBookDBHack::eventByUID(int uid) {
 
     // FIXME: Dirty Hacks to get hold of the private event lists
     QDate start;
     QDate end=start.addDays(-1);
     QValueList<Event> myEventList=getNonRepeatingEvents(start,end);
     QValueList<Event> myRepeatEvents=getRawRepeats();
 
     QValueList<Event>::ConstIterator it;
 
     for (it = myEventList.begin(); it != myEventList.end(); it++) {
     if ((*it).uid() == uid) return *it;
     }
     for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
     if ((*it).uid() == uid) return *it;
     }
 
     Event ev;
     return ev; // return at least
 }
 
 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?
         _pl->_if->release();
         _pl->_lib->unload();
         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;
     for (it=list.begin();it!=list.end();++it) {
         Opie::Datebook::HolidayPluginIf*hif = 0;
         QLibrary*lib=new QLibrary(path+"/"+*it);
         if ((lib->queryInterface(IID_HOLIDAY_PLUGIN,(QUnknownInterface**)&hif) == QS_OK) && hif) {
             Opie::Datebook::HolidayPlugin*pl = hif->plugin();
             if (pl) {
                 HPlugin*_pl=new HPlugin;
                 _pl->_plugin = pl;
                 odebug << "Found holiday " << pl->description()<<oendl;
                 _pl->_lib = lib;
                 _pl->_if = hif;
                 _pluginlist.append(_pl);
             } else {
             }
         } else {
             delete lib;
         }
     }
+#endif
 }
 
 QStringList DateBookHoliday::holidaylist(const QDate&aDate)
 {
     QStringList ret;
     QValueList<HPlugin*>::Iterator it;
     for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
         HPlugin*_pl = *it;
         ret+=_pl->_plugin->entries(aDate);
     }
     return ret;
 }
 
 QStringList DateBookHoliday::holidaylist(unsigned year, unsigned month, unsigned day)
 {
     return holidaylist(QDate(year,month,day));
 }
 
 QValueList<EffectiveEvent> DateBookHoliday::getEffectiveEvents(const QDate &from,const QDate &to )
 {
     QValueList<EffectiveEvent> ret;
     QValueList<HPlugin*>::Iterator it;
     for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
         HPlugin*_pl = *it;
         ret+=_pl->_plugin->events(from,to);
     }
     return ret;
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEventsNoHoliday(const QDate &from,const QDate &to )
 {
     return DateBookDBHack::getEffectiveEvents(from,to);
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEventsNoHoliday(const QDateTime &start)
 {
     return DateBookDBHack::getEffectiveEvents(start);
 }
 
 QValueList<EffectiveEvent> DateBookHoliday::getEffectiveEvents(const QDateTime &start)
 {
     return getEffectiveEvents(start.date(),start.date());
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEvents(const QDate &from,const QDate &to )
 {
     QValueList<EffectiveEvent> ret;
     odebug << "Ueberlagert 1" << oendl;
     if (db_holiday) {
         ret+=db_holiday->getEffectiveEvents(from,to);
     }
     ret+=getEffectiveEventsNoHoliday(from,to);
     return ret;
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEvents( const QDateTime &start)
 {
     odebug << "Ueberlagert 2" << oendl;
     return DateBookDBHack::getEffectiveEvents(start);
 }
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
@@ -1,59 +1,63 @@
 #ifndef _DATEBOOK_TYPES_H

 #define _DATEBOOK_TYPES_H

 

 #include <qpe/datebookdb.h>

 

 #include <qvaluelist.h>

 #include <qstringlist.h>

 

 namespace Opie {

 namespace Datebook {

     class HolidayPlugin;

     class HolidayPluginIf;

 }

+namespace Core {

+    class OPluginLoader;

+}

 }

 

 class QLibrary;

 

 class DateBookDBHack : virtual public DateBookDB {

  public:

   virtual ~DateBookDBHack(){}

   Event eventByUID(int id);

 };

 

 class DateBookHoliday

 {

 public:

     DateBookHoliday();

     virtual ~DateBookHoliday();

 

     QStringList holidaylist(const QDate&);

     QStringList holidaylist(unsigned year, unsigned month, unsigned day);

     virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDate &from,const QDate &to );

     virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDateTime &start);

 

 protected:

     void init();

     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:

     DateBookDBHoliday():DateBookDBHack(){db_holiday=0;}

     virtual ~DateBookDBHoliday(){}

     virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDate &from,const QDate &to );

     virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDateTime &start);

     virtual QValueList<EffectiveEvent> getEffectiveEventsNoHoliday(const QDate &from,const QDate &to );

     virtual QValueList<EffectiveEvent> getEffectiveEventsNoHoliday(const QDateTime &start);

 

     DateBookHoliday*db_holiday;

 };

 

 #endif