summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-08-02 20:39:48 (GMT)
committerMontel Laurent <montel@kde.org>2016-08-02 20:39:48 (GMT)
commitd1ae4bb617c453383f65bc108b09d239c73cdde7 (patch)
treedec0e7ef401edd7d83b25f007b07e0eeae06b203
parentac9b701b47c4150b21b19fda1ab6a73b61458a47 (diff)
Port to qt5
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/freebusymodel/freeperiodmodel.cpp9
2 files changed, 4 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fac9acd..9801817 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.41")
+set(PIM_VERSION "5.3.42")
set(CALENDARSUPPORT_LIB_VERSION ${PIM_VERSION})
set(AKONADI_MIMELIB_VERSION "5.3.40")
@@ -27,7 +27,7 @@ set(KDEPIM_LIB_VERSION "5.3.40")
set(QT_REQUIRED_VERSION "5.5.0")
set(KMIME_LIB_VERSION "5.3.40")
set(CALENDARUTILS_LIB_VERSION "5.3.40")
-set(KCALENDARCORE_LIB_VERSION "5.3.40")
+set(KCALENDARCORE_LIB_VERSION "5.3.41")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.40")
set(KHOLIDAYS_LIB_VERSION "5.3.40")
set(AKONADICALENDAR_LIB_VERSION "5.3.40")
diff --git a/src/freebusymodel/freeperiodmodel.cpp b/src/freebusymodel/freeperiodmodel.cpp
index b594535..d407a40 100644
--- a/src/freebusymodel/freeperiodmodel.cpp
+++ b/src/freebusymodel/freeperiodmodel.cpp
@@ -113,7 +113,7 @@ KCalCore::Period::List FreePeriodModel::splitPeriodsByDay(
continue;
}
- const int validPeriodSecs = 5 * 60; // 5 minutes
+ const int validPeriodSecs = 300; // 5 minutes
KCalCore::Period tmpPeriod = period;
while (tmpPeriod.start().date() != tmpPeriod.end().date()) {
const KDateTime midnight(tmpPeriod.start().date(), QTime(23, 59, 59, 999),
@@ -132,15 +132,10 @@ KCalCore::Period::List FreePeriodModel::splitPeriodsByDay(
// Perform some jiggery pokery to remove duplicates
-#pragma message("port to QT5")
-#if 0 //QT5 FIX ME
QList<KCalCore::Period> tmpList = splitList.toList();
- QSet<KCalCore::Period>set = tmpList.toSet();
+ const QSet<KCalCore::Period> set = tmpList.toSet();
tmpList = QList<KCalCore::Period>::fromSet(set);
return KCalCore::Period::List::fromList(tmpList);
-#else
- return splitList;
-#endif
}
QString FreePeriodModel::day(int index) const