[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       Wilco Greven <greven () kde ! org>
Date:       2005-10-26 17:01:02
Message-ID: 1130346062.248873.28680.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 474529 by wgreven:

Use QHash<QString, T> instead of QHash<const char*, T>.


 M  +3 -3      klibloader.cpp  
 M  +1 -1      klibloader.h  


--- trunk/KDE/kdelibs/kdecore/klibloader.cpp #474528:474529
@@ -319,7 +319,7 @@
 {
 //    kdDebug(150) << "Deleting KLibLoader " << this << "  " << name() << endl;
 
-    for (QHash<const char*, KLibWrapPrivate*>::Iterator it = m_libs.begin(); it != m_libs.end(); ++it)
+    for (QHash<QString, KLibWrapPrivate*>::Iterator it = m_libs.begin(); it != m_libs.end(); ++it)
     {
       Q_ASSERT((*it) != 0);
       kdDebug(150) << "The KLibLoader contains the library " << (*it)->name
@@ -489,12 +489,12 @@
 {
   const KLibrary *lib = static_cast<const KLibrary *>( sender() );
 
-  for (QHash<const char*, KLibWrapPrivate*>::Iterator it = m_libs.begin(); it != m_libs.end(); ++it)
+  for (QHash<QString, KLibWrapPrivate*>::Iterator it = m_libs.begin(); it != m_libs.end(); ++it)
     if ( (*it)->lib == lib )
     {
       KLibWrapPrivate *wrap = *it;
       wrap->lib = 0;  /* the KLibrary object is already away */
-      m_libs.take( it.key() );
+      m_libs.remove( it.key() );
       close_pending( wrap );
       return;
     }
--- trunk/KDE/kdelibs/kdecore/klibloader.h #474528:474529
@@ -484,7 +484,7 @@
     void slotLibraryDestroyed();
 private:
     void close_pending( KLibWrapPrivate * );
-    QHash<const char*, KLibWrapPrivate*> m_libs;
+    QHash<QString, KLibWrapPrivate*> m_libs;
 
     static KLibLoader* s_self;
 
[prev in list] [next in list] [prev in thread] [next in thread]