From 09744d81a3ce51de78f676e0fc87b4c83d07411c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 14 Aug 2023 22:55:43 +0300 Subject: [PATCH] generic: adjust to KDateTime removal Signed-off-by: Ivailo Monev --- dolphin/src/kitemviews/kfileitemmodel.cpp | 11 +++++------ plasma/applets/folderview/proxymodel.cpp | 4 ++-- plasma/dataengines/time/timeengine.cpp | 5 +---- plasma/dataengines/time/timesource.cpp | 2 +- plasma/dataengines/time/timesource.h | 3 +-- .../weather/ions/wetter.com/ion_wettercom.cpp | 19 ++++++++++++++----- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dolphin/src/kitemviews/kfileitemmodel.cpp b/dolphin/src/kitemviews/kfileitemmodel.cpp index e87a8e76..e2971ec4 100644 --- a/dolphin/src/kitemviews/kfileitemmodel.cpp +++ b/dolphin/src/kitemviews/kfileitemmodel.cpp @@ -1179,8 +1179,7 @@ QHash KFileItemModel::retrieveData(const KFileItem& item, // Don't use KFileItem::timeString() as this is too expensive when // having several thousands of items. Instead the formatting of the // date-time will be done on-demand by the view when the date will be shown. - const KDateTime dateTime = item.time(KFileItem::ModificationTime); - data.insert(sharedValue("date"), QDateTime(dateTime)); + data.insert(sharedValue("date"), item.time(KFileItem::ModificationTime)); } if (m_requestRole[PermissionsRole]) { @@ -1337,8 +1336,8 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b) const } case DateRole: { - const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime); - const KDateTime dateTimeB = itemB.time(KFileItem::ModificationTime); + const QDateTime dateTimeA = itemA.time(KFileItem::ModificationTime); + const QDateTime dateTimeB = itemB.time(KFileItem::ModificationTime); if (dateTimeA < dateTimeB) { result = -1; } else if (dateTimeA > dateTimeB) { @@ -1516,7 +1515,7 @@ QList > KFileItemModel::dateRoleGroups() const const int maxIndex = count() - 1; QList > groups; - const QDate currentDate = KDateTime::currentLocalDateTime().date(); + const QDate currentDate = QDateTime::currentDateTime().date(); QDate previousModifiedDate; QString groupValue; @@ -1525,7 +1524,7 @@ QList > KFileItemModel::dateRoleGroups() const continue; } - const KDateTime modifiedTime = m_itemData.at(i)->item.time(KFileItem::ModificationTime); + const QDateTime modifiedTime = m_itemData.at(i)->item.time(KFileItem::ModificationTime); const QDate modifiedDate = modifiedTime.date(); if (modifiedDate == previousModifiedDate) { // The current item is in the same group as the previous item diff --git a/plasma/applets/folderview/proxymodel.cpp b/plasma/applets/folderview/proxymodel.cpp index 64fa0917..243b2928 100644 --- a/plasma/applets/folderview/proxymodel.cpp +++ b/plasma/applets/folderview/proxymodel.cpp @@ -171,8 +171,8 @@ bool ProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) con // fall through to the naturalCompare call break; case KDirModel::ModifiedTime: { - const KDateTime leftTime = leftItem.time(KFileItem::ModificationTime); - const KDateTime rightTime = rightItem.time(KFileItem::ModificationTime); + const QDateTime leftTime = leftItem.time(KFileItem::ModificationTime); + const QDateTime rightTime = rightItem.time(KFileItem::ModificationTime); if (leftTime < rightTime) result = -1; else if (leftTime > rightTime) diff --git a/plasma/dataengines/time/timeengine.cpp b/plasma/dataengines/time/timeengine.cpp index 31937cf6..9f2ed344 100644 --- a/plasma/dataengines/time/timeengine.cpp +++ b/plasma/dataengines/time/timeengine.cpp @@ -20,14 +20,11 @@ #include "timeengine.h" -#include #include #include -#include - +#include #include #include -#include #include #include diff --git a/plasma/dataengines/time/timesource.cpp b/plasma/dataengines/time/timesource.cpp index 99aea46c..cc0e62a8 100644 --- a/plasma/dataengines/time/timesource.cpp +++ b/plasma/dataengines/time/timesource.cpp @@ -99,7 +99,7 @@ void TimeSource::updateTime() } QDateTime dt = m_userDateTime ? data()["DateTime"].toDateTime() - : KDateTime::currentDateTime(tz); + : tz.toZoneTime(QDateTime::currentDateTimeUtc()); if (m_solarPosition || m_moonPosition) { const QDate prev = data()["Date"].toDate(); diff --git a/plasma/dataengines/time/timesource.h b/plasma/dataengines/time/timesource.h index f6266bdc..3acb8a1b 100644 --- a/plasma/dataengines/time/timesource.h +++ b/plasma/dataengines/time/timesource.h @@ -20,8 +20,7 @@ #ifndef TIMESOURCE_H #define TIMESOURCE_H -#include - +#include #include class Sun; diff --git a/plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp b/plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp index 6863e71f..06c39064 100644 --- a/plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp +++ b/plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp @@ -28,15 +28,24 @@ #include "ion_wettercom.h" +#include #include -#include #include -#include +#include + +static bool kIsNightTime(const QDateTime &dt) +{ + const int month = dt.date().month(); + const int hour = dt.time().hour(); + if (month <= 3 || month >= 9) { + return (hour >= 19 || hour <= 6); + } + return (hour >= 20 || hour <= 5); +} /* * Initialization */ - WetterComIon::WetterComIon(QObject *parent, const QVariantList &args) : IonInterface(parent, args) @@ -739,8 +748,8 @@ void WetterComIon::updateWeather(const QString& source, bool parseError) .arg(nightWeather.tempLow) .arg(nightWeather.probability)); i++; - const KDateTime localdt = KDateTime::currentLocalDateTime(); - if (localdt.isNightTime()) { + const QDateTime localdt = QDateTime::currentDateTime(); + if (kIsNightTime(localdt)) { conditionIcon = nightWeather.iconName; } }