[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-28 11:31:03
Message-ID: 1256729463.284847.4398.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1041724 by mlaurent:

KMFolderMgr--


 M  +10 -5     actionscheduler.cpp  
 M  +2 -0      actionscheduler.h  
 M  +3 -5      kmfoldermgr.cpp  
 M  +4 -11     kmsystemtray.cpp  
 M  +6 -4      searchwindow.cpp  


--- branches/work/akonadi-ports/kdepim/kmail/actionscheduler.cpp #1041723:1041724
@@ -34,8 +34,6 @@
 #include "messageproperty.h"
 #include "kmfilter.h"
 #include "kmfolderindex.h"
-//TODO port to akonadi #include "kmfolderimap.h"
-#include "kmfoldermgr.h"
 #include "kmmsgdict.h"
 #include "kmcommands.h"
 #include "broadcaststatus.h"
@@ -53,8 +51,9 @@
 
 using namespace KMail;
 
-
+#if 0
 KMFolderMgr* ActionScheduler::tempFolderMgr = 0;
+#endif
 int ActionScheduler::refCount = 0;
 int ActionScheduler::count = 0;
 QList<ActionScheduler*> *ActionScheduler::schedulerList = 0;
@@ -112,12 +111,16 @@
   } else {
     QString tmpName;
     tmpName.setNum( count );
+#if 0
     if (!tempFolderMgr)
       tempFolderMgr = new KMFolderMgr(KStandardDirs::locateLocal("data","kmail/filter"));
     KMFolder *tempFolder = tempFolderMgr->findOrCreate( tmpName );
     tempFolder->expunge();
     mDeleteSrcFolder = true;
     setSourceFolder( tempFolder );
+#else
+    kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
+#endif
   }
   if (!schedulerList)
       schedulerList = new QList<ActionScheduler*>;
@@ -133,16 +136,18 @@
   disconnect( mSrcFolder, SIGNAL(expunged(KMFolder*)),
               this, SLOT(folderClosedOrExpunged()) );
   mSrcFolder->close( "actionschedsrc" );
-
+#if 0
   if ( mDeleteSrcFolder ) {
     tempFolderMgr->remove( mSrcFolder );
   }
-
+#endif
   --refCount;
+#if 0
   if ( refCount == 0 ) {
     delete tempFolderMgr;
     tempFolderMgr = 0;
   }
+#endif
 }
 
 void ActionScheduler::setAutoDestruct( bool autoDestruct )
--- branches/work/akonadi-ports/kdepim/kmail/actionscheduler.h #1041723:1041724
@@ -145,7 +145,9 @@
 
 private:
   static QList<ActionScheduler*> *schedulerList; // for debugging
+#if 0
   static KMFolderMgr *tempFolderMgr;
+#endif
   static int refCount, count;
   static bool sEnabled, sEnabledChecked;
 
--- branches/work/akonadi-ports/kdepim/kmail/kmfoldermgr.cpp #1041723:1041724
@@ -26,8 +26,6 @@
 #include "kmfiltermgr.h"
 #include "folderstorage.h"
 #include "kmfolder.h"
-//TODO port to akonadi #include "kmfoldercachedimap.h"
-//TODO port to akonadi #include "kmacctcachedimap.h"
 
 
 //-----------------------------------------------------------------------------
@@ -571,7 +569,7 @@
 void KMFolderMgr::renameFolder( KMFolder* folder, const QString& newName,
                                 KMFolderDir *newParent )
 {
-#if 0 //Done by akonadi	
+#if 0 //Done by akonadi
   RenameJob* job = new RenameJob( folder->storage(), newName, newParent );
   connect( job, SIGNAL( renameDone( const QString&, bool ) ),
       this, SLOT( slotRenameDone( const QString&, bool ) ) );
@@ -579,13 +577,13 @@
            this, SIGNAL( folderMoveOrCopyOperationFinished() ) );
 
   job->start();
