Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to KDateTime removal

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-14 22:55:43 +03:00
parent c68613d00b
commit 09744d81a3
6 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dolphin/src/kitemviews/kfileitemmodel.cpp
View file

@ -1179,8 +1179,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item,
// Don't use KFileItem::timeString() as this is too expensive when // Don't use KFileItem::timeString() as this is too expensive when
// having several thousands of items. Instead the formatting of the // 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. // 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"), item.time(KFileItem::ModificationTime));
data.insert(sharedValue("date"), QDateTime(dateTime));
} }
if (m_requestRole[PermissionsRole]) { if (m_requestRole[PermissionsRole]) {
@ -1337,8 +1336,8 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b) const
} }
case DateRole: { case DateRole: {
const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime); const QDateTime dateTimeA = itemA.time(KFileItem::ModificationTime);
const KDateTime dateTimeB = itemB.time(KFileItem::ModificationTime); const QDateTime dateTimeB = itemB.time(KFileItem::ModificationTime);
if (dateTimeA < dateTimeB) { if (dateTimeA < dateTimeB) {
result = -1; result = -1;
} else if (dateTimeA > dateTimeB) { } else if (dateTimeA > dateTimeB) {
@ -1516,7 +1515,7 @@ QList<QPair<int, QVariant> > KFileItemModel::dateRoleGroups() const
const int maxIndex = count() - 1; const int maxIndex = count() - 1;
QList<QPair<int, QVariant> > groups; QList<QPair<int, QVariant> > groups;
const QDate currentDate = KDateTime::currentLocalDateTime().date(); const QDate currentDate = QDateTime::currentDateTime().date();
QDate previousModifiedDate; QDate previousModifiedDate;
QString groupValue; QString groupValue;
@ -1525,7 +1524,7 @@ QList<QPair<int, QVariant> > KFileItemModel::dateRoleGroups() const
continue; 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(); const QDate modifiedDate = modifiedTime.date();
if (modifiedDate == previousModifiedDate) { if (modifiedDate == previousModifiedDate) {
// The current item is in the same group as the previous item // The current item is in the same group as the previous item

4
plasma/applets/folderview/proxymodel.cpp
View file

@ -171,8 +171,8 @@ bool ProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) con
// fall through to the naturalCompare call // fall through to the naturalCompare call
break; break;
case KDirModel::ModifiedTime: { case KDirModel::ModifiedTime: {
const KDateTime leftTime = leftItem.time(KFileItem::ModificationTime); const QDateTime leftTime = leftItem.time(KFileItem::ModificationTime);
const KDateTime rightTime = rightItem.time(KFileItem::ModificationTime); const QDateTime rightTime = rightItem.time(KFileItem::ModificationTime);
if (leftTime < rightTime) if (leftTime < rightTime)
result = -1; result = -1;
else if (leftTime > rightTime) else if (leftTime > rightTime)

5
plasma/dataengines/time/timeengine.cpp
View file

@ -20,14 +20,11 @@
#include "timeengine.h" #include "timeengine.h"
#include <QtCore/qdatetime.h>
#include <QDBusConnection> #include <QDBusConnection>
#include <QStringList> #include <QStringList>
#include <QtCore/qdatetime.h> #include <QDateTime>
#include <KLocale> #include <KLocale>
#include <KSystemTimeZones> #include <KSystemTimeZones>
#include <KDateTime>
#include <Solid/PowerManagement> #include <Solid/PowerManagement>
#include <KDebug> #include <KDebug>

2
plasma/dataengines/time/timesource.cpp
View file

@ -99,7 +99,7 @@ void TimeSource::updateTime()
} }
QDateTime dt = m_userDateTime ? data()["DateTime"].toDateTime() QDateTime dt = m_userDateTime ? data()["DateTime"].toDateTime()
: KDateTime::currentDateTime(tz); : tz.toZoneTime(QDateTime::currentDateTimeUtc());
if (m_solarPosition || m_moonPosition) { if (m_solarPosition || m_moonPosition) {
const QDate prev = data()["Date"].toDate(); const QDate prev = data()["Date"].toDate();

3
plasma/dataengines/time/timesource.h
View file

@ -20,8 +20,7 @@
#ifndef TIMESOURCE_H #ifndef TIMESOURCE_H
#define TIMESOURCE_H #define TIMESOURCE_H
#include <KDateTime> #include <QDateTime>
#include <Plasma/DataContainer> #include <Plasma/DataContainer>
class Sun; class Sun;

19
plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
View file

@ -28,15 +28,24 @@
#include "ion_wettercom.h" #include "ion_wettercom.h"
#include <QDateTime>
#include <KDebug> #include <KDebug>
#include <KDateTime>
#include <KLocale> #include <KLocale>
#include <kunitconversion.h> #include <KUnitConversion>
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 * Initialization
*/ */
WetterComIon::WetterComIon(QObject *parent, const QVariantList &args) WetterComIon::WetterComIon(QObject *parent, const QVariantList &args)
: IonInterface(parent, args) : IonInterface(parent, args)
@ -739,8 +748,8 @@ void WetterComIon::updateWeather(const QString& source, bool parseError)
.arg(nightWeather.tempLow) .arg(nightWeather.tempLow)
.arg(nightWeather.probability)); .arg(nightWeather.probability));
i++; i++;
const KDateTime localdt = KDateTime::currentLocalDateTime(); const QDateTime localdt = QDateTime::currentDateTime();
if (localdt.isNightTime()) { if (kIsNightTime(localdt)) {
conditionIcon = nightWeather.iconName; conditionIcon = nightWeather.iconName;
} }
} }