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

List:       kde-commits
Subject:    kdepim/kmailcvt
From:       Danny Kukawka <danny.kukawka () web ! de>
Date:       2005-04-08 9:51:12
Message-ID: 20050408095112.0C7A5494 () office ! kde ! org
[Download RAW message or body]

CVS commit by dkukawka: 

- added checks for better interactivity if user clicked on 'Cancel' during
  import


  M +3 -0      filter_kmail_maildir.cxx   1.3
  M +3 -0      filter_sylpheed.cxx   1.2


--- kdepim/kmailcvt/filter_kmail_maildir.cxx  #1.2:1.3
@@ -68,4 +68,5 @@ void FilterKMail_maildir::import( Filter
                 int currentDir = 1, numSubDirs = rootSubDirs.size();
                 for(QStringList::Iterator filename = rootSubDirs.begin() ; filename \
!= rootSubDirs.end() ; ++filename, ++currentDir) { +                        \
if(info->shouldTerminate()) break;  if(!(*filename == "." || *filename == "..")) {
                                 info->setCurrent(0);
@@ -102,4 +103,5 @@ void FilterKMail_maildir::importDirConte
         QStringList subDirs = subfolders.entryList("*", QDir::Dirs | QDir::Hidden, \
                QDir::Name);
         for(QStringList::Iterator filename = subDirs.begin() ; filename != \
subDirs.end() ; ++filename) { +                if(info->shouldTerminate()) return;
                 if(!(*filename == "." || *filename == "..")) {
                         importDirContents(info, subfolders.filePath(*filename));
@@ -123,4 +125,5 @@ void FilterKMail_maildir::importFiles( F
         int currentFile = 1, numFiles = files.size();
         for ( QStringList::Iterator mailFile = files.begin(); mailFile != \
files.end(); ++mailFile, ++currentFile) { +                \
if(info->shouldTerminate()) return;  QString temp_mailfile = *mailFile;
                 if (!(temp_mailfile.endsWith(".index") || \
temp_mailfile.endsWith(".index.ids") ||

--- kdepim/kmailcvt/filter_sylpheed.cxx  #1.1:1.2
@@ -68,4 +68,5 @@ void FilterSylpheed::import( FilterInfo 
                 int currentDir = 1, numSubDirs = rootSubDirs.size();
                 for(QStringList::Iterator filename = rootSubDirs.begin() ; filename \
!= rootSubDirs.end() ; ++filename, ++currentDir) { +                        \
if(info->shouldTerminate()) break;  importDirContents(info, dir.filePath(*filename));
                         info->setOverall((int) ((float) currentDir / numSubDirs * \
100)); @@ -96,4 +97,5 @@ void FilterSylpheed::importDirContents( 
         QStringList subDirs = subfolders.entryList("[^\\.]*", QDir::Dirs , \
                QDir::Name);
         for(QStringList::Iterator filename = subDirs.begin() ; filename != \
subDirs.end() ; ++filename) { +                if(info->shouldTerminate()) return;
                 importDirContents(info, subfolders.filePath(*filename));
         }
@@ -115,4 +117,5 @@ void FilterSylpheed::importFiles( Filter
         int currentFile = 1, numFiles = files.size();
         for ( QStringList::Iterator mailFile = files.begin(); mailFile != \
files.end(); ++mailFile, ++currentFile) { +                \
if(info->shouldTerminate()) return;  QString _mfile = *mailFile;
                 if (!(_mfile.endsWith(".sylpheed_cache") || \
_mfile.endsWith(".sylpheed_mark") || _mfile.endsWith(".mh_sequences") )) {


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