summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-17 12:38:31 +0200
committerMontel Laurent <[email protected]>2017-04-17 12:38:31 +0200
commit8231745be2152aafab2ccdd5b9fe1b54c59f7cd5 (patch)
treea3636c68684416383769edcd7ef15c9a92430524
parentc23c0a8fb3d4c990a55e8929e3bb259ddbd4a4af (diff)
Fix compile
-rw-r--r--src/autodetect/abstractimporter.cpp30
-rw-r--r--src/autodetect/abstractimporter.h1
-rw-r--r--src/importwizard.h5
3 files changed, 18 insertions, 18 deletions
diff --git a/src/autodetect/abstractimporter.cpp b/src/autodetect/abstractimporter.cpp
index c8a1f5f..e429ff6 100644
--- a/src/autodetect/abstractimporter.cpp
+++ b/src/autodetect/abstractimporter.cpp
@@ -33,42 +33,42 @@
using namespace LibImportWizard;
-LibImportWizard::AbstractImporter::AbstractImporter(QObject *parent)
+AbstractImporter::AbstractImporter(QObject *parent)
: QObject(parent),
mImportWizard(nullptr)
{
}
-LibImportWizard::AbstractImporter::~AbstractImporter()
+AbstractImporter::~AbstractImporter()
{
}
-bool LibImportWizard::AbstractImporter::importSettings()
+bool AbstractImporter::importSettings()
{
return false;
}
-bool LibImportWizard::AbstractImporter::importMails()
+bool AbstractImporter::importMails()
{
return false;
}
-bool LibImportWizard::AbstractImporter::importFilters()
+bool AbstractImporter::importFilters()
{
return false;
}
-bool LibImportWizard::AbstractImporter::importAddressBook()
+bool AbstractImporter::importAddressBook()
{
return false;
}
-bool LibImportWizard::AbstractImporter::importCalendar()
+bool AbstractImporter::importCalendar()
{
return false;
}
-void LibImportWizard::AbstractImporter::initializeFilter(MailImporter::Filter &filter)
+void AbstractImporter::initializeFilter(MailImporter::Filter &filter)
{
MailImporter::FilterInfo *info = new MailImporter::FilterInfo();
ImportFilterInfoGui *infoGui = new ImportFilterInfoGui(mImportWizard->importMailPage());
@@ -80,7 +80,7 @@ void LibImportWizard::AbstractImporter::initializeFilter(MailImporter::Filter &f
filter.setFilterInfo(info);
}
-bool LibImportWizard::AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type)
+bool AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type)
{
if (QFileInfo::exists(filterPath)) {
bool canceled = false;
@@ -99,42 +99,42 @@ bool LibImportWizard::AbstractImporter::addFilters(const QString &filterPath, Ma
}
}
-void LibImportWizard::AbstractImporter::appendFilters(const QList<MailCommon::MailFilter *> &filters)
+void AbstractImporter::appendFilters(const QList<MailCommon::MailFilter *> &filters)
{
if (!filters.isEmpty()) {
MailCommon::FilterManager::instance()->appendFilters(filters, false);
}
}
-void LibImportWizard::AbstractImporter::addImportFilterInfo(const QString &log) const
+void AbstractImporter::addImportFilterInfo(const QString &log) const
{
if (mImportWizard) {
mImportWizard->importFilterPage()->addImportInfo(log);
}
}
-void LibImportWizard::AbstractImporter::addImportFilterError(const QString &log) const
+void AbstractImporter::addImportFilterError(const QString &log) const
{
if (mImportWizard) {
mImportWizard->importFilterPage()->addImportError(log);
}
}
-void LibImportWizard::AbstractImporter::addImportSettingsInfo(const QString &log) const
+void AbstractImporter::addImportSettingsInfo(const QString &log) const
{
if (mImportWizard) {
mImportWizard->importSettingPage()->addImportError(log);
}
}
-void LibImportWizard::AbstractImporter::addImportCalendarInfo(const QString &log) const
+void AbstractImporter::addImportCalendarInfo(const QString &log) const
{
if (mImportWizard) {
mImportWizard->importCalendarPage()->addImportError(log);
}
}
-void LibImportWizard::AbstractImporter::setImportWizard(ImportWizard *importWizard)
+void AbstractImporter::setImportWizard(ImportWizard *importWizard)
{
mImportWizard = importWizard;
}
diff --git a/src/autodetect/abstractimporter.h b/src/autodetect/abstractimporter.h
index 57280cc..d1c36ef 100644
--- a/src/autodetect/abstractimporter.h
+++ b/src/autodetect/abstractimporter.h
@@ -23,7 +23,6 @@
#include "libimportwizard_export.h"
class ImportWizard;
-
namespace MailImporter
{
class FilterInfo;
diff --git a/src/importwizard.h b/src/importwizard.h
index c078843..c0cee9e 100644
--- a/src/importwizard.h
+++ b/src/importwizard.h
@@ -23,7 +23,9 @@
#include "libimportwizard_export.h"
#include <KAssistantDialog>
-
+namespace LibImportWizard {
+class AbstractImporter;
+}
class KPageWidgetItem;
class SelectProgramPage;
class SelectComponentPage;
@@ -33,7 +35,6 @@ class ImportSettingPage;
class ImportAddressbookPage;
class ImportFinishPage;
class ImportCalendarPage;
-class AbstractImporter;
class ManualSelectFilterPage;
class ManualImportMailPage;