Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KDE PIM Runtime
Commits
cb7fdf27
Commit
cb7fdf27
authored
Apr 22, 2021
by
Laurent Montel
😁
Browse files
In kf6 kde4 migration code will be removed
parent
1b58b539
Pipeline
#59128
failed with stage
in 25 minutes and 9 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
agents/maildispatcher/maildispatcheragent.cpp
View file @
cb7fdf27
...
...
@@ -23,7 +23,10 @@
#include <KLocalizedString>
#include <KMime/Message>
#include <KNotification>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include <QDBusConnection>
#include <QTimer>
...
...
@@ -117,10 +120,11 @@ void MailDispatcherAgent::dispatch()
MailDispatcherAgent
::
MailDispatcherAgent
(
const
QString
&
id
)
:
AgentBase
(
id
)
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"maildispatcheragent"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"maildispatcheragentrc"
)
<<
QStringLiteral
(
"akonadi_maildispatcher_agent.notifyrc"
));
migrate
.
migrate
();
#endif
qCDebug
(
MAILDISPATCHER_LOG
)
<<
"maildispatcheragent: At your service, sir!"
;
new
SettingsAdaptor
(
Settings
::
self
());
...
...
agents/newmailnotifier/newmailnotifieragent.cpp
View file @
cb7fdf27
...
...
@@ -32,7 +32,10 @@
#include <KLocalizedString>
#include <KMime/Message>
#include <KNotification>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include <QTextToSpeech>
using
namespace
Akonadi
;
...
...
@@ -40,9 +43,11 @@ using namespace Akonadi;
NewMailNotifierAgent
::
NewMailNotifierAgent
(
const
QString
&
id
)
:
AgentBase
(
id
)
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"newmailnotifieragent"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"akonadi_newmailnotifier_agentrc"
)
<<
QStringLiteral
(
"akonadi_newmailnotifier_agent.notifyrc"
));
migrate
.
migrate
();
#endif
connect
(
this
,
&
Akonadi
::
AgentBase
::
reloadConfiguration
,
this
,
&
NewMailNotifierAgent
::
slotReloadConfiguration
);
KLocalizedString
::
setApplicationDomain
(
"akonadi_newmailnotifier_agent"
);
Akonadi
::
AttributeFactory
::
registerAttribute
<
Akonadi
::
NewMailNotifierAttribute
>
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment