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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2008-12-17 23:02:50
Message-ID: 1229554970.445957.27769.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 898314 by dfaure:

oops this wasn't supposed to go in, sorry.


 M  +7 -16     kdirmodel.cpp  


--- trunk/KDE/kdelibs/kio/kio/kdirmodel.cpp #898313:898314
@@ -196,7 +196,6 @@
     KUrl url = cleanupUrl(_url);
     if (url == urlForNode(m_rootNode))
         return m_rootNode;
-    kDebug() << "nodeForUrl(" << _url << ") = " << m_nodeHash.value(url);
     return m_nodeHash.value(url);
 }
 
@@ -206,14 +205,10 @@
         KUrl::List urls;
         static_cast<KDirModelDirNode *>(node)->collectAllChildUrls(urls);
         Q_FOREACH(const KUrl& u, urls) {
-            kDebug() << u << "(cleaned up=" << cleanupUrl(u) << ")";
-            int found = m_nodeHash.remove(u);
-            Q_ASSERT(found == 1);
+            m_nodeHash.remove(u);
         }
     } else {
-        kDebug() << url << "(removing cleaned up=" << cleanupUrl(url) << ")";
-        int found = m_nodeHash.remove(cleanupUrl(url));
-        Q_ASSERT(found == 1);
+        m_nodeHash.remove(cleanupUrl(url));
     }
 }
 
@@ -466,12 +461,8 @@
     if (items.count() == 1) {
         const int r = node->rowNumber();
         q->beginRemoveRows(parentIndex, r, r);
-        kDebug() << "removing one item" << url << node;
         removeFromNodeHash(node, url);
-        KDirModelNode* takenNode = dirNode->m_childNodes.takeAt(r);
-        kDebug() << takenNode << takenNode->item().url();
-        Q_ASSERT(takenNode == node);
-        delete takenNode;
+        delete dirNode->m_childNodes.takeAt(r);
         q->endRemoveRows();
         Q_ASSERT(dirNode->m_childNodesByName.contains(url.fileName()));
         dirNode->m_childNodesByName.remove(url.fileName());
@@ -571,10 +562,10 @@
         q->endRemoveRows();
     }
 
-    m_nodeHash.clear();
-    //emit layoutAboutToBeChanged();
-    clear();
-    //emit layoutChanged();
+        m_nodeHash.clear();
+        //emit layoutAboutToBeChanged();
+        clear();
+        //emit layoutChanged();
 }
 
 void KDirModel::itemChanged( const QModelIndex& index )
[prev in list] [next in list] [prev in thread] [next in thread]