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
KOrganizer
Commits
3eeb5157
Commit
3eeb5157
authored
Apr 22, 2021
by
Laurent Montel
😁
Browse files
In kf6 kde4 migration code will be removed
parent
f1e23dc0
Pipeline
#59130
passed with stage
in 12 minutes and 27 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
korgac/korgacmain.cpp
View file @
3eeb5157
...
...
@@ -13,8 +13,10 @@
#include <KDBusService>
#include <KLocalizedString>
#include <KCoreAddons/Kdelibs4ConfigMigrator>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include <QApplication>
#include <QCommandLineParser>
...
...
@@ -23,10 +25,12 @@ int main(int argc, char **argv)
QCoreApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
);
QApplication
app
(
argc
,
argv
);
app
.
setAttribute
(
Qt
::
AA_UseHighDpiPixmaps
,
true
);
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"korgac"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"korgacrc"
));
migrate
.
migrate
();
#endif
KAboutData
aboutData
(
QStringLiteral
(
"korgac"
),
i18n
(
"KOrganizer Reminder Daemon"
),
...
...
src/korgmigrateapplication.cpp
View file @
3eeb5157
...
...
@@ -5,9 +5,9 @@
*/
#include "korgmigrateapplication.h"
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
KOrgMigrateApplication
::
KOrgMigrateApplication
()
{
initializeMigrator
();
...
...
@@ -56,3 +56,4 @@ void KOrgMigrateApplication::initializeMigrator()
// TODO add folder to migrate
// If you add new MigrateFileInfo we need to increase "currentVersion" and initialVersion
}
#endif
src/korgmigrateapplication.h
View file @
3eeb5157
...
...
@@ -5,7 +5,9 @@
*/
#pragma once
#include <QObject>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "korganizerprivate_export.h"
#include <PimCommon/MigrateApplicationFiles>
...
...
@@ -20,4 +22,4 @@ private:
void
initializeMigrator
();
PimCommon
::
MigrateApplicationFiles
mMigrator
;
};
#endif
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