author | ulf69 <ulf69> | 2004-06-29 03:30:19 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 03:30:19 (UTC) |
commit | 82fec00bb1355affe8093f0f92922827f0357632 (patch) (unidiff) | |
tree | ff6e59327e3b6e01dd80889f1f2a44aef52815e2 | |
parent | e3a70fed171a7b8d29ce0afb9e0f82fb98903091 (diff) | |
download | kdepimpi-82fec00bb1355affe8093f0f92922827f0357632.zip kdepimpi-82fec00bb1355affe8093f0f92922827f0357632.tar.gz kdepimpi-82fec00bb1355affe8093f0f92922827f0357632.tar.bz2 |
load the data formats now via KLibLoader and not statically
-rw-r--r-- | microkde/kresources/factory.cpp | 100 | ||||
-rw-r--r-- | microkde/kresources/factory.h | 13 |
2 files changed, 75 insertions, 38 deletions
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp index 709cd4a..56b0ef3 100644 --- a/microkde/kresources/factory.cpp +++ b/microkde/kresources/factory.cpp | |||
@@ -25,19 +25,12 @@ | |||
25 | #include <klocale.h> | 25 | #include <klocale.h> |
26 | #include <ksimpleconfig.h> | 26 | #include <ksimpleconfig.h> |
27 | #include <kstandarddirs.h> | 27 | #include <kstandarddirs.h> |
28 | #include <kstaticdeleter.h> | 28 | #include <kstaticdeleter.h> |
29 | #include <klibloader.h> | ||
29 | 30 | ||
30 | #include <qfile.h> | 31 | #include <qfile.h> |
31 | 32 | ||
32 | #include <plugins/file/resourcefile.h> | ||
33 | #include <plugins/file/resourcefileconfig.h> | ||
34 | #include <plugins/dir/resourcedir.h> | ||
35 | #include <plugins/dir/resourcedirconfig.h> | ||
36 | //#include <plugins/ldap/resourceldap.h> | ||
37 | //#include <plugins/ldap/resourceldapconfig.h> | ||
38 | |||
39 | |||
40 | #include "resource.h" | 33 | #include "resource.h" |
41 | #include "factory.h" | 34 | #include "factory.h" |
42 | 35 | ||
43 | using namespace KRES; | 36 | using namespace KRES; |
@@ -81,18 +74,52 @@ Factory::Factory( const QString& resourceFamily ) : | |||
81 | mTypeMap.insert( type.toString(), *it ); | 74 | mTypeMap.insert( type.toString(), *it ); |
82 | } | 75 | } |
83 | */ | 76 | */ |
84 | 77 | ||
85 | //US !!!!!!!!!!!!!!! | 78 | //US new |
86 | KRES::PluginFactoryBase* pf = (KRES::PluginFactoryBase*)new KRES::PluginFactory<KABC::ResourceFile,KABC::ResourceFileConfig>(); | 79 | PluginInfo* info = new PluginInfo; |
87 | mTypeMap.insert( "file", pf ); | 80 | info->library = "microkabc_file"; |
81 | info->nameLabel = i18n( "file" ); | ||
82 | info->descriptionLabel = i18n( "No description available." ); | ||
83 | mTypeMap.insert( "file", info ); | ||
84 | |||
85 | info = new PluginInfo; | ||
86 | info->library = "microkabc_dir"; | ||
87 | info->nameLabel = i18n( "dir" ); | ||
88 | info->descriptionLabel = i18n( "No description available." ); | ||
89 | mTypeMap.insert( "dir", info ); | ||
90 | |||
91 | info = new PluginInfo; | ||
92 | info->library = "microkabc_ldap"; | ||
93 | info->nameLabel = i18n( "ldap" ); | ||
94 | info->descriptionLabel = i18n( "No description available." ); | ||
95 | mTypeMap.insert( "ldap", info ); | ||
96 | |||
97 | //US add opie plugin only, if the library exists | ||
98 | QString libname = "microkabc_opie"; | ||
99 | QString path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); | ||
100 | if ( !path.isEmpty() ) | ||
101 | { | ||
102 | info = new PluginInfo; | ||
103 | info->library = libname; | ||
104 | info->nameLabel = i18n( "opie" ); | ||
105 | info->descriptionLabel = i18n( "Opie PIM Addressbook." ); | ||
106 | mTypeMap.insert( "opie", info ); | ||
107 | } | ||
108 | |||
109 | //US add qtopia plugin only, if the library exists | ||
110 | libname = "microkabc_qtopia"; | ||
111 | path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); | ||
112 | if ( !path.isEmpty() ) | ||
113 | { | ||
114 | info = new PluginInfo; | ||
115 | info->library = libname; | ||
116 | info->nameLabel = i18n( "qtopia" ); | ||
117 | info->descriptionLabel = i18n( "Qtopia PIM Addressbook." ); | ||
118 | mTypeMap.insert( "qtopia", info ); | ||
119 | } | ||
120 | |||
88 | 121 | ||
89 | pf = (KRES::PluginFactoryBase*)new KRES::PluginFactory<KABC::ResourceDir,KABC::ResourceDirConfig>(); | ||
90 | mTypeMap.insert( "dir", pf ); | ||
91 | /* | ||
92 | pf = (KRES::PluginFactoryBase*)new KRES::PluginFactory<KABC::ResourceLDAP,KABC::ResourceLDAPConfig>(); | ||
93 | mTypeMap.insert( "ldap", pf ); | ||
94 | */ | ||
95 | } | 122 | } |
96 | 123 | ||
97 | Factory::~Factory() | 124 | Factory::~Factory() |
98 | { | 125 | { |
@@ -104,9 +131,9 @@ QStringList Factory::typeNames() const | |||
104 | //US return mTypeMap.keys(); | 131 | //US return mTypeMap.keys(); |
105 | 132 | ||
106 | QStringList result; | 133 | QStringList result; |
107 | 134 | ||
108 | QMap<QString, PluginFactoryBase*>::ConstIterator it; | 135 | QMap<QString, PluginInfo*>::ConstIterator it; |
109 | for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { | 136 | for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { |
110 | result << it.key().latin1(); | 137 | result << it.key().latin1(); |
111 | // qDebug("Factory::typeNames() : %s ", it.key().latin1()); | 138 | // qDebug("Factory::typeNames() : %s ", it.key().latin1()); |
112 | 139 | ||
@@ -118,34 +145,30 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent ) | |||
118 | { | 145 | { |
119 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) | 146 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) |
120 | return 0; | 147 | return 0; |
121 | 148 | ||
122 | /*US load the lib not dynamically. !! | 149 | //US KService::Ptr ptr = mTypeMap[ type ]; |
123 | KService::Ptr ptr = mTypeMap[ type ]; | 150 | //US KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); |
124 | KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); | 151 | PluginInfo* pi = mTypeMap[ type ]; |
125 | if ( !factory ) { | 152 | KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() ); |
126 | kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl; | ||
127 | return 0; | ||
128 | } | ||
129 | */ | ||
130 | PluginFactoryBase *factory = mTypeMap[ type ]; | ||
131 | if ( !factory ) { | 153 | if ( !factory ) { |
154 | qDebug("KRES::Factory::configWidget(): Factory creation failed for library %s", pi->library.latin1()); | ||
132 | kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl; | 155 | kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl; |
133 | return 0; | 156 | return 0; |
134 | } | 157 | } |
135 | 158 | ||
136 | |||
137 | PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); | 159 | PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); |
138 | 160 | ||
139 | if ( !pluginFactory ) { | 161 | if ( !pluginFactory ) { |
162 | qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1()); | ||
140 | kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl; | 163 | kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl; |
141 | return 0; | 164 | return 0; |
142 | } | 165 | } |
143 | 166 | ||
144 | ConfigWidget *wdg = pluginFactory->configWidget( parent ); | 167 | ConfigWidget *wdg = pluginFactory->configWidget( parent ); |
145 | if ( !wdg ) { | 168 | if ( !wdg ) { |
146 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; | 169 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; |
147 | kdDebug() << " is not a " + mResourceFamily + " plugin." << endl; | 170 | qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); |
148 | return 0; | 171 | return 0; |
149 | } | 172 | } |
150 | return wdg; | 173 | return wdg; |
151 | 174 | ||
@@ -154,13 +177,14 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent ) | |||
154 | QString Factory::typeName( const QString &type ) const | 177 | QString Factory::typeName( const QString &type ) const |
155 | { | 178 | { |
156 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) | 179 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) |
157 | return QString(); | 180 | return QString(); |
158 | 181 | ||
182 | |||
159 | //US KService::Ptr ptr = mTypeMap[ type ]; | 183 | //US KService::Ptr ptr = mTypeMap[ type ]; |
160 | //US return ptr->name(); | 184 | //US return ptr->name(); |
161 | //US I guess this is correct since we loaded the factory staticly. | 185 | PluginInfo* pi = mTypeMap[ type ]; |
162 | return type; | 186 | return pi->nameLabel; |
163 | 187 | ||
164 | } | 188 | } |
165 | 189 | ||
166 | QString Factory::typeDescription( const QString &type ) const | 190 | QString Factory::typeDescription( const QString &type ) const |
@@ -169,11 +193,10 @@ QString Factory::typeDescription( const QString &type ) const | |||
169 | return QString(); | 193 | return QString(); |
170 | 194 | ||
171 | //US KService::Ptr ptr = mTypeMap[ type ]; | 195 | //US KService::Ptr ptr = mTypeMap[ type ]; |
172 | //US return ptr->comment(); | 196 | //US return ptr->comment(); |
173 | //US I guess this is correct since we loaded the factory staticly. | 197 | PluginInfo* pi = mTypeMap[ type ]; |
174 | return type; | 198 | return pi->descriptionLabel; |
175 | |||
176 | } | 199 | } |
177 | 200 | ||
178 | Resource *Factory::resource( const QString& type, const KConfig *config ) | 201 | Resource *Factory::resource( const QString& type, const KConfig *config ) |
179 | { | 202 | { |
@@ -189,25 +212,28 @@ Resource *Factory::resource( const QString& type, const KConfig *config ) | |||
189 | kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; | 212 | kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; |
190 | return 0; | 213 | return 0; |
191 | } | 214 | } |
192 | */ | 215 | */ |
193 | PluginFactoryBase *factory = mTypeMap[ type ]; | 216 | PluginInfo* pi = mTypeMap[ type ]; |
217 | KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() ); | ||
194 | if ( !factory ) { | 218 | if ( !factory ) { |
219 | qDebug("KRES::Factory::resource(): Factory creation failed for library %s", pi->library.latin1()); | ||
195 | kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; | 220 | kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; |
196 | return 0; | 221 | return 0; |
197 | } | 222 | } |
198 | 223 | ||
199 | PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); | 224 | PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); |
200 | 225 | ||
201 | if ( !pluginFactory ) { | 226 | if ( !pluginFactory ) { |
227 | qDebug("KRES::Factory::resource(): no plugin factory for library %s", pi->library.latin1()); | ||
202 | kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl; | 228 | kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl; |
203 | return 0; | 229 | return 0; |
204 | } | 230 | } |
205 | 231 | ||
206 | Resource *resource = pluginFactory->resource( config ); | 232 | Resource *resource = pluginFactory->resource( config ); |
207 | if ( !resource ) { | 233 | if ( !resource ) { |
208 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; | 234 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; |
209 | kdDebug() << " is not a " + mResourceFamily + " plugin." << endl; | 235 | qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); |
210 | return 0; | 236 | return 0; |
211 | } | 237 | } |
212 | 238 | ||
213 | resource->setType( type ); | 239 | resource->setType( type ); |
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h index f391bb3..ad67ab3 100644 --- a/microkde/kresources/factory.h +++ b/microkde/kresources/factory.h | |||
@@ -33,8 +33,17 @@ | |||
33 | #include "resource.h" | 33 | #include "resource.h" |
34 | 34 | ||
35 | namespace KRES { | 35 | namespace KRES { |
36 | 36 | ||
37 | //US | ||
38 | struct PluginInfo | ||
39 | { | ||
40 | QString library; | ||
41 | QString nameLabel; | ||
42 | QString descriptionLabel; | ||
43 | }; | ||
44 | |||
45 | |||
37 | /** | 46 | /** |
38 | * Class for loading resource plugins. | 47 | * Class for loading resource plugins. |
39 | * Do not use this class directly. Use ResourceManager instead | 48 | * Do not use this class directly. Use ResourceManager instead |
40 | * | 49 | * |
@@ -55,8 +64,9 @@ namespace KRES { | |||
55 | class Factory | 64 | class Factory |
56 | { | 65 | { |
57 | public: | 66 | public: |
58 | 67 | ||
68 | |||
59 | /** | 69 | /** |
60 | * Returns the global resource factory. | 70 | * Returns the global resource factory. |
61 | */ | 71 | */ |
62 | static Factory *self( const QString& resourceFamily ); | 72 | static Factory *self( const QString& resourceFamily ); |
@@ -105,9 +115,10 @@ class Factory | |||
105 | static QDict<Factory> *mSelves; | 115 | static QDict<Factory> *mSelves; |
106 | 116 | ||
107 | QString mResourceFamily; | 117 | QString mResourceFamily; |
108 | //US QMap<QString, KService::Ptr> mTypeMap; | 118 | //US QMap<QString, KService::Ptr> mTypeMap; |
109 | QMap<QString, PluginFactoryBase*> mTypeMap; | 119 | //US lets store the pluginfo struct as value instead of a KService |
120 | QMap<QString, PluginInfo*> mTypeMap; | ||
110 | }; | 121 | }; |
111 | 122 | ||
112 | } | 123 | } |
113 | #endif | 124 | #endif |