summaryrefslogtreecommitdiff
authorzecke <zecke>2004-05-29 18:43:13 (UTC)
committer zecke <zecke>2004-05-29 18:43:13 (UTC)
commit43c1ce80bc5faf16fe9d86c4685512659f5180bc (patch) (side-by-side diff)
treeebd64b019954d702a39bad96d3324bbe79d7f9b6
parentf568ff9c68bdc61cbc4482f9b2c6e1096cecaae0 (diff)
downloadopie-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 /
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/opluginloader.cpp3
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 ) {
* ...
* loader.clear();
*
* \endcode
*
* @param name The name of the plugin directory.
* @param isSorted Tell the PluginLoader if your Plugins are sorted
*/
OGenericPluginLoader::OGenericPluginLoader( const QString& name, bool isSorted)
: m_dir( name ), m_autoDelete( false ), m_isSafeMode( false ),
m_isSorted( isSorted )
{
- setPluginDir( QPEApplication::qpeDir() + "/plugins/"+name );
+ setPluginDir( QPEApplication::qpeDir() + "plugins/"+name );
readConfig();
}
/**
* \brief simple d'tor that cleans up depending on autoDelete
*
* calls clear if autoDelete is true. This will release all interfaces
* and remove the library from this process if the refcount falls to zero
*/
OGenericPluginLoader::~OGenericPluginLoader() {
if ( m_autoDelete )
@@ -524,24 +524,25 @@ QString OGenericPluginLoader::unlibify( const QString& str ) {
*
* @param dir The dir to look in
* @param sorted Should positions be read?
* @param disabled Remove excluded from the list
*/
OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorted, bool disabled )const {
#ifdef Q_OS_MACX
QDir dir( _dir, "lib*.dylib" );
#else
QDir dir( _dir, "lib*.so" );
#endif
+
OPluginItem::List lst;
/*
* get excluded list and then iterate over them
* Excluded list contains the name
* Position is a list with 'name.pos.name.pos.name.pos'
*
* For the look up we will create two QMap<QString,pos>
*/
QMap<QString, int> positionMap;
QMap<QString, int> excludedMap;