summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-17 13:51:47 +0200
committerMontel Laurent <[email protected]>2017-04-17 13:51:47 +0200
commitb50aeccbf5ffcb9c18e240995628cd624f634296 (patch)
tree793db2c1ff05f4c07127da75f7bdac13a10dcee0
parent8231745be2152aafab2ccdd5b9fe1b54c59f7cd5 (diff)
Use namespace here too
-rw-r--r--src/autodetect/abstractaddressbook.h2
-rw-r--r--src/autodetect/abstractbase.cpp4
-rw-r--r--src/autodetect/abstractbase.h5
-rw-r--r--src/autodetect/abstractcalendar.h2
-rw-r--r--src/autodetect/abstractsettings.h2
-rw-r--r--src/plugins/balsa/balsasettings.cpp4
-rw-r--r--src/plugins/evolutionv3/evolutioncalendar.cpp2
-rw-r--r--src/plugins/evolutionv3/evolutionsettings.cpp8
-rw-r--r--src/plugins/geary/gearysettings.cpp2
-rw-r--r--src/plugins/opera/operasettings.cpp4
-rw-r--r--src/plugins/sylpheed/sylpheedsettings.cpp4
-rw-r--r--src/plugins/thunderbird/thunderbirdsettings.cpp4
-rw-r--r--src/plugins/trojita/trojitasettings.cpp2
13 files changed, 23 insertions, 22 deletions
diff --git a/src/autodetect/abstractaddressbook.h b/src/autodetect/abstractaddressbook.h
index 7f6b8f6..22126d2 100644
--- a/src/autodetect/abstractaddressbook.h
+++ b/src/autodetect/abstractaddressbook.h
@@ -35,7 +35,7 @@ class ContactGroup;
class KJob;
namespace LibImportWizard
{
-class LIBIMPORTWIZARD_EXPORT AbstractAddressBook: public AbstractBase
+class LIBIMPORTWIZARD_EXPORT AbstractAddressBook: public LibImportWizard::AbstractBase
{
Q_OBJECT
public:
diff --git a/src/autodetect/abstractbase.cpp b/src/autodetect/abstractbase.cpp
index 1c4f653..ae17a8f 100644
--- a/src/autodetect/abstractbase.cpp
+++ b/src/autodetect/abstractbase.cpp
@@ -29,7 +29,7 @@
#include <QMetaMethod>
using namespace Akonadi;
-
+using namespace LibImportWizard;
AbstractBase::AbstractBase()
{
mCreateResource = new PimCommon::CreateResource();
@@ -42,7 +42,7 @@ AbstractBase::~AbstractBase()
delete mCreateResource;
}
-QString AbstractBase::createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings)
+QString LibImportWizard::AbstractBase::createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings)
{
return mCreateResource->createResource(resources, name, settings);
}
diff --git a/src/autodetect/abstractbase.h b/src/autodetect/abstractbase.h
index 9e0561a..3ba14b0 100644
--- a/src/autodetect/abstractbase.h
+++ b/src/autodetect/abstractbase.h
@@ -30,7 +30,8 @@ namespace PimCommon
{
class CreateResource;
}
-
+namespace LibImportWizard
+{
class LIBIMPORTWIZARD_EXPORT AbstractBase : public QObject
{
Q_OBJECT
@@ -49,5 +50,5 @@ private:
void slotCreateResourceInfo(const QString &);
PimCommon::CreateResource *mCreateResource;
};
-
+}
#endif // ABSTRACTBASE_H
diff --git a/src/autodetect/abstractcalendar.h b/src/autodetect/abstractcalendar.h
index 2f1866d..90319f0 100644
--- a/src/autodetect/abstractcalendar.h
+++ b/src/autodetect/abstractcalendar.h
@@ -26,7 +26,7 @@ class ImportWizard;
#include <QString>
namespace LibImportWizard
{
-class LIBIMPORTWIZARD_EXPORT AbstractCalendar : public AbstractBase
+class LIBIMPORTWIZARD_EXPORT AbstractCalendar : public LibImportWizard::AbstractBase
{
Q_OBJECT
public:
diff --git a/src/autodetect/abstractsettings.h b/src/autodetect/abstractsettings.h
index f6bf68d..717e038 100644
--- a/src/autodetect/abstractsettings.h
+++ b/src/autodetect/abstractsettings.h
@@ -38,7 +38,7 @@ namespace MailTransport
class Transport;
}
-class LIBIMPORTWIZARD_EXPORT AbstractSettings : public AbstractBase
+class LIBIMPORTWIZARD_EXPORT AbstractSettings : public LibImportWizard::AbstractBase
{
Q_OBJECT
public:
diff --git a/src/plugins/balsa/balsasettings.cpp b/src/plugins/balsa/balsasettings.cpp
index 600bcc9..4161070 100644
--- a/src/plugins/balsa/balsasettings.cpp
+++ b/src/plugins/balsa/balsasettings.cpp
@@ -82,7 +82,7 @@ void BalsaSettings::readAccount(const KConfigGroup &grp, bool autoCheck, int aut
//const bool apop = grp.readEntry(QStringLiteral("DisableApop"), false);
//Q_UNUSED(apop);
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
addCheckMailOnStartup(agentIdentifyName, autoCheck);
addToManualCheck(agentIdentifyName, check);
@@ -92,7 +92,7 @@ void BalsaSettings::readAccount(const KConfigGroup &grp, bool autoCheck, int aut
const QString server = grp.readEntry(QStringLiteral("Server"));
settings.insert(QStringLiteral("ImapServer"), server);
const QString name = grp.readEntry(QStringLiteral("Name"));
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
addCheckMailOnStartup(agentIdentifyName, autoCheck);
addToManualCheck(agentIdentifyName, check);
} else {
diff --git a/src/plugins/evolutionv3/evolutioncalendar.cpp b/src/plugins/evolutionv3/evolutioncalendar.cpp
index 5ae4cdd..a1174b7 100644
--- a/src/plugins/evolutionv3/evolutioncalendar.cpp
+++ b/src/plugins/evolutionv3/evolutioncalendar.cpp
@@ -144,7 +144,7 @@ void EvolutionCalendar::extractCalendarInfo(const QString &info)
}
}
}
- AbstractBase::createResource(QStringLiteral("akonadi_ical_resource"), name, settings);
+ LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_ical_resource"), name, settings);
} else {
//FIXME qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << tag;
}
diff --git a/src/plugins/evolutionv3/evolutionsettings.cpp b/src/plugins/evolutionv3/evolutionsettings.cpp
index d8fcb31..e8b7d2c 100644
--- a/src/plugins/evolutionv3/evolutionsettings.cpp
+++ b/src/plugins/evolutionv3/evolutionsettings.cpp
@@ -352,7 +352,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
}
addAuth(settings, QStringLiteral("Authentication"), userName);
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
//By default
addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
addToManualCheck(agentIdentifyName, enableManualCheck);
@@ -384,7 +384,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
settings.insert(QStringLiteral("LeaveOnServer"), true);
}
addAuth(settings, QStringLiteral("AuthenticationMethod"), userName);
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
//By default
addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
addToManualCheck(agentIdentifyName, enableManualCheck);
@@ -392,11 +392,11 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
//mbox file
settings.insert(QStringLiteral("Path"), path);
settings.insert(QStringLiteral("DisplayName"), name);
- AbstractBase::createResource(QStringLiteral("akonadi_mbox_resource"), name, settings);
+ LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_mbox_resource"), name, settings);
} else if (scheme == QLatin1String("maildir") || scheme == QLatin1String("spooldir")) {
settings.insert(QStringLiteral("Path"), path);
- AbstractBase::createResource(QStringLiteral("akonadi_maildir_resource"), name, settings);
+ LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_maildir_resource"), name, settings);
} else if (scheme == QLatin1String("nntp")) {
//FIXME in the future
//FIXME qCDebug(IMPORTWIZARD_LOG) << " For the moment we can't import nntp resource";
diff --git a/src/plugins/geary/gearysettings.cpp b/src/plugins/geary/gearysettings.cpp
index f059e15..c69018a 100644
--- a/src/plugins/geary/gearysettings.cpp
+++ b/src/plugins/geary/gearysettings.cpp
@@ -77,7 +77,7 @@ void GearySettings::readImapAccount()
}
if (!name.isEmpty()) {
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
//Check by default
addCheckMailOnStartup(agentIdentifyName, true);
}
diff --git a/src/plugins/opera/operasettings.cpp b/src/plugins/opera/operasettings.cpp
index 0a190da..d45cdb4 100644
--- a/src/plugins/opera/operasettings.cpp
+++ b/src/plugins/opera/operasettings.cpp
@@ -102,7 +102,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
settings.insert(QStringLiteral("IntervalCheckTime"), pollInterval);
}
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
addToManualCheck(agentIdentifyName, enableManualCheck);
//We have not settings for it => same than manual check
addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
@@ -168,7 +168,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
break;
}
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
//We have not settings for it => same than manual check
addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
addToManualCheck(agentIdentifyName, enableManualCheck);
diff --git a/src/plugins/sylpheed/sylpheedsettings.cpp b/src/plugins/sylpheed/sylpheedsettings.cpp
index 451e64c..0e76d96 100644
--- a/src/plugins/sylpheed/sylpheedsettings.cpp
+++ b/src/plugins/sylpheed/sylpheedsettings.cpp
@@ -355,7 +355,7 @@ void SylpheedSettings::readPop3Account(const KConfigGroup &accountConfig, bool c
settings.insert(QStringLiteral("IntervalCheckInterval"), intervalCheckMail);
}
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
const bool enableManualCheck = (accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1);
addToManualCheck(agentIdentifyName, enableManualCheck);
@@ -423,7 +423,7 @@ void SylpheedSettings::readImapAccount(const KConfigGroup &accountConfig, bool c
const QString password = accountConfig.readEntry(QStringLiteral("password"));
settings.insert(QStringLiteral("Password"), password);
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
const bool enableManualCheck = (accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1);
diff --git a/src/plugins/thunderbird/thunderbirdsettings.cpp b/src/plugins/thunderbird/thunderbirdsettings.cpp
index b5a6cf2..56ca8e0 100644
--- a/src/plugins/thunderbird/thunderbirdsettings.cpp
+++ b/src/plugins/thunderbird/thunderbirdsettings.cpp
@@ -690,7 +690,7 @@ void ThunderbirdSettings::readAccount()
importSieveSettings(settings, userName, serverName);
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
addCheckMailOnStartup(agentIdentifyName, loginAtStartup);
//Not find a method to disable it in thunderbird
addToManualCheck(agentIdentifyName, true);
@@ -755,7 +755,7 @@ void ThunderbirdSettings::readAccount()
settings.insert(QStringLiteral("IntervalCheckInterval"), 10);
}
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
addCheckMailOnStartup(agentIdentifyName, loginAtStartup);
//Not find a method to disable it in thunderbird
addToManualCheck(agentIdentifyName, true);
diff --git a/src/plugins/trojita/trojitasettings.cpp b/src/plugins/trojita/trojitasettings.cpp
index 82bb0e0..67e52dc 100644
--- a/src/plugins/trojita/trojitasettings.cpp
+++ b/src/plugins/trojita/trojitasettings.cpp
@@ -103,7 +103,7 @@ void TrojitaSettings::readImapAccount()
}
#endif
if (!name.isEmpty()) {
- const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
+ const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
//Check by default
addCheckMailOnStartup(agentIdentifyName, true);
}