SVN commit 1176444 by ppenz:

- Fix some minor logical issues from previous commit
- As we handle the case for a deleted directory model everywhere, don't print a warning anymore


 M  +7 -10     kfilepreviewgenerator.cpp  


--- trunk/KDE/kdelibs/kfile/kfilepreviewgenerator.cpp #1176443:1176444
@@ -28,7 +28,6 @@
 #include <kio/previewjob.h>
 #include <kdirlister.h>
 #include <kdirmodel.h>
-#include <kdebug.h>
 #include <ksharedconfig.h>
 
 #include <QApplication>
@@ -665,9 +664,7 @@
 void KFilePreviewGenerator::Private::updateCutItems()
 {
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
-        // see bug #196681
-        kWarning() << "KDirModel has been deleted before deleting KFilePreviewGenerator.";
+    if (!dirModel) {
         return;
     }
 
@@ -716,7 +713,7 @@
 void KFilePreviewGenerator::Private::dispatchIconUpdateQueue()
 {
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
+    if (!dirModel) {
         return;
     }
 
@@ -875,7 +872,7 @@
     }
 
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
+    if (!dirModel) {
         return;
     }
 
@@ -1065,7 +1062,7 @@
 void KFilePreviewGenerator::Private::orderItems(KFileItemList& items)
 {
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
+    if (!dirModel) {
         return;
     }
 
@@ -1112,7 +1109,7 @@
 void KFilePreviewGenerator::Private::addItemsToList(const QModelIndex& index, KFileItemList& list)
 {
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
+    if (!dirModel) {
         return;
     }
 
@@ -1132,7 +1129,7 @@
 void KFilePreviewGenerator::Private::delayedIconUpdate()
 {
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
+    if (!dirModel) {
         return;
     }
 
@@ -1164,7 +1161,7 @@
     }
 
     KDirModel *dirModel = m_dirModel.data();
-    if (!dirModel == 0) {
+    if (!dirModel) {
         return;
     }