diff --git a/src/plugins/nightlight/constants.h b/src/plugins/nightlight/constants.h index 65c7383a91..e32933084c 100644 --- a/src/plugins/nightlight/constants.h +++ b/src/plugins/nightlight/constants.h @@ -3,6 +3,7 @@ This file is part of the KDE project. SPDX-FileCopyrightText: 2017 Roman Gilg + SPDX-FileCopyrightText: 2024 Vlad Zahorodnii SPDX-License-Identifier: GPL-2.0-or-later */ @@ -15,7 +16,7 @@ static const int MSC_DAY = 86400000; static const int MIN_TEMPERATURE = 1000; static const int DEFAULT_DAY_TEMPERATURE = 6500; static const int DEFAULT_NIGHT_TEMPERATURE = 4500; -static const int FALLBACK_SLOW_UPDATE_TIME = 1800000; /* 30 minutes */ +static const int DEFAULT_TRANSITION_DURATION = 1800000; /* 30 minutes */ static const int MIN_TRANSITION_DURATION = 60000; } diff --git a/src/plugins/nightlight/nightlightmanager.cpp b/src/plugins/nightlight/nightlightmanager.cpp index 3e689b9f5e..e207590dbc 100644 --- a/src/plugins/nightlight/nightlightmanager.cpp +++ b/src/plugins/nightlight/nightlightmanager.cpp @@ -288,7 +288,7 @@ void NightLightManager::readConfig() if (maximumTransitionDuration <= transitionDuration) { morning = QTime(6, 0); evening = QTime(18, 0); - transitionDuration = FALLBACK_SLOW_UPDATE_TIME; + transitionDuration = DEFAULT_TRANSITION_DURATION; } m_morning = morning; @@ -562,16 +562,16 @@ DateTimes NightLightManager::getSunTimings(const QDateTime &dateTime, double lat const bool endDefined = !dateTimes.second.isNull(); if (!beginDefined || !endDefined) { if (beginDefined) { - dateTimes.second = dateTimes.first.addMSecs(FALLBACK_SLOW_UPDATE_TIME); + dateTimes.second = dateTimes.first.addMSecs(DEFAULT_TRANSITION_DURATION); } else if (endDefined) { - dateTimes.first = dateTimes.second.addMSecs(-FALLBACK_SLOW_UPDATE_TIME); + dateTimes.first = dateTimes.second.addMSecs(-DEFAULT_TRANSITION_DURATION); } else { // Just use default values for morning and evening, but the user // will probably deactivate Night Light anyway if he is living // in a region without clear sun rise and set. const QTime referenceTime = morning ? QTime(6, 0) : QTime(18, 0); dateTimes.first = QDateTime(dateTime.date(), referenceTime); - dateTimes.second = dateTimes.first.addMSecs(FALLBACK_SLOW_UPDATE_TIME); + dateTimes.second = dateTimes.first.addMSecs(DEFAULT_TRANSITION_DURATION); } } return dateTimes; diff --git a/src/plugins/nightlight/nightlightmanager.h b/src/plugins/nightlight/nightlightmanager.h index 267bfedd17..556ac75ba5 100644 --- a/src/plugins/nightlight/nightlightmanager.h +++ b/src/plugins/nightlight/nightlightmanager.h @@ -289,7 +289,7 @@ private: // manual times from config QTime m_morning = QTime(6, 0); QTime m_evening = QTime(18, 0); - int m_transitionDuration = FALLBACK_SLOW_UPDATE_TIME; // in milliseconds + int m_transitionDuration = DEFAULT_TRANSITION_DURATION; // in milliseconds // auto location provided by work space double m_latitudeAuto;