author | zecke <zecke> | 2004-08-25 21:53:50 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-25 21:53:50 (UTC) |
commit | a64c92819cd3106584d9005e42ed972726081a94 (patch) (unidiff) | |
tree | f8ac45c7154db71a988cc5a9596587a30b9d9cce | |
parent | df3e4c8b13c16aeb96e70dbaa2d409f83eed988e (diff) | |
download | opie-a64c92819cd3106584d9005e42ed972726081a94.zip opie-a64c92819cd3106584d9005e42ed972726081a94.tar.gz opie-a64c92819cd3106584d9005e42ed972726081a94.tar.bz2 |
Respect the value passed to the method
-rw-r--r-- | libopie2/opiecore/opluginloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp index e7eddc2..1edf3a1 100644 --- a/libopie2/opiecore/opluginloader.cpp +++ b/libopie2/opiecore/opluginloader.cpp | |||
@@ -1,23 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | * LGPLv2 or later | 2 | * LGPLv2 or later |
3 | * zecke@handhelds.org | 3 | * zecke@handhelds.org |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "opluginloader.h" | 6 | #include "opluginloader.h" |
7 | #include "oconfig.h" | 7 | #include "oconfig.h" |
8 | #include "odebug.h" | ||
8 | 9 | ||
9 | #include <qpe/qpeapplication.h> | 10 | #include <qpe/qpeapplication.h> |
10 | 11 | ||
11 | #include <qdir.h> | 12 | #include <qdir.h> |
12 | #include <qdict.h> | 13 | #include <qdict.h> |
13 | #include <qtl.h> | 14 | #include <qtl.h> |
14 | #include <qfile.h> | 15 | #include <qfile.h> |
15 | 16 | ||
16 | #include <stdlib.h> | 17 | #include <stdlib.h> |
17 | 18 | ||
18 | 19 | ||
19 | 20 | ||
20 | namespace Opie { | 21 | namespace Opie { |
21 | namespace Core { | 22 | namespace Core { |
22 | namespace Internal { | 23 | namespace Internal { |
23 | struct OPluginLibraryHolder { | 24 | struct OPluginLibraryHolder { |
@@ -542,37 +543,38 @@ OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorte | |||
542 | * Position is a list with 'name.pos.name.pos.name.pos' | 543 | * Position is a list with 'name.pos.name.pos.name.pos' |
543 | * | 544 | * |
544 | * For the look up we will create two QMap<QString,pos> | 545 | * For the look up we will create two QMap<QString,pos> |
545 | */ | 546 | */ |
546 | QMap<QString, int> positionMap; | 547 | QMap<QString, int> positionMap; |
547 | QMap<QString, int> excludedMap; | 548 | QMap<QString, int> excludedMap; |
548 | 549 | ||
549 | 550 | ||
550 | OConfig cfg( m_dir+"-odpplugins" ); | 551 | OConfig cfg( m_dir+"-odpplugins" ); |
551 | cfg.setGroup( _dir ); | 552 | cfg.setGroup( _dir ); |
552 | 553 | ||
553 | 554 | ||
554 | QStringList excludes = cfg.readListEntry( "Excluded", ',' ); | 555 | QStringList excludes = cfg.readListEntry( "Excluded", ',' ); |
555 | for ( QStringList::Iterator it = excludes.begin(); it != excludes.end(); ++it ) | 556 | for ( QStringList::Iterator it = excludes.begin(); it != excludes.end(); ++it ) |
556 | excludedMap.insert( *it, -2 ); | 557 | excludedMap.insert( *it, -2 ); |
557 | 558 | ||
558 | if ( m_isSorted ) { | 559 | if ( sorted ) { |
559 | QStringList pos = cfg.readListEntry( "Positions", '.' ); | 560 | QStringList pos = cfg.readListEntry( "Positions", '.' ); |
560 | QStringList::Iterator it = pos.begin(); | 561 | QStringList::Iterator it = pos.begin(); |
561 | while ( it != pos.end() ) | 562 | while ( it != pos.end() ) |
562 | positionMap.insert( *it++, (*it++).toInt() ); | 563 | positionMap.insert( *it++, (*it++).toInt() ); |
564 | |||
563 | } | 565 | } |
564 | 566 | ||
565 | 567 | ||
566 | 568 | ||
567 | 569 | ||
568 | QStringList list = dir.entryList(); | 570 | QStringList list = dir.entryList(); |
569 | for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | 571 | for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { |
570 | QString str = unlibify( *it ); | 572 | QString str = unlibify( *it ); |
571 | OPluginItem item( str, _dir + "/" + *it ); | 573 | OPluginItem item( str, _dir + "/" + *it ); |
572 | 574 | ||
573 | bool ex = excludedMap.contains( str ); | 575 | bool ex = excludedMap.contains( str ); |
574 | /* | 576 | /* |
575 | * if disabled but we should show all mark it as disabled | 577 | * if disabled but we should show all mark it as disabled |
576 | * else continue because we don't want to add the item | 578 | * else continue because we don't want to add the item |
577 | * else if sorted we assign the right position | 579 | * else if sorted we assign the right position |
578 | */ | 580 | */ |