author | alwin <alwin> | 2005-03-17 23:54:29 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-17 23:54:29 (UTC) |
commit | c87b38dc7b0acc53f5c92ac5e53f40cfff15d956 (patch) (unidiff) | |
tree | 70ab1ebf36663b6f0b6be23ed8201d3f097c70fd /core/pim/datebook | |
parent | e77a2f39c95855f95dcba004581ab6af7f5bd0f9 (diff) | |
download | opie-c87b38dc7b0acc53f5c92ac5e53f40cfff15d956.zip opie-c87b38dc7b0acc53f5c92ac5e53f40cfff15d956.tar.gz opie-c87b38dc7b0acc53f5c92ac5e53f40cfff15d956.tar.bz2 |
switched to common opie2-pluginloader.
-rw-r--r-- | core/pim/datebook/datebook.cpp | 33 | ||||
-rw-r--r-- | core/pim/datebook/datebooktypes.h | 8 |
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 | |||
@@ -32,6 +32,8 @@ | |||
32 | #include <opie2/odebug.h> | 32 | #include <opie2/odebug.h> |
33 | #include <opie2/oholidaypluginif.h> | 33 | #include <opie2/oholidaypluginif.h> |
34 | #include <opie2/oholidayplugin.h> | 34 | #include <opie2/oholidayplugin.h> |
35 | #include <opie2/opluginloader.h> | ||
36 | #include <opie2/todayplugininterface.h> | ||
35 | 37 | ||
36 | #include <qpe/datebookmonth.h> | 38 | #include <qpe/datebookmonth.h> |
37 | #include <qpe/qpeapplication.h> | 39 | #include <qpe/qpeapplication.h> |
@@ -1085,16 +1087,20 @@ Event DateBookDBHack::eventByUID(int uid) { | |||
1085 | DateBookHoliday::DateBookHoliday() | 1087 | DateBookHoliday::DateBookHoliday() |
1086 | { | 1088 | { |
1087 | _pluginlist.clear(); | 1089 | _pluginlist.clear(); |
1090 | m_pluginLoader = new Opie::Core::OPluginLoader("holidays",false); | ||
1091 | m_pluginLoader->setAutoDelete(true); | ||
1088 | init(); | 1092 | init(); |
1089 | } | 1093 | } |
1090 | 1094 | ||
1091 | DateBookHoliday::~DateBookHoliday() | 1095 | DateBookHoliday::~DateBookHoliday() |
1092 | { | 1096 | { |
1093 | deinit(); | 1097 | deinit(); |
1098 | delete m_pluginLoader; | ||
1094 | } | 1099 | } |
1095 | 1100 | ||
1096 | void DateBookHoliday::deinit() | 1101 | void DateBookHoliday::deinit() |
1097 | { | 1102 | { |
1103 | /* | ||
1098 | QValueList<HPlugin*>::Iterator it; | 1104 | QValueList<HPlugin*>::Iterator it; |
1099 | for (it=_pluginlist.begin();it!=_pluginlist.end();++it) { | 1105 | for (it=_pluginlist.begin();it!=_pluginlist.end();++it) { |
1100 | HPlugin*_pl = *it; | 1106 | HPlugin*_pl = *it; |
@@ -1105,11 +1111,37 @@ void DateBookHoliday::deinit() | |||
1105 | delete _pl; | 1111 | delete _pl; |
1106 | } | 1112 | } |
1107 | _pluginlist.clear(); | 1113 | _pluginlist.clear(); |
1114 | */ | ||
1108 | } | 1115 | } |
1109 | 1116 | ||
1117 | #if 0 | ||
1118 | void debugLst( const Opie::Core::OPluginItem::List& lst ) { | ||
1119 | for ( Opie::Core::OPluginItem::List::ConstIterator it = lst.begin(); it != lst.end(); ++it ) | ||
1120 | odebug << "Name " << (*it).name() << " " << (*it).path() << " " << (*it).position() << oendl; | ||
1121 | } | ||
1122 | #endif | ||
1123 | |||
1110 | void DateBookHoliday::init() | 1124 | void DateBookHoliday::init() |
1111 | { | 1125 | { |
1126 | #if 0 | ||
1112 | deinit(); | 1127 | deinit(); |
1128 | #endif | ||
1129 | Opie::Core::OPluginItem::List lst = m_pluginLoader->allAvailable( false ); | ||
1130 | // debugLst( lst ); | ||
1131 | for( Opie::Core::OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ){ | ||
1132 | Opie::Datebook::HolidayPluginIf*hif = m_pluginLoader->load<Opie::Datebook::HolidayPluginIf>(*it,IID_HOLIDAY_PLUGIN); | ||
1133 | if (hif) { | ||
1134 | Opie::Datebook::HolidayPlugin*pl = hif->plugin(); | ||
1135 | if (pl) { | ||
1136 | HPlugin*_pl=new HPlugin; | ||
1137 | _pl->_plugin = pl; | ||
1138 | odebug << "Found holiday " << pl->description()<<oendl; | ||
1139 | _pluginlist.append(_pl); | ||
1140 | //_pl->_if = hif; | ||
1141 | } | ||
1142 | } | ||
1143 | } | ||
1144 | #if 0 | ||
1113 | QString path = QPEApplication::qpeDir() + "plugins/datebook/holiday"; | 1145 | QString path = QPEApplication::qpeDir() + "plugins/datebook/holiday"; |
1114 | QDir dir( path, "lib*.so" ); | 1146 | QDir dir( path, "lib*.so" ); |
1115 | QStringList list = dir.entryList(); | 1147 | QStringList list = dir.entryList(); |
@@ -1132,6 +1164,7 @@ void DateBookHoliday::init() | |||
1132 | delete lib; | 1164 | delete lib; |
1133 | } | 1165 | } |
1134 | } | 1166 | } |
1167 | #endif | ||
1135 | } | 1168 | } |
1136 | 1169 | ||
1137 | QStringList DateBookHoliday::holidaylist(const QDate&aDate) | 1170 | 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 | |||
@@ -11,6 +11,9 @@ namespace Datebook { | |||
11 | class HolidayPlugin; | 11 | class HolidayPlugin; |
12 | class HolidayPluginIf; | 12 | class HolidayPluginIf; |
13 | } | 13 | } |
14 | namespace Core { | ||
15 | class OPluginLoader; | ||
16 | } | ||
14 | } | 17 | } |
15 | 18 | ||
16 | class QLibrary; | 19 | class QLibrary; |
@@ -38,10 +41,11 @@ protected: | |||
38 | 41 | ||
39 | struct HPlugin { | 42 | struct HPlugin { |
40 | Opie::Datebook::HolidayPlugin*_plugin; | 43 | Opie::Datebook::HolidayPlugin*_plugin; |
41 | QLibrary*_lib; | 44 | //QLibrary*_lib; |
42 | Opie::Datebook::HolidayPluginIf*_if; | 45 | //Opie::Datebook::HolidayPluginIf*_if; |
43 | }; | 46 | }; |
44 | QValueList<HPlugin*>_pluginlist; | 47 | QValueList<HPlugin*>_pluginlist; |
48 | Opie::Core::OPluginLoader*m_pluginLoader; | ||
45 | }; | 49 | }; |
46 | 50 | ||
47 | class DateBookDBHoliday:virtual public DateBookDBHack { | 51 | class DateBookDBHoliday:virtual public DateBookDBHack { |