Move function in foldercollection

svn path=/branches/work/akonadi-ports/kdepim/; revision=1043810

expirypropertiesdialog.cpp

@@ -182,12 +182,8 @@ void ExpiryPropertiesDialog::accept()
   if ( expireToFolder.isValid() )
     mFolder->setExpireToFolderId( QString::number( expireToFolder.id() ) );
   // trigger immediate expiry if there is something to do
-#if 0
   if ( enableGlobally )
     mFolder->expireOldMessages( true /*immediate*/);
-#else
-  kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
-#endif
   KDialog::accept();
 }
 

foldercollection.cpp

@@ -472,3 +472,7 @@ void FolderCollection::slotDeletionCollectionResult( KJob * job )
   }
 }
 
+void FolderCollection::expireOldMessages( bool immediate )
+{
+  kDebug() << "AKONADI PORT: port it  " << Q_FUNC_INFO;
+}

foldercollection.h

@@ -196,6 +196,7 @@ public:
   void markUnreadAsRead();
 
   void removeCollection();
+  void expireOldMessages( bool immediate );
 
 protected slots:
   void slotIdentitiesChanged();

kmmainwidget.cpp

@@ -1488,11 +1488,7 @@ void KMMainWidget::slotExpireFolder()
                                            KGuiItem(i18n("&Expire")))
         != KMessageBox::Continue) return;
   }
-#if 0 //Port it
   mCurrentFolder->expireOldMessages( true /*immediate*/);
-#else
-  kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
-#endif
 }
 
 //-----------------------------------------------------------------------------