if(foo) delete foo; => delete foo;

svn path=/trunk/KDE/kdepim/; revision=954221

messagelistview/core/configureaggregationsdialog.cpp

@@ -56,8 +56,7 @@ public:
   }
   ~AggregationListWidgetItem()
   {
-    if ( mAggregation )
-      delete mAggregation;
+    delete mAggregation;
   }
 
 public:

messagelistview/core/configurethemesdialog.cpp

@@ -56,8 +56,7 @@ public:
   }
   ~ThemeListWidgetItem()
   {
-    if ( mTheme )
-      delete mTheme;
+    delete mTheme;
   }
 
 public:

messagelistview/core/manager.cpp

@@ -313,8 +313,7 @@ const Aggregation * Manager::aggregationForStorageModel( const StorageModel *sto
 void Manager::addAggregation( Aggregation *set )
 {
   Aggregation * old = mAggregations.value( set->id() );
-  if ( old )
-    delete old;
+  delete old;
   mAggregations.insert( set->id(), set );
 }
 
@@ -591,8 +590,7 @@ const Theme * Manager::themeForStorageModel( const StorageModel *storageModel, b
 void Manager::addTheme( Theme *set )
 {
   Theme * old = mThemes.value( set->id() );
-  if ( old )
-    delete old;
+  delete old;
   mThemes.insert( set->id(), set );
 }
 

messagelistview/core/model.cpp

@@ -217,8 +217,7 @@ public:
 
   ~ViewItemJob()
   {
-    if ( mInvariantIndexList )
-      delete mInvariantIndexList;
+    delete mInvariantIndexList;
   }
 public:
   int startIndex() const
@@ -315,8 +314,7 @@ Model::~Model()
   delete mThreadingCacheMessageInReplyToIdMD5ToMessageItem;
   void clearThreadingCacheMessageSubjectMD5ToMessageItem();
   delete mThreadingCacheMessageSubjectMD5ToMessageItem;
-  if ( mPersistentSetManager )
-    delete mPersistentSetManager;
+  delete mPersistentSetManager;
   // Delete the invariant row mapper before removing the items.
   // It's faster since the items will not need to call the invariant
   delete mInvariantRowMapper;

messagelistview/core/widgetbase.cpp

@@ -182,16 +182,11 @@ Widget::~Widget()
 
   Manager::unregisterWidget( this );
 
-  if ( mSearchTimer )
-    delete mSearchTimer;
-  if ( mTheme )
-    delete mTheme;
-  if ( mAggregation )
-    delete mAggregation;
-  if ( mFilter )
-    delete mFilter;
-  if ( mStorageModel )
-    delete mStorageModel;
+  delete mSearchTimer;
+  delete mTheme;
+  delete mAggregation;
+  delete mFilter;
+  delete mStorageModel;
 }
 
 KPIM::MessageStatus Widget::currentFilterStatus() const
@@ -226,8 +221,7 @@ void Widget::setDefaultAggregationForStorageModel( const StorageModel * storageM
 
   Q_ASSERT( opt );
 
-  if ( mAggregation )
-    delete mAggregation;
+  delete mAggregation;
   mAggregation = new Aggregation( *opt );
 
   mView->setAggregation( mAggregation );
@@ -241,8 +235,7 @@ void Widget::setDefaultThemeForStorageModel( const StorageModel * storageModel )
 
   Q_ASSERT( opt );
 
-  if ( mTheme )
-    delete mTheme;
+  delete mTheme;
   mTheme = new Theme( *opt );
 
   mView->setTheme( mTheme );
@@ -311,8 +304,7 @@ void Widget::setStorageModel( StorageModel * storageModel, PreSelectionMode preS
 
   mView->setStorageModel( mStorageModel, preSelectionMode );
 
-  if ( oldModel )
-    delete oldModel;
+  delete oldModel;
 
   mStatusFilterButton->setEnabled( mStorageModel );
   mSortOrderButton->setEnabled( mStorageModel );
@@ -432,8 +424,7 @@ void Widget::themeSelected( bool )
 
   const Theme * opt = Manager::instance()->theme( id );
 
-  if ( mTheme )
-    delete mTheme;
+  delete mTheme;
   mTheme = new Theme( *opt );
 
   mView->setTheme( mTheme );
@@ -546,8 +537,7 @@ void Widget::aggregationSelected( bool )
 
   const Aggregation * opt = Manager::instance()->aggregation( id );
 
-  if ( mAggregation )
-    delete mAggregation;
+  delete mAggregation;
   mAggregation = new Aggregation( *opt );
 
   mView->setAggregation( mAggregation );