author | zecke <zecke> | 2004-05-29 18:43:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-05-29 18:43:13 (UTC) |
commit | 43c1ce80bc5faf16fe9d86c4685512659f5180bc (patch) (unidiff) | |
tree | ebd64b019954d702a39bad96d3324bbe79d7f9b6 | |
parent | f568ff9c68bdc61cbc4482f9b2c6e1096cecaae0 (diff) | |
download | opie-43c1ce80bc5faf16fe9d86c4685512659f5180bc.zip opie-43c1ce80bc5faf16fe9d86c4685512659f5180bc.tar.gz opie-43c1ce80bc5faf16fe9d86c4685512659f5180bc.tar.bz2 |
Make Enabled/Disabled work.
Problem was /home/ich/foo//plugins/foo
where /home/ich/foo/ was OPIEDIR and we added /
-rw-r--r-- | libopie2/opiecore/opluginloader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp index 3d286e5..e7eddc2 100644 --- a/libopie2/opiecore/opluginloader.cpp +++ b/libopie2/opiecore/opluginloader.cpp | |||
@@ -272,25 +272,25 @@ void OPluginItem::setPosition( int pos ) { | |||
272 | * ... | 272 | * ... |
273 | * loader.clear(); | 273 | * loader.clear(); |
274 | * | 274 | * |
275 | * \endcode | 275 | * \endcode |
276 | * | 276 | * |
277 | * @param name The name of the plugin directory. | 277 | * @param name The name of the plugin directory. |
278 | * @param isSorted Tell the PluginLoader if your Plugins are sorted | 278 | * @param isSorted Tell the PluginLoader if your Plugins are sorted |
279 | */ | 279 | */ |
280 | OGenericPluginLoader::OGenericPluginLoader( const QString& name, bool isSorted) | 280 | OGenericPluginLoader::OGenericPluginLoader( const QString& name, bool isSorted) |
281 | : m_dir( name ), m_autoDelete( false ), m_isSafeMode( false ), | 281 | : m_dir( name ), m_autoDelete( false ), m_isSafeMode( false ), |
282 | m_isSorted( isSorted ) | 282 | m_isSorted( isSorted ) |
283 | { | 283 | { |
284 | setPluginDir( QPEApplication::qpeDir() + "/plugins/"+name ); | 284 | setPluginDir( QPEApplication::qpeDir() + "plugins/"+name ); |
285 | readConfig(); | 285 | readConfig(); |
286 | } | 286 | } |
287 | 287 | ||
288 | 288 | ||
289 | /** | 289 | /** |
290 | * \brief simple d'tor that cleans up depending on autoDelete | 290 | * \brief simple d'tor that cleans up depending on autoDelete |
291 | * | 291 | * |
292 | * calls clear if autoDelete is true. This will release all interfaces | 292 | * calls clear if autoDelete is true. This will release all interfaces |
293 | * and remove the library from this process if the refcount falls to zero | 293 | * and remove the library from this process if the refcount falls to zero |
294 | */ | 294 | */ |
295 | OGenericPluginLoader::~OGenericPluginLoader() { | 295 | OGenericPluginLoader::~OGenericPluginLoader() { |
296 | if ( m_autoDelete ) | 296 | if ( m_autoDelete ) |
@@ -524,24 +524,25 @@ QString OGenericPluginLoader::unlibify( const QString& str ) { | |||
524 | * | 524 | * |
525 | * @param dir The dir to look in | 525 | * @param dir The dir to look in |
526 | * @param sorted Should positions be read? | 526 | * @param sorted Should positions be read? |
527 | * @param disabled Remove excluded from the list | 527 | * @param disabled Remove excluded from the list |
528 | */ | 528 | */ |
529 | OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorted, bool disabled )const { | 529 | OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorted, bool disabled )const { |
530 | #ifdef Q_OS_MACX | 530 | #ifdef Q_OS_MACX |
531 | QDir dir( _dir, "lib*.dylib" ); | 531 | QDir dir( _dir, "lib*.dylib" ); |
532 | #else | 532 | #else |
533 | QDir dir( _dir, "lib*.so" ); | 533 | QDir dir( _dir, "lib*.so" ); |
534 | #endif | 534 | #endif |
535 | 535 | ||
536 | |||
536 | OPluginItem::List lst; | 537 | OPluginItem::List lst; |
537 | 538 | ||
538 | /* | 539 | /* |
539 | * get excluded list and then iterate over them | 540 | * get excluded list and then iterate over them |
540 | * Excluded list contains the name | 541 | * Excluded list contains the name |
541 | * Position is a list with 'name.pos.name.pos.name.pos' | 542 | * Position is a list with 'name.pos.name.pos.name.pos' |
542 | * | 543 | * |
543 | * For the look up we will create two QMap<QString,pos> | 544 | * For the look up we will create two QMap<QString,pos> |
544 | */ | 545 | */ |
545 | QMap<QString, int> positionMap; | 546 | QMap<QString, int> positionMap; |
546 | QMap<QString, int> excludedMap; | 547 | QMap<QString, int> excludedMap; |
547 | 548 | ||