Commit 1f7ac3dd authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix rename class

parent 0ff6e312
......@@ -14,8 +14,8 @@ set(pimdataexporter_addressbook_SRCS
)
set(pimdataexporter_mail_SRCS
mail/exportmailjob.cpp
mail/importmailjob.cpp
mail/exportmailjobinterface.cpp
mail/importmailjobinterface.cpp
mail/importexportmailutil.cpp
)
......@@ -40,7 +40,7 @@ set(pimdataexporter_xml_SRCS
set(pimdataexporter_akregator_SRCS
akregator/exportakregatorjobinterface.cpp
akregator/importakregatorjob.cpp
akregator/importakregatorjobinterface.cpp
)
......
......@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
#include "importakregatorjob.h"
#include "importakregatorjobinterface.h"
#include "archivestorage.h"
#include <PimCommonAkonadi/CreateResource>
......@@ -29,26 +29,26 @@
#include <QStandardPaths>
ImportAkregatorJob::ImportAkregatorJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
ImportAkregatorJobInterface::ImportAkregatorJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: AbstractImportExportJob(parent, archiveStorage, typeSelected, numberOfStep)
{
initializeImportJob();
}
ImportAkregatorJob::~ImportAkregatorJob()
ImportAkregatorJobInterface::~ImportAkregatorJobInterface()
{
}
void ImportAkregatorJob::start()
void ImportAkregatorJobInterface::start()
{
Q_EMIT title(i18n("Starting to import Akregator settings..."));
mArchiveDirectory = archive()->directory();
initializeListStep();
createProgressDialog(i18n("Import Akregator settings"));
QTimer::singleShot(0, this, &ImportAkregatorJob::slotNextStep);
QTimer::singleShot(0, this, &ImportAkregatorJobInterface::slotNextStep);
}
void ImportAkregatorJob::slotNextStep()
void ImportAkregatorJobInterface::slotNextStep()
{
++mIndex;
if (mIndex < mListStep.count()) {
......@@ -66,7 +66,7 @@ void ImportAkregatorJob::slotNextStep()
}
}
void ImportAkregatorJob::restoreConfig()
void ImportAkregatorJobInterface::restoreConfig()
{
const QString akregatorStr(QStringLiteral("akregatorrc"));
increaseProgressDialog();
......@@ -77,10 +77,10 @@ void ImportAkregatorJob::restoreConfig()
restoreConfigFile(QStringLiteral("akregator.notifyrc"));
Q_EMIT info(i18n("Config restored."));
QTimer::singleShot(0, this, &ImportAkregatorJob::slotNextStep);
QTimer::singleShot(0, this, &ImportAkregatorJobInterface::slotNextStep);
}
void ImportAkregatorJob::restoreData()
void ImportAkregatorJobInterface::restoreData()
{
increaseProgressDialog();
setProgressDialogLabel(i18n("Restore data..."));
......@@ -90,5 +90,5 @@ void ImportAkregatorJob::restoreData()
overwriteDirectory(akregatorPath, akregatorEntry);
}
Q_EMIT info(i18n("Data restored."));
QTimer::singleShot(0, this, &ImportAkregatorJob::slotNextStep);
QTimer::singleShot(0, this, &ImportAkregatorJobInterface::slotNextStep);
}
......@@ -24,12 +24,12 @@
#include "pimdataexportercore_private_export.h"
class ArchiveStorage;
class PIMDATAEXPORTER_TESTS_EXPORT ImportAkregatorJob : public AbstractImportExportJob
class PIMDATAEXPORTER_TESTS_EXPORT ImportAkregatorJobInterface : public AbstractImportExportJob
{
Q_OBJECT
public:
explicit ImportAkregatorJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep);
~ImportAkregatorJob() override;
explicit ImportAkregatorJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep);
~ImportAkregatorJobInterface() override;
void start() override;
......
......@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
#include "exportmailjob.h"
#include "exportmailjobinterface.h"
#include "importexportmailutil.h"
#include <MailCommon/MailUtil>
......@@ -47,40 +47,40 @@
#include <KIdentityManagement/IdentityManager>
#include <KIdentityManagement/Identity>
ExportMailJob::ExportMailJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
ExportMailJobInterface::ExportMailJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: AbstractImportExportJob(parent, archiveStorage, typeSelected, numberOfStep)
{
}
ExportMailJob::~ExportMailJob()
ExportMailJobInterface::~ExportMailJobInterface()
{
}
bool ExportMailJob::checkBackupType(Utils::StoredType type) const
bool ExportMailJobInterface::checkBackupType(Utils::StoredType type) const
{
return mTypeSelected & type;
}
void ExportMailJob::start()
void ExportMailJobInterface::start()
{
Q_EMIT title(i18n("Start export KMail settings..."));
createProgressDialog(i18n("Export KMail settings"));
if (checkBackupType(Utils::Identity)) {
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupIdentity);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupIdentity);
} else if (checkBackupType(Utils::MailTransport)) {
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupMailTransport);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupMailTransport);
} else if (checkBackupType(Utils::Config)) {
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupConfig);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupConfig);
} else if (checkBackupType(Utils::Mails)) {
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupMails);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupMails);
} else if (checkBackupType(Utils::Resources)) {
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupResources);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupResources);
} else {
Q_EMIT jobFinished();
}
}
void ExportMailJob::slotCheckBackupIdentity()
void ExportMailJobInterface::slotCheckBackupIdentity()
{
if (checkBackupType(Utils::Identity)) {
backupIdentity();
......@@ -90,10 +90,10 @@ void ExportMailJob::slotCheckBackupIdentity()
return;
}
}
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupMailTransport);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupMailTransport);
}
void ExportMailJob::slotCheckBackupMailTransport()
void ExportMailJobInterface::slotCheckBackupMailTransport()
{
if (checkBackupType(Utils::MailTransport)) {
backupTransports();
......@@ -103,10 +103,10 @@ void ExportMailJob::slotCheckBackupMailTransport()
return;
}
}
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupConfig);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupConfig);
}
void ExportMailJob::slotCheckBackupConfig()
void ExportMailJobInterface::slotCheckBackupConfig()
{
if (checkBackupType(Utils::Config)) {
backupConfig();
......@@ -116,31 +116,31 @@ void ExportMailJob::slotCheckBackupConfig()
return;
}
}
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupMails);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupMails);
}
void ExportMailJob::slotCheckBackupMails()
void ExportMailJobInterface::slotCheckBackupMails()
{
if (checkBackupType(Utils::Mails)) {
increaseProgressDialog();
setProgressDialogLabel(i18n("Backing up Mails..."));
QTimer::singleShot(0, this, &ExportMailJob::slotWriteNextArchiveResource);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotWriteNextArchiveResource);
return;
}
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupResources);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupResources);
}
void ExportMailJob::slotMailsJobTerminated()
void ExportMailJobInterface::slotMailsJobTerminated()
{
if (wasCanceled()) {
Q_EMIT jobFinished();
return;
}
mIndexIdentifier++;
QTimer::singleShot(0, this, &ExportMailJob::slotWriteNextArchiveResource);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotWriteNextArchiveResource);
}
void ExportMailJob::slotWriteNextArchiveResource()
void ExportMailJobInterface::slotWriteNextArchiveResource()
{
Akonadi::AgentManager *manager = Akonadi::AgentManager::self();
const Akonadi::AgentInstance::List list = manager->instances();
......@@ -166,36 +166,36 @@ void ExportMailJob::slotWriteNextArchiveResource()
resourceJob->setIdentifier(identifier);
resourceJob->setArchive(archive());
resourceJob->setArchiveName(QStringLiteral("mail.zip"));
connect(resourceJob, &ExportResourceArchiveJob::error, this, &ExportMailJob::error);
connect(resourceJob, &ExportResourceArchiveJob::info, this, &ExportMailJob::info);
connect(resourceJob, &ExportResourceArchiveJob::terminated, this, &ExportMailJob::slotMailsJobTerminated);
connect(this, &ExportMailJob::taskCanceled, resourceJob, &ExportResourceArchiveJob::slotTaskCanceled);
connect(resourceJob, &ExportResourceArchiveJob::error, this, &ExportMailJobInterface::error);
connect(resourceJob, &ExportResourceArchiveJob::info, this, &ExportMailJobInterface::info);
connect(resourceJob, &ExportResourceArchiveJob::terminated, this, &ExportMailJobInterface::slotMailsJobTerminated);
connect(this, &ExportMailJobInterface::taskCanceled, resourceJob, &ExportResourceArchiveJob::slotTaskCanceled);
resourceJob->start();
} else {
qCDebug(PIMDATAEXPORTERCORE_LOG) << "Url is empty for " << identifier;
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotMailsJobTerminated);
}
} else {
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotMailsJobTerminated);
}
} else if (identifier.contains(QLatin1String("akonadi_mbox_resource_"))) {
backupResourceFile(agent, Utils::addressbookPath());
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotMailsJobTerminated);
} else {
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotMailsJobTerminated);
}
} else {
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotMailsJobTerminated);
}
} else {
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotMailsJobTerminated);
}
} else {
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupResources);
QTimer::singleShot(0, this, &ExportMailJobInterface::slotCheckBackupResources);
}
}
void ExportMailJob::backupTransports()
void ExportMailJobInterface::backupTransports()
{
setProgressDialogLabel(i18n("Backing up transports..."));
......@@ -221,7 +221,7 @@ void ExportMailJob::backupTransports()
}
}
void ExportMailJob::slotCheckBackupResources()
void ExportMailJobInterface::slotCheckBackupResources()
{
if (checkBackupType(Utils::Resources)) {
backupResources();
......@@ -234,7 +234,7 @@ void ExportMailJob::slotCheckBackupResources()
Q_EMIT jobFinished();
}
void ExportMailJob::backupResources()
void ExportMailJobInterface::backupResources()
{
setProgressDialogLabel(i18n("Backing up resources..."));
......@@ -264,7 +264,7 @@ void ExportMailJob::backupResources()
Q_EMIT info(i18n("Resources backup done."));
}
void ExportMailJob::backupConfig()
void ExportMailJobInterface::backupConfig()
{
setProgressDialogLabel(i18n("Backing up config..."));
......@@ -631,7 +631,7 @@ void ExportMailJob::backupConfig()
Q_EMIT info(i18n("Config backup done."));
}
void ExportMailJob::backupIdentity()
void ExportMailJobInterface::backupIdentity()
{
setProgressDialogLabel(i18n("Backing up identity..."));
......
......@@ -27,12 +27,12 @@
#include <time.h>
class ArchiveStorage;
class PIMDATAEXPORTER_TESTS_EXPORT ExportMailJob : public AbstractImportExportJob
class PIMDATAEXPORTER_TESTS_EXPORT ExportMailJobInterface : public AbstractImportExportJob
{
Q_OBJECT
public:
explicit ExportMailJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep);
~ExportMailJob() override;
explicit ExportMailJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep);
~ExportMailJobInterface() override;
void start() override;
......
......@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
#include "importmailjob.h"
#include "importmailjobinterface.h"
#include "archivestorage.h"
#include "importexportmailutil.h"
......@@ -56,17 +56,17 @@ inline const QString storeMails()
}
}
ImportMailJob::ImportMailJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
ImportMailJobInterface::ImportMailJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: AbstractImportExportJob(parent, archiveStorage, typeSelected, numberOfStep)
{
initializeImportJob();
}
ImportMailJob::~ImportMailJob()
ImportMailJobInterface::~ImportMailJobInterface()
{
}
void ImportMailJob::start()
void ImportMailJobInterface::start()
{
Q_EMIT title(i18n("Starting to import KMail settings..."));
createProgressDialog(i18n("Import KMail settings"));
......@@ -74,13 +74,13 @@ void ImportMailJob::start()
searchAllMailsFiles(mArchiveDirectory, QString());
if (!mFileList.isEmpty() || !mListResourceFile.isEmpty()) {
initializeListStep();
QTimer::singleShot(0, this, &ImportMailJob::slotNextStep);
QTimer::singleShot(0, this, &ImportMailJobInterface::slotNextStep);
} else {
Q_EMIT jobFinished();
}
}
void ImportMailJob::slotNextStep()
void ImportMailJobInterface::slotNextStep()
{
++mIndex;
if (mIndex < mListStep.count()) {
......@@ -104,7 +104,7 @@ void ImportMailJob::slotNextStep()
}
}
void ImportMailJob::searchAllMailsFiles(const KArchiveDirectory *dir, const QString &prefix)
void ImportMailJobInterface::searchAllMailsFiles(const KArchiveDirectory *dir, const QString &prefix)
{
const QStringList lst = dir->entries();
for (const QString &entryName : lst) {
......@@ -123,7 +123,7 @@ void ImportMailJob::searchAllMailsFiles(const KArchiveDirectory *dir, const QStr
}
}
void ImportMailJob::storeMailArchiveResource(const KArchiveDirectory *dir, const QString &prefix)
void ImportMailJobInterface::storeMailArchiveResource(const KArchiveDirectory *dir, const QString &prefix)
{
const QStringList lst = dir->entries();
for (const QString &entryName : lst) {
......@@ -156,7 +156,7 @@ void ImportMailJob::storeMailArchiveResource(const KArchiveDirectory *dir, const
}
}
void ImportMailJob::importMailTransport(const QString &tempDirName)
void ImportMailJobInterface::importMailTransport(const QString &tempDirName)
{
KSharedConfig::Ptr transportConfig = KSharedConfig::openConfig(tempDirName + QLatin1Char('/') + QStringLiteral("mailtransports"));
......@@ -263,7 +263,7 @@ void ImportMailJob::importMailTransport(const QString &tempDirName)
}
}
void ImportMailJob::restoreTransports()
void ImportMailJobInterface::restoreTransports()
{
setProgressDialogLabel(i18n("Restore transports..."));
increaseProgressDialog();
......@@ -284,10 +284,10 @@ void ImportMailJob::restoreTransports()
Q_EMIT error(i18n("Failed to restore transports file."));
}
}
QTimer::singleShot(0, this, &ImportMailJob::slotNextStep);
QTimer::singleShot(0, this, &ImportMailJobInterface::slotNextStep);
}
void ImportMailJob::addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId)
void ImportMailJobInterface::addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId)
{
mt->forceUniqueName();
mt->save();
......@@ -298,7 +298,7 @@ void ImportMailJob::addMailTransport(MailTransport::Transport *mt, int defaultTr
mHashTransport.insert(transportId, mt->id());
}
void ImportMailJob::restoreResources()
void ImportMailJobInterface::restoreResources()
{
increaseProgressDialog();
setProgressDialogLabel(i18n("Restore resources..."));
......@@ -524,10 +524,10 @@ void ImportMailJob::restoreResources()
//TODO synctree ?
Q_EMIT info(i18n("Resources restored."));
QTimer::singleShot(0, this, &ImportMailJob::slotNextStep);
QTimer::singleShot(0, this, &ImportMailJobInterface::slotNextStep);
}
void ImportMailJob::restoreMails()
void ImportMailJobInterface::restoreMails()
{
increaseProgressDialog();
setProgressDialogLabel(i18n("Restore mails..."));
......@@ -650,7 +650,7 @@ void ImportMailJob::restoreMails()
startSynchronizeResources(listResourceToSync);
}
void ImportMailJob::restoreConfig()
void ImportMailJobInterface::restoreConfig()
{
increaseProgressDialog();
setProgressDialogLabel(i18n("Restore config..."));
......@@ -924,10 +924,10 @@ void ImportMailJob::restoreConfig()
importDataSubdirectory(QStringLiteral("/messageviewerplugins/"));
Q_EMIT info(i18n("Config restored."));
QTimer::singleShot(0, this, &ImportMailJob::slotNextStep);
QTimer::singleShot(0, this, &ImportMailJobInterface::slotNextStep);
}
void ImportMailJob::importSimpleFilesInDirectory(const QString &relativePath)
void ImportMailJobInterface::importSimpleFilesInDirectory(const QString &relativePath)
{
const KArchiveEntry *autocorrectionEntry = mArchiveDirectory->entry(Utils::dataPath() + relativePath);
if (autocorrectionEntry && autocorrectionEntry->isDirectory()) {
......@@ -952,7 +952,7 @@ void ImportMailJob::importSimpleFilesInDirectory(const QString &relativePath)
}
}
void ImportMailJob::registerSpecialCollection(Akonadi::SpecialMailCollections::Type type, qint64 colId)
void ImportMailJobInterface::registerSpecialCollection(Akonadi::SpecialMailCollections::Type type, qint64 colId)
{
auto fetch = new Akonadi::CollectionFetchJob(Akonadi::Collection(colId), Akonadi::CollectionFetchJob::Base, this);
connect(fetch, &Akonadi::CollectionFetchJob::collectionsReceived,
......@@ -964,7 +964,7 @@ void ImportMailJob::registerSpecialCollection(Akonadi::SpecialMailCollections::T
});
}
void ImportMailJob::restoreIdentity()
void ImportMailJobInterface::restoreIdentity()
{
increaseProgressDialog();
setProgressDialogLabel(i18n("Restoring identities..."));
......@@ -1047,10 +1047,10 @@ void ImportMailJob::restoreIdentity()
Q_EMIT error(i18n("Failed to restore identity file."));
}
}
QTimer::singleShot(0, this, &ImportMailJob::slotNextStep);
QTimer::singleShot(0, this, &ImportMailJobInterface::slotNextStep);
}
QString ImportMailJob::uniqueIdentityName(const QString &name)
QString ImportMailJobInterface::uniqueIdentityName(const QString &name)
{
QString newName(name);
int i = 0;
......@@ -1061,7 +1061,7 @@ QString ImportMailJob::uniqueIdentityName(const QString &name)
return newName;
}
void ImportMailJob::importMailArchiveConfig(const KArchiveFile *archiveconfiguration, const QString &archiveconfigurationrc, const QString &filename, const QString &prefix)
void ImportMailJobInterface::importMailArchiveConfig(const KArchiveFile *archiveconfiguration, const QString &archiveconfigurationrc, const QString &filename, const QString &prefix)
{
copyToFile(archiveconfiguration, archiveconfigurationrc, filename, prefix);
KSharedConfig::Ptr archiveConfig = KSharedConfig::openConfig(archiveconfigurationrc);
......@@ -1071,7 +1071,7 @@ void ImportMailJob::importMailArchiveConfig(const KArchiveFile *archiveconfigura
archiveConfig->sync();
}
void ImportMailJob::importArchiveConfig(const KArchiveFile *archiveconfiguration, const QString &archiveconfigurationrc, const QString &filename, const QString &prefix)
void ImportMailJobInterface::importArchiveConfig(const KArchiveFile *archiveconfiguration, const QString &archiveconfigurationrc, const QString &filename, const QString &prefix)
{
copyToFile(archiveconfiguration, archiveconfigurationrc, filename, prefix);
KSharedConfig::Ptr archiveConfig = KSharedConfig::openConfig(archiveconfigurationrc);
......@@ -1081,7 +1081,7 @@ void ImportMailJob::importArchiveConfig(const KArchiveFile *archiveconfiguration
archiveConfig->sync();
}
void ImportMailJob::importFolderArchiveConfig(const KArchiveFile *archiveconfiguration, const QString &archiveconfigurationrc, const QString &filename, const QString &prefix)
void ImportMailJobInterface::importFolderArchiveConfig(const KArchiveFile *archiveconfiguration, const QString &archiveconfigurationrc, const QString &filename, const QString &prefix)
{
copyToFile(archiveconfiguration, archiveconfigurationrc, filename, prefix);
KSharedConfig::Ptr archiveConfig = KSharedConfig::openConfig(archiveconfigurationrc);
......@@ -1099,7 +1099,7 @@ void ImportMailJob::importFolderArchiveConfig(const KArchiveFile *archiveconfigu
archiveConfig->sync();
}
void ImportMailJob::copyMailArchiveConfig(const KSharedConfig::Ptr &archiveConfigOrigin, const KSharedConfig::Ptr &archiveConfigDestination)
void ImportMailJobInterface::copyMailArchiveConfig(const KSharedConfig::Ptr &archiveConfigOrigin, const KSharedConfig::Ptr &archiveConfigDestination)
{
const QString archiveGroupPattern = QStringLiteral("FolderArchiveAccount ");
const QStringList archiveList = archiveConfigOrigin->groupList().filter(archiveGroupPattern);
......@@ -1123,7 +1123,7 @@ void ImportMailJob::copyMailArchiveConfig(const KSharedConfig::Ptr &archiveConfi
}
}
void ImportMailJob::copyArchiveMailAgentConfigGroup(const KSharedConfig::Ptr &archiveConfigOrigin, const KSharedConfig::Ptr &archiveConfigDestination)
void ImportMailJobInterface::copyArchiveMailAgentConfigGroup(const KSharedConfig::Ptr &archiveConfigOrigin, const KSharedConfig::Ptr &archiveConfigDestination)
{
//adapt id
const QString archiveGroupPattern = QStringLiteral("ArchiveMailCollection ");
......@@ -1147,7 +1147,7 @@ void ImportMailJob::copyArchiveMailAgentConfigGroup(const KSharedConfig::Ptr &ar
}
}
void ImportMailJob::importTemplatesConfig(const KArchiveFile *templatesconfiguration, const QString &templatesconfigurationrc, const QString &filename, const QString &prefix)
void ImportMailJobInterface::importTemplatesConfig(const KArchiveFile *templatesconfiguration, const QString &templatesconfigurationrc, const QString &filename, const QString &prefix)
{
copyToFile(templatesconfiguration, templatesconfigurationrc, filename, prefix);
KSharedConfig::Ptr templateConfig = KSharedConfig::openConfig(templatesconfigurationrc);
......@@ -1185,7 +1185,7 @@ void ImportMailJob::importTemplatesConfig(const KArchiveFile *templatesconfigura
templateConfig->sync();
}
void ImportMailJob::importKmailConfig(const KArchiveFile *kmailsnippet, const QString &kmail2rc, const QString &filename, const QString &prefix)
void ImportMailJobInterface::importKmailConfig(const KArchiveFile *kmailsnippet, const QString &kmail2rc, const QString &filename, const QString &prefix)
{
copyToFile(kmailsnippet, kmail2rc, filename, prefix);
KSharedConfig::Ptr kmailConfig = KSharedConfig::openConfig(kmail2rc);
......@@ -1328,7 +1328,7 @@ void ImportMailJob::importKmailConfig(const KArchiveFile *kmailsnippet, const QS
kmailConfig->sync();
}
void ImportMailJob::mergeLdapConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
void ImportMailJobInterface::mergeLdapConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
{
QDir dir(mTempDirName);
dir.mkdir(prefix);
......@@ -1389,7 +1389,7 @@ void ImportMailJob::mergeLdapConfig(const KArchiveFile *archivefile, const QStri
grpExisting.sync();
}
void ImportMailJob::mergeKmailSnippetConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
void ImportMailJobInterface::mergeKmailSnippetConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
{
//TODO
QDir dir(mTempDirName);
......@@ -1403,7 +1403,7 @@ void ImportMailJob::mergeKmailSnippetConfig(const KArchiveFile *archivefile, con
KSharedConfig::Ptr importingKMailSnipperConfig = KSharedConfig::openConfig(copyToDirName + QLatin1Char('/') + filename);
}
void ImportMailJob::mergeMailArchiveConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
void ImportMailJobInterface::mergeMailArchiveConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
{
QDir dir(mTempDirName);
dir.mkdir(prefix);
......@@ -1419,7 +1419,7 @@ void ImportMailJob::mergeMailArchiveConfig(const KArchiveFile *archivefile, cons
existingConfig->sync();
}
void ImportMailJob::mergeArchiveMailAgentConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
void ImportMailJobInterface::mergeArchiveMailAgentConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
{
QDir dir(mTempDirName);
dir.mkdir(prefix);
......@@ -1435,7 +1435,7 @@ void ImportMailJob::mergeArchiveMailAgentConfig(const KArchiveFile *archivefile,
existingConfig->sync();
}
void ImportMailJob::mergeSieveTemplate(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
void ImportMailJobInterface::mergeSieveTemplate(const KArchiveFile *archivefile, const QString &filename, const QString &prefix)
{
QDir dir(mTempDirName);
dir.mkdir(prefix);
......
......@@ -33,12 +33,12 @@ class ArchiveStorage;
namespace MailTransport {
class Transport;
}
class PIMDATAEXPORTER_TESTS_EXPORT ImportMailJob : public AbstractImportExportJob
class PIMDATAEXPORTER_TESTS_EXPORT ImportMailJobInterface : public AbstractImportExportJob
{
Q_OBJECT
public:
explicit ImportMailJob(QObject *widget, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep);
~ImportMailJob() override;
explicit ImportMailJobInterface(QObject *widget, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep);
~ImportMailJobInterface() override;
void start() override;