diff --git a/src/filters.cpp b/src/filters.cpp index 3ff048776e017fbcda1df30f5df94f034a0b28d5..03976928c464d44f0efea94fd34607bd4eace984 100644 --- a/src/filters.cpp +++ b/src/filters.cpp @@ -308,7 +308,7 @@ bool Filter::checkForDuplicates(const QString &msgID, return false; } -bool Filter::doAddMessage(const QString &folderName, +bool Filter::importMessage(const QString &folderName, const QString &msgPath, bool duplicateCheck, Akonadi::MessageStatus status) diff --git a/src/filters.h b/src/filters.h index 694fc779a2bcbeeee571fcd5d8c705af829a8a4d..2ba6f4f256941a1f0830a2c22495e7ef69b1263b 100644 --- a/src/filters.h +++ b/src/filters.h @@ -89,7 +89,7 @@ protected: const Akonadi::Collection &msgCollection, const QString &messageFolder); - bool doAddMessage(const QString &folderName, + bool importMessage(const QString &folderName, const QString &msgPath, bool duplicateCheck, Akonadi::MessageStatus status = Akonadi::MessageStatus()); diff --git a/src/filters/filterbalsa.cpp b/src/filters/filterbalsa.cpp index 26d02ed4195118fc18a0e60b27efd043f826c5b9..06631a469fd5c6d688346d845b9a88e02f7c2ee9 100644 --- a/src/filters/filterbalsa.cpp +++ b/src/filters/filterbalsa.cpp @@ -209,7 +209,7 @@ void FilterBalsa::importFiles(const QString &dirName) } const Akonadi::MessageStatus status = statusFromFile(*mailFile); - if (! doAddMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage(), status)) { + if (! importMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage(), status)) { filterInfo()->addErrorLogEntry(i18n("Could not import %1", *mailFile)); } filterInfo()->setCurrent((int)((float) currentFile / numFiles * 100)); diff --git a/src/filters/filterevolution.cpp b/src/filters/filterevolution.cpp index 1c8622a6ca9416c187b163621f6be3372435a9b2..b4c1084cac1961b346522379b1cde552b3635789 100644 --- a/src/filters/filterevolution.cpp +++ b/src/filters/filterevolution.cpp @@ -194,7 +194,7 @@ void FilterEvolution::importMBox(const QString &mboxName, const QString &rootDir destFolder = QLatin1String("Evolution-Import/") + destFolder; } - doAddMessage(destFolder, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(destFolder, tmp.fileName(), filterInfo()->removeDupMessage()); const int currentPercentage = (int)(((float) mbox.pos() / filenameInfo.size()) * 100); filterInfo()->setCurrent(currentPercentage); diff --git a/src/filters/filterevolution_v2.cpp b/src/filters/filterevolution_v2.cpp index d14dbb9018f868f8ffca6c63a9faf70b4aab337f..01980b9d441ba95930c993294cea1b62642a54dc 100644 --- a/src/filters/filterevolution_v2.cpp +++ b/src/filters/filterevolution_v2.cpp @@ -255,7 +255,7 @@ void FilterEvolution_v2::importMBox(const QString &mboxName, const QString &root } } - doAddMessage(destFolder, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(destFolder, tmp.fileName(), filterInfo()->removeDupMessage()); int currentPercentage = (int)(((float) mbox.pos() / filenameInfo.size()) * 100); filterInfo()->setCurrent(currentPercentage); diff --git a/src/filters/filterevolution_v3.cpp b/src/filters/filterevolution_v3.cpp index 64433b002ea366837b275d5bc75a332ffef27e50..813d113c2d86456cfdbd7790e60954409a97c45b 100644 --- a/src/filters/filterevolution_v3.cpp +++ b/src/filters/filterevolution_v3.cpp @@ -204,7 +204,7 @@ void FilterEvolution_v3::importFiles(const QString &dirName) } Akonadi::MessageStatus status = statusFromFile(*mailFile); - if (! doAddMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage(), status)) { + if (! importMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage(), status)) { filterInfo()->addErrorLogEntry(i18n("Could not import %1", *mailFile)); } filterInfo()->setCurrent((int)((float) currentFile / numFiles * 100)); diff --git a/src/filters/filterkmail_maildir.cpp b/src/filters/filterkmail_maildir.cpp index 6129415dfef525681f4b8836605236756c008320..25672194522aafa6b254971c7ba1ef3c51a7702d 100644 --- a/src/filters/filterkmail_maildir.cpp +++ b/src/filters/filterkmail_maildir.cpp @@ -191,7 +191,7 @@ void FilterKMail_maildir::importFiles(const QString &dirName) generatedPath = true; } - if (!doAddMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage())) { + if (!importMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage())) { filterInfo()->addErrorLogEntry(i18n("Could not import %1, duplicated message", *mailFile)); } filterInfo()->setCurrent((int)((float) currentFile / numFiles * 100)); diff --git a/src/filters/filterlnotes.cpp b/src/filters/filterlnotes.cpp index 761c0b979356b0266c0b50a2c4e6af6d750a0758..dd5ede35ed91943515908162fdbd5c39ac5ea226 100644 --- a/src/filters/filterlnotes.cpp +++ b/src/filters/filterlnotes.cpp @@ -146,7 +146,7 @@ void FilterLNotes::ImportLNotes(const QString &file) // close file, send it tempfile->close(); - doAddMessage(folder, tempfile->fileName(), filterInfo()->removeDupMessage()); + importMessage(folder, tempfile->fileName(), filterInfo()->removeDupMessage()); tempfile->setAutoRemove(true); state = 0; @@ -175,7 +175,7 @@ void FilterLNotes::ImportLNotes(const QString &file) if (state != 0) { Q_ASSERT(tempfile); - doAddMessage(folder, tempfile->fileName(), filterInfo()->removeDupMessage()); + importMessage(folder, tempfile->fileName(), filterInfo()->removeDupMessage()); } if (tempfile) { tempfile->setAutoRemove(true); diff --git a/src/filters/filtermailapp.cpp b/src/filters/filtermailapp.cpp index 26023664fce25ede6d5614efd872f7fd6623c171..d53dc255aea976267a6baed790db4db636716107 100644 --- a/src/filters/filtermailapp.cpp +++ b/src/filters/filtermailapp.cpp @@ -122,7 +122,7 @@ void FilterMailApp::importMails(const QString &maildir) tmp.flush(); first_msg = false; - doAddMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); int currentPercentage = (int)(((float) mbox.pos() / filenameInfo.size()) * 100); filterInfo()->setCurrent(currentPercentage); diff --git a/src/filters/filtermailmangzip.cpp b/src/filters/filtermailmangzip.cpp index d61dc9f1522a795b3bf612aa75e9fc09f8849b4c..96a022285473a90a9fa9d04b72868727ff4ef7e8 100644 --- a/src/filters/filtermailmangzip.cpp +++ b/src/filters/filtermailmangzip.cpp @@ -119,7 +119,7 @@ void FilterMailmanGzip::importMails(const QStringList &filenames) first_msg = false; if (tmp.size() > 0) { - doAddMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); } else { qCWarning(MAILIMPORTER_LOG) << "Message size is 0 bytes, not importing it."; } diff --git a/src/filters/filtermbox.cpp b/src/filters/filtermbox.cpp index c539e6ecbaef967adefa441577d7529b8dd105ce..7cd40aabcc2cb3299d7d338ff0024b13568c11e2 100644 --- a/src/filters/filtermbox.cpp +++ b/src/filters/filtermbox.cpp @@ -116,7 +116,7 @@ void FilterMBox::importMails(const QStringList &filenames) first_msg = false; if (tmp.size() > 0) { - doAddMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); } else { qCWarning(MAILIMPORTER_LOG) << "Message size is 0 bytes, not importing it."; } diff --git a/src/filters/filteroe.cpp b/src/filters/filteroe.cpp index b9bf1cbf716ec56f56b28c050103b03d6f3197a1..81fa8c5f1936ae5d75a83239039ae5ee640b7c33 100644 --- a/src/filters/filteroe.cpp +++ b/src/filters/filteroe.cpp @@ -211,7 +211,7 @@ void FilterOE::mbxImport(QDataStream &ds) } } while (!ds.atEnd()); tmp.flush(); - doAddMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); if (filterInfo()->shouldTerminate()) { return; @@ -375,7 +375,7 @@ void FilterOE::dbxReadEmail(QDataStream &ds, int filePos) tmp.flush(); if (!_break) { - doAddMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); currentEmail++; int currentPercentage = (int)(((float) currentEmail / totalEmails) * 100); diff --git a/src/filters/filteropera.cpp b/src/filters/filteropera.cpp index 4d2ab38daab9d34d8c68ae350fe22623774923d5..0ec8f51f3a35a52c3b99ae2085afbccab0bd0211 100644 --- a/src/filters/filteropera.cpp +++ b/src/filters/filteropera.cpp @@ -121,7 +121,7 @@ void FilterOpera::importBox(const QDir &importDir, const QStringList &files, con tmp.flush(); first_msg = false; - doAddMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(folderName, tmp.fileName(), filterInfo()->removeDupMessage()); int currentPercentage = (int)(((float) operaArchiv.pos() / filenameInfo.size()) * 100); filterInfo()->setCurrent(currentPercentage); diff --git a/src/filters/filterplain.cpp b/src/filters/filterplain.cpp index 6bb2ba5edd7fa7d980d08e7b0a53284ddd0e2bbc..2a55e403d343e269c4ab9155bcca9dc7e26a358d 100644 --- a/src/filters/filterplain.cpp +++ b/src/filters/filterplain.cpp @@ -61,7 +61,7 @@ void FilterPlain::import() filterInfo()->setFrom(dirRealPath); filterInfo()->setTo(destName); filterInfo()->setCurrent(0); - if (! doAddMessage(destName, dirRealPath, filterInfo()->removeDupMessage())) { + if (! importMessage(destName, dirRealPath, filterInfo()->removeDupMessage())) { filterInfo()->addErrorLogEntry(i18n("Could not import %1", *mailFile)); } diff --git a/src/filters/filterpmail.cpp b/src/filters/filterpmail.cpp index 5a984875f4e7f0caffb7cb80176305b03b3e4c1c..3b9f698a2778b0f31f13cdbe252785c08736ee7e 100644 --- a/src/filters/filterpmail.cpp +++ b/src/filters/filterpmail.cpp @@ -116,7 +116,7 @@ void FilterPMail::importNewMessage(const QString &file) QString destFolder(QStringLiteral("PegasusMail-Import/New Messages")); filterInfo()->setTo(destFolder); - doAddMessage(destFolder, file, filterInfo()->removeDupMessage()); + importMessage(destFolder, file, filterInfo()->removeDupMessage()); } /** this function imports one mail folder file (*.PMM) */ @@ -194,7 +194,7 @@ void FilterPMail::importMailFolder(const QString &file) } } tempfile.flush(); - doAddMessage(folder, tempfile.fileName(), filterInfo()->removeDupMessage()); + importMessage(folder, tempfile.fileName(), filterInfo()->removeDupMessage()); first_msg = false; } @@ -257,7 +257,7 @@ void FilterPMail::importUnixMailFolder(const QString &file) } } tempfile.flush(); - doAddMessage(folder, tempfile.fileName(), filterInfo()->removeDupMessage()); + importMessage(folder, tempfile.fileName(), filterInfo()->removeDupMessage()); n++; filterInfo()->setCurrent(i18n("Message %1", n)); diff --git a/src/filters/filtersylpheed.cpp b/src/filters/filtersylpheed.cpp index e6b778633bb8a46884b8f064223fc6d112c1ed2f..dda7682b494d5ca780663d7e3cc6f1aae129edf0 100644 --- a/src/filters/filtersylpheed.cpp +++ b/src/filters/filtersylpheed.cpp @@ -246,7 +246,7 @@ void FilterSylpheed::importFiles(const QString &dirName) } else { status.setRead(true); // 0 == read } - if (! doAddMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage(), status)) { + if (! importMessage(_path, dir.filePath(*mailFile), filterInfo()->removeDupMessage(), status)) { filterInfo()->addErrorLogEntry(i18n("Could not import %1", *mailFile)); } filterInfo()->setCurrent((int)((float) currentFile / numFiles * 100)); diff --git a/src/filters/filterthebat.cpp b/src/filters/filterthebat.cpp index 8fab95c0c1fcbe78c8104b62c39aedd5bd21d525..1cfbd726b5d552b0e34469a24df1310b723d8f0f 100644 --- a/src/filters/filterthebat.cpp +++ b/src/filters/filterthebat.cpp @@ -246,7 +246,7 @@ void FilterTheBat::importFiles(const QString &FileName) tmp.write(input, endPos - lastPos); tmp.flush(); - doAddMessage(_path, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(_path, tmp.fileName(), filterInfo()->removeDupMessage()); lastPos = endPos + 48; tbb.seek(lastPos); diff --git a/src/filters/filterthunderbird.cpp b/src/filters/filterthunderbird.cpp index ea8630a6e9f872a7145dc6d83ed54a397e4e79cb..8db5161e6f28657f1c1d6a60c085d077305752d3 100644 --- a/src/filters/filterthunderbird.cpp +++ b/src/filters/filterthunderbird.cpp @@ -323,7 +323,7 @@ void FilterThunderbird::importMBox(const QString &mboxName, const QString &rootD } } - doAddMessage(destFolder, tmp.fileName(), filterInfo()->removeDupMessage()); + importMessage(destFolder, tmp.fileName(), filterInfo()->removeDupMessage()); int currentPercentage = (int)(((float) mbox.pos() / filenameInfo.size()) * 100); filterInfo()->setCurrent(currentPercentage);