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
KAlarm
Commits
629228f8
Commit
629228f8
authored
Jan 13, 2022
by
Laurent Montel
Browse files
Remove unused includes + use QT_VERSION
parent
2e238a9f
Pipeline
#122496
passed with stage
in 1 minute and 27 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/fontcolour.cpp
View file @
629228f8
...
...
@@ -14,7 +14,6 @@
#include
"lib/checkbox.h"
#include
<KFontChooser>
#include
<kwidgetsaddons_version.h>
#include
<QGroupBox>
#include
<QLabel>
...
...
src/kalarmapp.cpp
View file @
629228f8
...
...
@@ -30,8 +30,7 @@
#include
"notifications_interface.h"
// DBUS-generated
#include
"dbusproperties.h"
// DBUS-generated
#include
"kalarm_debug.h"
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
"migratekde4files.h"
#endif
#include
<KAlarmCal/DateTime>
...
...
@@ -139,7 +138,7 @@ KAlarmApp* KAlarmApp::create(int& argc, char** argv)
*/
void
KAlarmApp
::
initialise
()
{
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
// Migrate config and data files from KDE4 locations.
MigrateKde4Files
migrate
;
migrate
.
migrate
();
...
...
src/migratekde4files.cpp
View file @
629228f8
...
...
@@ -10,7 +10,7 @@
*/
#include
"migratekde4files.h"
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
"kalarm_debug.h"
#include
<Kdelibs4ConfigMigrator>
...
...
src/migratekde4files.h
View file @
629228f8
...
...
@@ -10,8 +10,7 @@
#pragma once
#include
<QObject>
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<PimCommon/MigrateApplicationFiles>
/** Class to migrate KAlarm config and data files from KDE4 locations to Qt5
...
...
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