summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/opluginloader.cpp4
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,31 +1,32 @@
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
20namespace Opie { 21namespace Opie {
21namespace Core { 22namespace Core {
22namespace Internal { 23namespace Internal {
23struct OPluginLibraryHolder { 24struct OPluginLibraryHolder {
24 static OPluginLibraryHolder *self(); 25 static OPluginLibraryHolder *self();
25 QLibrary *ref( const QString& ); 26 QLibrary *ref( const QString& );
26 void deref( QLibrary* ); 27 void deref( QLibrary* );
27private: 28private:
28 29
29 OPluginLibraryHolder(); 30 OPluginLibraryHolder();
30 ~OPluginLibraryHolder(); 31 ~OPluginLibraryHolder();
31 QDict<QLibrary> m_libs; 32 QDict<QLibrary> m_libs;
@@ -534,53 +535,54 @@ OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorte
534#endif 535#endif
535 536
536 537
537 OPluginItem::List lst; 538 OPluginItem::List lst;
538 539
539 /* 540 /*
540 * get excluded list and then iterate over them 541 * get excluded list and then iterate over them
541 * Excluded list contains the name 542 * Excluded list contains the name
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 */
579 if ( ex && !disabled) 581 if ( ex && !disabled)
580 item.setEnabled( false ); 582 item.setEnabled( false );
581 else if ( ex && disabled ) 583 else if ( ex && disabled )
582 continue; 584 continue;
583 else if ( sorted ) 585 else if ( sorted )
584 item.setPosition( positionMap[str] ); 586 item.setPosition( positionMap[str] );
585 587
586 lst.append( item ); 588 lst.append( item );