From: Frank Reininghaus Date: Sun, 3 Feb 2013 22:28:57 +0000 (+0100) Subject: Two small optimizations in KFileItemModel::removeItems() X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/687d5145a25b99255065035ec63f3a29c711367d Two small optimizations in KFileItemModel::removeItems() 1. It seems that it really can happen that KFileItems that we get from the dir lister's itemsDeleted signal are not in the model any more, e.g., if a folder where hidden files are shown is left and a folder where hidden files are not shown is entered. There is no need to output warnings then. 2. Remove the emptiness-check for the KFileItemList at the beginning. Even in the unlikely event that we do get an empty list, we return just a few lines later in the code. --- diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index a30e30e0f..e315eee50 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -1031,10 +1031,6 @@ static KItemRangeList sortedIndexesToKItemRangeList(const QList& sortedNumb void KFileItemModel::removeItems(const KFileItemList& items) { - if (items.isEmpty()) { - return; - } - #ifdef KFILEITEMMODEL_DEBUG kDebug() << "Removing " << items.count() << "items"; #endif @@ -1059,8 +1055,6 @@ void KFileItemModel::removeItems(const KFileItemList& items) ItemData* data = m_itemData.at(index); delete data; m_itemData[index] = 0; - } else { - kWarning() << "Item that should be deleted has not been found!"; } }