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 | |||
@@ -525,49 +525,49 @@ QString OGenericPluginLoader::unlibify( const QString& str ) { | |||
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 | OPluginItem::List lst; | 536 | OPluginItem::List lst; |
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() ); |
562 | } | 562 | } |
563 | 563 | ||
564 | 564 | ||
565 | 565 | ||
566 | 566 | ||
567 | QStringList list = dir.entryList(); | 567 | QStringList list = dir.entryList(); |
568 | for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | 568 | for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { |
569 | QString str = unlibify( *it ); | 569 | QString str = unlibify( *it ); |
570 | OPluginItem item( str, _dir + "/" + *it ); | 570 | OPluginItem item( str, _dir + "/" + *it ); |
571 | 571 | ||
572 | bool ex = excludedMap.contains( str ); | 572 | bool ex = excludedMap.contains( str ); |
573 | /* | 573 | /* |
@@ -842,49 +842,49 @@ void OPluginManager::save() { | |||
842 | * Now safe for each path | 842 | * Now safe for each path |
843 | */ | 843 | */ |
844 | OConfig cfg( configName() ); | 844 | OConfig cfg( configName() ); |
845 | 845 | ||
846 | /* safe excluded items */ | 846 | /* safe excluded items */ |
847 | for ( QMap<QString, QStringList>::Iterator it = excluded.begin(); it != excluded.end(); ++it ) { | 847 | for ( QMap<QString, QStringList>::Iterator it = excluded.begin(); it != excluded.end(); ++it ) { |
848 | OConfigGroupSaver saver( &cfg, it.key() ); | 848 | OConfigGroupSaver saver( &cfg, it.key() ); |
849 | cfg.writeEntry("Excluded", it.data(), ',' ); | 849 | cfg.writeEntry("Excluded", it.data(), ',' ); |
850 | } | 850 | } |
851 | 851 | ||
852 | /* safe positions we could also see if positions.contains(path) and remove/write in the above loop | 852 | /* safe positions we could also see if positions.contains(path) and remove/write in the above loop |
853 | * ### Write a Test Suite that can profile these runs... | 853 | * ### Write a Test Suite that can profile these runs... |
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 */ |
879 | if ( _item.path() == item.path() && | 879 | if ( _item.path() == item.path() && |
880 | _item.name() == item.name() ) { | 880 | _item.name() == item.name() ) { |
881 | it = m_plugins.remove( it ); | 881 | it = m_plugins.remove( it ); |
882 | m_plugins.append( item ); | 882 | m_plugins.append( item ); |
883 | return; | 883 | return; |
884 | } | 884 | } |
885 | 885 | ||
886 | } | 886 | } |
887 | } | 887 | } |
888 | 888 | ||
889 | } | 889 | } |
890 | } | 890 | } |