summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-05-04 08:19:00 +0200
committerMontel Laurent <[email protected]>2017-05-04 08:19:00 +0200
commitb9041e7c7607bc483ea4a5fc1b3c054943d6d007 (patch)
treedcf6099ba747527e86749852095d63da4b747a78
parentaf14681dda37b52a17e8f94bcbc2131cee1c48dc (diff)
Revert "Don't use deprecated method". It's 5.8 method :(
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/filter/filteractions/filteractionwithcommand.cpp2
-rw-r--r--src/job/expirejob.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3ecab1..db3d3e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@ add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT )
add_definitions("-DQT_NO_CAST_TO_ASCII")
remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
remove_definitions( -DQT_NO_CAST_FROM_ASCII )
-add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 )
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailCommon")
diff --git a/src/filter/filteractions/filteractionwithcommand.cpp b/src/filter/filteractions/filteractionwithcommand.cpp
index ac0038c..2094a54 100644
--- a/src/filter/filteractions/filteractionwithcommand.cpp
+++ b/src/filter/filteractions/filteractionwithcommand.cpp
@@ -87,7 +87,7 @@ QString FilterActionWithCommand::substituteCommandLineArgsFor(const KMime::Messa
}
// sort the list of n's
- std::sort(argList.begin(), argList.end());
+ qSort(argList);
// and use QString::arg to substitute filenames for the %n's.
int lastSeen = -2;
diff --git a/src/job/expirejob.cpp b/src/job/expirejob.cpp
index 592c269..d8833b9 100644
--- a/src/job/expirejob.cpp
+++ b/src/job/expirejob.cpp
@@ -147,7 +147,7 @@ void ExpireJob::itemFetchResult(KJob *job)
continue;
}
- if (mb->date()->dateTime().toSecsSinceEpoch() < maxTime) {
+ if (mb->date()->dateTime().toTime_t() < maxTime) {
mRemovedMsgs.append(item);
}
}