author | zecke <zecke> | 2004-05-28 23:34:31 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-05-28 23:34:31 (UTC) |
commit | 62c6f006218382835539f23a71c3ff6d1c51fb2f (patch) (unidiff) | |
tree | 364e0774bfe90347204b5e20020a0e71d2dca4f6 | |
parent | e370bbfbe879086e1e1cb3d856544f231ca614be (diff) | |
download | opie-62c6f006218382835539f23a71c3ff6d1c51fb2f.zip opie-62c6f006218382835539f23a71c3ff6d1c51fb2f.tar.gz opie-62c6f006218382835539f23a71c3ff6d1c51fb2f.tar.bz2 |
Same config name
-rw-r--r-- | libopie2/opiecore/opluginloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp index 87e24d4..c2dc239 100644 --- a/libopie2/opiecore/opluginloader.cpp +++ b/libopie2/opiecore/opluginloader.cpp | |||
@@ -537,25 +537,25 @@ OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorte | |||
537 | 537 | ||
538 | /* | 538 | /* |
539 | * get excluded list and then iterate over them | 539 | * get excluded list and then iterate over them |
540 | * Excluded list contains the name | 540 | * Excluded list contains the name |
541 | * Position is a list with 'name.pos.name.pos.name.pos' | 541 | * Position is a list with 'name.pos.name.pos.name.pos' |
542 | * | 542 | * |
543 | * For the look up we will create two QMap<QString,pos> | 543 | * For the look up we will create two QMap<QString,pos> |
544 | */ | 544 | */ |
545 | QMap<QString, int> positionMap; | 545 | QMap<QString, int> positionMap; |
546 | QMap<QString, int> excludedMap; | 546 | QMap<QString, int> excludedMap; |
547 | 547 | ||
548 | 548 | ||
549 | OConfig cfg( m_dir+"odpplugins" ); | 549 | OConfig cfg( m_dir+"-odpplugins" ); |
550 | cfg.setGroup( _dir ); | 550 | cfg.setGroup( _dir ); |
551 | 551 | ||
552 | 552 | ||
553 | QStringList excludes = cfg.readListEntry( "Excluded", ',' ); | 553 | QStringList excludes = cfg.readListEntry( "Excluded", ',' ); |
554 | for ( QStringList::Iterator it = excludes.begin(); it != excludes.end(); ++it ) | 554 | for ( QStringList::Iterator it = excludes.begin(); it != excludes.end(); ++it ) |
555 | excludedMap.insert( *it, -2 ); | 555 | excludedMap.insert( *it, -2 ); |
556 | 556 | ||
557 | if ( m_isSorted ) { | 557 | if ( m_isSorted ) { |
558 | QStringList pos = cfg.readListEntry( "Positions", '.' ); | 558 | QStringList pos = cfg.readListEntry( "Positions", '.' ); |
559 | QStringList::Iterator it = pos.begin(); | 559 | QStringList::Iterator it = pos.begin(); |
560 | while ( it != pos.end() ) | 560 | while ( it != pos.end() ) |
561 | positionMap.insert( *it++, (*it++).toInt() ); | 561 | positionMap.insert( *it++, (*it++).toInt() ); |
@@ -854,25 +854,25 @@ void OPluginManager::save() { | |||
854 | */ | 854 | */ |
855 | for ( QMap<QString, QStringList>::Iterator it = positions.begin(); it != positions.end(); ++it ) { | 855 | for ( QMap<QString, QStringList>::Iterator it = positions.begin(); it != positions.end(); ++it ) { |
856 | OConfigGroupSaver saver( &cfg, it.key() ); | 856 | OConfigGroupSaver saver( &cfg, it.key() ); |
857 | cfg.writeEntry("Positions", it.data(), '.' ); | 857 | cfg.writeEntry("Positions", it.data(), '.' ); |
858 | } | 858 | } |
859 | } | 859 | } |
860 | 860 | ||
861 | /** | 861 | /** |
862 | * @internal | 862 | * @internal |
863 | */ | 863 | */ |
864 | QString OPluginManager::configName()const { | 864 | QString OPluginManager::configName()const { |
865 | QString str = m_loader ? m_loader->name() : m_cfgName; | 865 | QString str = m_loader ? m_loader->name() : m_cfgName; |
866 | return str + "odpplugins"; | 866 | return str + "-odpplugins"; |
867 | } | 867 | } |
868 | 868 | ||
869 | /** | 869 | /** |
870 | * @internal.. replace in m_plugins by path... this is linear search O(n/2) | 870 | * @internal.. replace in m_plugins by path... this is linear search O(n/2) |
871 | */ | 871 | */ |
872 | void OPluginManager::replace( const OPluginItem& item ) { | 872 | void OPluginManager::replace( const OPluginItem& item ) { |
873 | OPluginItem _item; | 873 | OPluginItem _item; |
874 | 874 | ||
875 | /* for all plugins */ | 875 | /* for all plugins */ |
876 | for ( OPluginItem::List::Iterator it=m_plugins.begin();it != m_plugins.end(); ++it ) { | 876 | for ( OPluginItem::List::Iterator it=m_plugins.begin();it != m_plugins.end(); ++it ) { |
877 | _item = *it; | 877 | _item = *it; |
878 | /* if path and name are the same we will remove, readd and return */ | 878 | /* if path and name are the same we will remove, readd and return */ |