From 72879aec83a3d659d0c4c544a0dc8f3babd22023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= Date: Fri, 23 Jun 2023 15:28:19 +0100 Subject: [PATCH] improve (#284) * Prefer prefix ++ operators Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code. * Reformat misleading code indentation Very misleading and error prone. --- lxqt-admin-time/fbsdtimedatectl.cpp | 12 ++++++------ lxqt-admin-time/nosdtimedatectl.cpp | 29 ++++++++++++++++------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lxqt-admin-time/fbsdtimedatectl.cpp b/lxqt-admin-time/fbsdtimedatectl.cpp index e7f32a3b..b443a73f 100644 --- a/lxqt-admin-time/fbsdtimedatectl.cpp +++ b/lxqt-admin-time/fbsdtimedatectl.cpp @@ -46,11 +46,12 @@ FBSDTimeDateCtl::~FBSDTimeDateCtl() QString FBSDTimeDateCtl::timeZone() const { QFile tzFile(QSL("/var/db/zoneinfo")); - if (!tzFile.open(QFile::ReadOnly | QFile::Text)) return QSL("Unknown"); - QTextStream in(&tzFile); - QString lastTZone = in.readLine(); - return lastTZone; + if (!tzFile.open(QFile::ReadOnly | QFile::Text)) + return QSL("Unknown"); + QTextStream in(&tzFile); + QString lastTZone = in.readLine(); + return lastTZone; } bool FBSDTimeDateCtl::setTimeZone(QString timeZone, QString& /*errorMessage*/) @@ -76,8 +77,7 @@ bool FBSDTimeDateCtl::useNtp() const process.waitForFinished(-1); QString t = QString::fromLatin1(process.readAllStandardOutput()); QStringList o = t.split(QSL("\n")); - for (QStringList::iterator it = o.begin(); - it != o.end(); ++it) { + for (QStringList::iterator it = o.begin(); it != o.end(); ++it) { QString current = *it; if(!current.startsWith(QSL("#")) && current.contains(QSL("ntpd_enable"),Qt::CaseInsensitive) && current.contains(QSL("yes"),Qt::CaseInsensitive)) { return true; diff --git a/lxqt-admin-time/nosdtimedatectl.cpp b/lxqt-admin-time/nosdtimedatectl.cpp index 51ce1f71..ef925ed8 100644 --- a/lxqt-admin-time/nosdtimedatectl.cpp +++ b/lxqt-admin-time/nosdtimedatectl.cpp @@ -46,10 +46,12 @@ NOSDTimeDateCtl::~NOSDTimeDateCtl() QString NOSDTimeDateCtl::timeZone() const { QFile tzFile(QSL("/etc/timezone")); - if (!tzFile.open(QFile::ReadOnly | QFile::Text)) return QSL("Unknown"); - QTextStream in(&tzFile); - QString lastTZone = in.readLine(); - return lastTZone; + if (!tzFile.open(QFile::ReadOnly | QFile::Text)) + return QSL("Unknown"); + + QTextStream in(&tzFile); + QString lastTZone = in.readLine(); + return lastTZone; } bool NOSDTimeDateCtl::setTimeZone(QString timeZone, QString& /*errorMessage*/) @@ -99,18 +101,19 @@ bool NOSDTimeDateCtl::localRtc() const { QFile tzFile(QSL("/etc/sysconfig/clock")); if (!tzFile.open(QFile::ReadOnly | QFile::Text)) - return false; + return false; + QTextStream in(&tzFile); QString all = in.readAll(); QStringList sl = all.split(QSL("\n")); - for (QStringList::iterator it = sl.begin(); it != sl.end(); it++) { - QString current = *it; - if(current.startsWith(QSL("#"))) - continue; - if(current.startsWith(QSL("UTC=1")) || current.startsWith(QSL("UTC=true"))) - return false; - if(current.startsWith(QSL("UTC=0")) || current.startsWith(QSL("UTC=false"))) - return true; + for (QStringList::iterator it = sl.begin(); it != sl.end(); ++it) { + QString current = *it; + if(current.startsWith(QSL("#"))) + continue; + if(current.startsWith(QSL("UTC=1")) || current.startsWith(QSL("UTC=true"))) + return false; + if(current.startsWith(QSL("UTC=0")) || current.startsWith(QSL("UTC=false"))) + return true; } return false; }