Make harlekin happy. AkA uncomitted code

2 files changed, 16 insertions, 3 deletions

diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp
index 2aca382..87e24d4 100644
--- a/libopie2/opiecore/opluginloader.cpp
+++ b/libopie2/opiecore/opluginloader.cpp
@@ -556,25 +556,24 @@ OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorte
 
     if ( m_isSorted ) {
         QStringList pos =  cfg.readListEntry( "Positions", '.' );
         QStringList::Iterator it = pos.begin();
         while ( it != pos.end() )
             positionMap.insert(  *it++, (*it++).toInt() );
     }
 
 
 
 
     QStringList list = dir.entryList();
-    QStringList::Iterator it;
     for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
         QString str = unlibify( *it );
         OPluginItem item( str, _dir + "/" + *it );
 
         bool ex = excludedMap.contains( str );
         /*
          * if disabled but we should show all mark it as disabled
          * else continue because we don't want to add the item
          * else if sorted we assign the right position
          */
         if ( ex && !disabled)
             item.setEnabled( false );
@@ -663,25 +662,25 @@ OPluginLoader::~OPluginLoader() {
 }
 
 /**
  * \brief C'Tor using a OGenericPluginLoader
  * The C'tor. Pass your OGenericPluginLoader to manage
  * OGenericPluginLoader::allAvailable plugins.
  *
  *
  * @param loader A Pointer to your OGenericPluginLoader
  * @param name The name
  */
 OPluginManager::OPluginManager(  OGenericPluginLoader* loader)
-    : m_loader( loader )
+    : m_loader( loader ), m_isSorted( false )
 {
 }
 
 /**
  * \brief Overloaded c'tor using a List of Plugins and a type name
  * Overloaded Constructor to work with a 'Type' of plugins
  * and a correspending list of those. In this case calling load
  * is a no operation.
  *
  * @param name The name of your plugin ('today','inputmethods','applets')
  * @param lst A List with plugins of your type to manage
  * @param isSorted If the List should be treated sorted
@@ -862,17 +861,30 @@ void OPluginManager::save() {
 /**
  * @internal
  */
 QString OPluginManager::configName()const {
     QString str = m_loader ? m_loader->name() : m_cfgName;
     return str + "odpplugins";
 }
 
 /**
  * @internal.. replace in m_plugins by path... this is linear search O(n/2)
  */
 void OPluginManager::replace( const OPluginItem& item ) {
-// ### fixme
+    OPluginItem _item;
+
+    /* for all plugins */
+    for ( OPluginItem::List::Iterator it=m_plugins.begin();it != m_plugins.end(); ++it ) {
+        _item = *it;
+        /* if path and name are the same we will remove, readd and return */
+        if ( _item.path() == item.path() &&
+             _item.name() == item.name() ) {
+            it = m_plugins.remove( it );
+            m_plugins.append( item );
+            return;
+        }
+
+    }
 }
 
 }
 }
diff --git a/libopie2/opiecore/opluginloader.h b/libopie2/opiecore/opluginloader.h
index 2f9ec2a..740551c 100644
--- a/libopie2/opiecore/opluginloader.h
+++ b/libopie2/opiecore/opluginloader.h
@@ -148,24 +148,25 @@ public:
  * \brief A class to manage order and activation of plugins
  *
  * Manage order and activation. This is used by the Opie::Ui::OPluginConfig
  * This class controls the activation and order of plugins depending
  * on the OPluginLoader you supply.
  * You must call load() and save after construnction an instance
  *
  * @see Opie::Ui::OPluginConfig
  *
  */
 class OPluginManager {
 public:
+    typedef QValueList<OPluginManager*> List;
     OPluginManager( OGenericPluginLoader* );
     OPluginManager( const QString& name, const OPluginItem::List&, bool isSorted = false );
     virtual ~OPluginManager();
 
     OPluginItem crashedPlugin()const;
 
     OPluginItem::List managedPlugins()const;
 
     void setPosition( const OPluginItem& );
     void enable( const OPluginItem& );
     void disable( const OPluginItem& );
     void setEnabled( const OPluginItem&, bool = true);