[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim/kmail
From:       Laurent Montel <montel () kde ! org>
Date:       2009-10-16 12:04:09
Message-ID: 1255694649.166826.7669.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1036046 by mlaurent:

maildirjob.h can be remove (done by akonadi)


 M  +0 -1      CMakeLists.txt  
 M  +0 -1      cachedimapjob.cpp  
 M  +7 -3      kmfoldermaildir.cpp  
 M  +0 -3      kmfoldermaildir.h  
 D             maildirjob.cpp  
 D             maildirjob.h  


--- branches/work/akonadi-ports/kdepim/kmail/CMakeLists.txt #1036045:1036046
@@ -155,7 +155,6 @@
    kmfoldersearch.cpp
    folderjob.cpp
    cachedimapjob.cpp
-   maildirjob.cpp
    mboxjob.cpp
    imapjob.cpp
    subscriptiondialog.cpp
--- branches/work/akonadi-ports/kdepim/kmail/cachedimapjob.cpp #1036045:1036046
@@ -39,7 +39,6 @@
 #include "kmailicalifaceimpl.h"
 #include "kmacctcachedimap.h"
 #include "kmmsgdict.h"
-#include "maildirjob.h"
 #include "util.h"
 #include "scalix.h"
 
--- branches/work/akonadi-ports/kdepim/kmail/kmfoldermaildir.cpp #1036045:1036046
@@ -13,10 +13,8 @@
 #include "kmfoldermgr.h"
 #include "kmfolder.h"
 #include "undostack.h"
-#include "maildirjob.h"
 #include "messageviewer/kcursorsaver.h"
 #include "jobscheduler.h"
-using KMail::MaildirJob;
 #include "compactionjob.h"
 #include "kmmsgdict.h"
 #include "util.h"
@@ -301,9 +299,12 @@
 KMFolderMaildir::doCreateJob( KMMessage *msg, FolderJob::JobType jt,
                               KMFolder *folder,  const QString&, const \
MessageViewer::AttachmentStrategy* ) const  {
+#if 0	
   MaildirJob *job = new MaildirJob( msg, jt, folder );
-  job->setParentFolder( this );
+  job->setParentFolder( this );  
   return job;
+#endif
+return 0;  
 }
 
 //-------------------------------------------------------------
@@ -311,9 +312,12 @@
 KMFolderMaildir::doCreateJob( QList<KMMessage*>& msgList, const QString& sets,
                               FolderJob::JobType jt, KMFolder *folder ) const
 {
+#if 0	
   MaildirJob *job = new MaildirJob( msgList, sets, jt, folder );
   job->setParentFolder( this );
   return job;
+#endif
+return 0;  
 }
 
 //-------------------------------------------------------------
--- branches/work/akonadi-ports/kdepim/kmail/kmfoldermaildir.h #1036045:1036046
@@ -10,7 +10,6 @@
 class KMFolderMaildir;
 namespace KMail {
   class FolderJob;
-  class MaildirJob;
 }
 
 namespace MessageViewer {
@@ -18,12 +17,10 @@
 }
 
 using KMail::FolderJob;
-using KMail::MaildirJob;
 
 class KMFolderMaildir : public KMFolderIndex
 {
   Q_OBJECT
-  friend class ::KMail::MaildirJob;
 public:
   /** Usually a parent is given. But in some cases there is no
     fitting parent object available. Then the name of the folder


[prev in list] [next in list] [prev in thread] [next in thread]