From 3d177ec896d514aa44a483dc23a60fccfef9046b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 23 Feb 2022 02:56:38 +0200 Subject: [PATCH] ktimezoned: reuse variable Signed-off-by: Ivailo Monev --- ktimezoned/ktimezoned.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ktimezoned/ktimezoned.cpp b/ktimezoned/ktimezoned.cpp index dfc3dc72..dd160cf6 100644 --- a/ktimezoned/ktimezoned.cpp +++ b/ktimezoned/ktimezoned.cpp @@ -556,22 +556,20 @@ bool KTimeZoned::matchZoneFile(const QString &path) bool KTimeZoned::setLocalZone(const QString &zoneName) { KTimeZone local = mZones.zone(zoneName); + const QString path = mZoneinfoDir + '/' + zoneName; if (!local.isValid()) { // It isn't a recognised zone in zone.tab. // Note that some systems (e.g. Gentoo) have zones under zoneinfo which // are not in zone.tab, so check if it points to another zone file. if (mZoneinfoDir.isEmpty()) return false; - QString path = mZoneinfoDir + '/' + zoneName; - QFile qf; - qf.setFileName(path); - QFileInfo fi(qf); + QFileInfo fi(path); if (fi.isSymLink()) fi.setFile(fi.canonicalFilePath()); if (!fi.exists() || !fi.isReadable()) return false; } mLocalZone = zoneName; - mLocalZoneDataFile = mZoneinfoDir.isEmpty() ? QString() : mZoneinfoDir + '/' + zoneName; + mLocalZoneDataFile = mZoneinfoDir.isEmpty() ? QString() : path; return true; } -- 2.11.0