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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kmail
From:       Allen Winter <winter () kde ! org>
Date:       2010-10-10 19:03:06
Message-ID: 20101010190306.7E7713E1F1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1184542 by winterz:

KMFolderIndex::silentlyRecreateIndex() and KMKernel::recreateCorruptIndexFiles()
are unused so remove them... makes my brain less confused which is a good thing.
MERGE: none (long gone in KDE4)


 M  +0 -11     kmfolderindex.cpp  
 M  +0 -39     kmkernel.cpp  
 M  +0 -1      kmkernel.h  


--- branches/kdepim/enterprise/kdepim/kmail/kmfolderindex.cpp #1184541:1184542
@@ -537,17 +537,6 @@
   return readIndex();
 }
 
-void KMFolderIndex::silentlyRecreateIndex()
-{
-  Q_ASSERT( !isOpened() );
-  open( "silentlyRecreateIndex" );
-  KCursorSaver busy( KBusyPtr::busy() );
-  createIndexFromContents();
-  mCompactable = true;
-  writeConfig();
-  close( "silentlyRecreateIndex" );
-}
-
 void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
 {
   kdDebug(5006) << "Updating index for " << label() << ", this might take a while." \
                << endl;
--- branches/kdepim/enterprise/kdepim/kmail/kmkernel.cpp #1184541:1184542
@@ -1525,7 +1525,6 @@
   the_folderMgr     = new KMFolderMgr(foldersPath);
   the_imapFolderMgr = new KMFolderMgr( KMFolderImap::cacheLocation(), KMImapDir);
   the_dimapFolderMgr = new KMFolderMgr( KMFolderCachedImap::cacheLocation(), \
                KMDImapDir);
-  //recreateCorruptIndexFiles();
 
   the_searchFolderMgr = new KMFolderMgr(locateLocal("data","kmail/search"), \
KMSearchDir);  KMFolder *lsf = the_searchFolderMgr->find( i18n("Last Search") );
@@ -1689,44 +1688,6 @@
   the_dimapFolderMgr->quiet( false );
 }
 
-void KMKernel::recreateCorruptIndexFiles()
-{
-  QValueList<QGuardedPtr<KMFolder> > folders;
-  QValueList<KMFolderIndex*> foldersWithBrokenIndex;
-  QStringList strList;
-  the_folderMgr->createFolderList( &strList, &folders );
-  the_imapFolderMgr->createFolderList( &strList, &folders );
-  the_dimapFolderMgr->createFolderList( &strList, &folders );
-  for ( int i = 0; folders.at(i) != folders.end(); i++ ) {
-    KMFolder * const folder = *folders.at(i);
-    if ( !folder || folder->isDir() || folder->isOpened() )
-      continue;
-    KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() );
-    if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) {
-      kdDebug(5006) << "Folder with broken index has status = " << \
                index->indexStatus() << endl;
-      foldersWithBrokenIndex.append( index );
-    }
-  }
-
-  if ( !foldersWithBrokenIndex.isEmpty() ) {
-    QStringList folderNames;
-    for ( uint i = 0; i < foldersWithBrokenIndex.size(); i++ ) {
-      folderNames << foldersWithBrokenIndex[i]->label();
-    }
-
-    KMessageBox::informationList( 0, i18n( "There is a problem with the mail index \
                of the following "
-                                           "folders, the indices will now be \
                regenerated.\n"
-                                           "This can happen because the index files \
                are out of date, missing or corrupted.\n"
-                                           "Contact your administrator if this \
                happens frequently.\n"
-                                           "Some information, like status flags, \
                might get lost." ),
-                                  folderNames, i18n( "Problem with mail indices" ) \
                );
-
-    for ( uint i = 0; i < foldersWithBrokenIndex.size(); i++ ) {
-      foldersWithBrokenIndex[i]->silentlyRecreateIndex();
-    }
-  }
-}
-
 bool KMKernel::doSessionManagement()
 {
 
--- branches/kdepim/enterprise/kdepim/kmail/kmkernel.h #1184541:1184542
@@ -253,7 +253,6 @@
   void init();
   void readConfig();
   void cleanupImapFolders();
-  void recreateCorruptIndexFiles();
   void testDir(const char *_name);
   void recoverDeadLetters();
   void initFolders(KConfig* cfg);


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