Branch: master

6a31c6a6 2014-05-01 16:17:53 Timothy Pearson
Clean up old compile-time check
Attempt to resolve crashes of the form reported in
TDECRSH-2a6245f-00c183f-e857aaa-23bc08b-cccc168-90e4138-b0b162f
M konqueror/iconview/konq_iconview.cc
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 7ff2db6..04b2bfb 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -1051,14 +1051,9 @@
 
 void KonqKfmIconView::slotDeleteItem( KFileItem * _fileitem )
 {
-    // new in 3.5.5
-#ifdef TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
     KFileItemList list;
     list.append( _fileitem );
     emit m_extension->itemsRemoved( list );
-#else
-#error "Your tdelibs doesn't have KParts::BrowserExtension::itemsRemoved, please update it to at least 3.5.5"
-#endif
 
     if ( _fileitem == m_dirLister->rootItem() )
     {
@@ -1079,7 +1074,6 @@
         m_pIconView->stopImagePreview();
         KonqDirPart::deleteItem( _fileitem );
 
-        m_pIconView->takeItem( ivi );
         m_mimeTypeResolver->m_lstPendingMimeIconItems.remove( ivi );
         m_itemDict.remove( _fileitem );
         if (m_paOutstandingOverlays.first() == ivi) // Being processed?