-#endif  
+#endif
 }
 
 //-----------------------------------------------------------------------------
 void KMFolderMgr::copyFolder( KMFolder* folder, KMFolderDir *newParent )
 {
-#if 0 //Done by akonadi	
+#if 0 //Done by akonadi
   kDebug() << "Copy folder:" << folder->prettyUrl();
   CopyFolderJob* job = new CopyFolderJob( folder->storage(), newParent );
   connect( job, SIGNAL( folderCopyComplete( bool ) ),
--- branches/work/akonadi-ports/kdepim/kmail/kmsystemtray.cpp #1041723:1041724
@@ -19,8 +19,6 @@
 
 #include "kmsystemtray.h"
 #include "kmfolder.h"
-#include "kmfoldermgr.h"
-//TODO port to akonadi #include "kmfolderimap.h"
 #include "kmmainwidget.h"
 #include "accountmanager.h"
 
@@ -97,15 +95,13 @@
            this, SLOT( slotActivated( QSystemTrayIcon::ActivationReason ) ) );
   connect( contextMenu(), SIGNAL( aboutToShow() ),
            this, SLOT( slotContextMenuAboutToShow() ) );
-
+#if 0
   connect( kmkernel->folderMgr(), SIGNAL(changed()), SLOT(foldersChanged()));
-#if 0 //TODO port to akonadi
-  connect( kmkernel->imapFolderMgr(), SIGNAL(changed()), SLOT(foldersChanged()));
-  connect( kmkernel->dimapFolderMgr(), SIGNAL(changed()), SLOT(foldersChanged()));
+  connect( kmkernel->searchFolderMgr(), SIGNAL(changed()), SLOT(foldersChanged()));
+
 #else
     kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
 #endif
-  connect( kmkernel->searchFolderMgr(), SIGNAL(changed()), SLOT(foldersChanged()));
 
   connect( kmkernel->acctMgr(), SIGNAL( checkedMail( bool, bool, const QMap<QString, int> & ) ),
            SLOT( updateNewMessages() ) );
@@ -258,14 +254,11 @@
 
   QStringList folderNames;
   QList<QPointer<KMFolder> > folderList;
+#if 0
   kmkernel->folderMgr()->createFolderList(&folderNames, &folderList);
-#if 0 //TODO port to akonadi
-  kmkernel->imapFolderMgr()->createFolderList(&folderNames, &folderList);
-  kmkernel->dimapFolderMgr()->createFolderList(&folderNames, &folderList);
 #else
     kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
 #endif
-  kmkernel->searchFolderMgr()->createFolderList(&folderNames, &folderList);
 
   QStringList::iterator strIt = folderNames.begin();
 
--- branches/work/akonadi-ports/kdepim/kmail/searchwindow.cpp #1041723:1041724
@@ -47,8 +47,6 @@
 
 #include "folderrequester.h"
 #include "kmcommands.h"
-#include "kmfoldermgr.h"
-//TODO port to akonadi #include "kmfoldersearch.h"
 #include "kmfolder.h"
 #include "kmmainwidget.h"
 #include "kmmsgdict.h"
@@ -374,9 +372,12 @@
   mCutAction = ac->addAction( KStandardAction::Cut, "search_cut_messages", this, SLOT(slotCutMsgs()) );
 
   connect(mTimer, SIGNAL(timeout()), this, SLOT(updStatus()));
+#if 0
   connect(kmkernel->searchFolderMgr(), SIGNAL(folderInvalidated(KMFolder*)),
           this, SLOT(folderInvalidated(KMFolder*)));
-
+#else
+  kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
+#endif
   connect(mCbxFolders, SIGNAL(folderChanged(const Akonadi::Collection&)),
           this, SLOT(slotFolderActivated()));
 
@@ -510,7 +511,7 @@
   mSortColumn = mLbxMatches->sortColumn();
   mSortOrder = mLbxMatches->header()->sortIndicatorOrder();
   mLbxMatches->setSortingEnabled( false );
-
+#if 0
   // If we haven't openend an existing search folder, find or create one.
   if ( !mFolder ) {
     KMFolderMgr *mgr = kmkernel->searchFolderMgr();
@@ -531,6 +532,7 @@
     }
     mFolder = dynamic_cast<KMFolderSearch*>( folder->storage() );
   }
+#endif
   mFolder->stopSearch();
   disconnect( mFolder, SIGNAL( msgAdded( int ) ),
               this, SLOT( slotAddMsg( int ) ) );
[prev in list] [next in list] [prev in thread] [next in thread]