Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi
Commits
6af4fff4
Commit
6af4fff4
authored
Apr 22, 2021
by
Laurent Montel
Browse files
kde4 Migration code will be removed in kf6
parent
6d0edc12
Pipeline
#59127
passed with stage
in 10 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/agentbase/agentbase.cpp
View file @
6af4fff4
...
...
@@ -28,7 +28,10 @@
#include
<KLocalizedString>
#include
<KAboutData>
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<Kdelibs4ConfigMigrator>
#endif
#include
<QCommandLineParser>
#include
<QNetworkConfiguration>
...
...
@@ -337,11 +340,11 @@ AgentBasePrivate::~AgentBasePrivate()
void
AgentBasePrivate
::
init
()
{
Q_Q
(
AgentBase
);
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
mId
);
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"%1rc"
).
arg
(
mId
));
migrate
.
migrate
();
#endif
/**
* Create a default session for this process.
*/
...
...
src/core/servermanager.cpp
View file @
6af4fff4
...
...
@@ -15,7 +15,10 @@
#include
"akonadicore_debug.h"
#include
<KLocalizedString>
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<Kdelibs4ConfigMigrator>
#endif
#include
"private/dbus_p.h"
#include
"private/instance_p.h"
...
...
@@ -111,10 +114,11 @@ Q_GLOBAL_STATIC(ServerManagerPrivate, sInstance) // NOLINT(readability-redundant
ServerManager
::
ServerManager
(
ServerManagerPrivate
*
dd
)
:
d
(
dd
)
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"servermanager"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"akonadi-firstrunrc"
));
migrate
.
migrate
();
#endif
qRegisterMetaType
<
Akonadi
::
ServerManager
::
State
>
();
d
->
serviceWatcher
=
std
::
make_unique
<
QDBusServiceWatcher
>
(
ServerManager
::
serviceName
(
ServerManager
::
Server
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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