Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve handling changed properties in `SyncthingService` 

* Check directly whether changed properties contain a property
  instead of checking indirectly whether the returned QVariant
  is invalid.
* Avoid copying the QVariant.
* Effectively this should not change anything; the code is just
  more readable and possibly more efficient.
This commit is contained in:
Martchus 2023-04-03 19:16:52 +02:00
parent f524a18b83
commit 76209e2922
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
syncthingconnector/syncthingservice.cpp
View File

@ -550,11 +550,11 @@ void SyncthingService::handlePrepareForSleep(bool rightBefore)
bool SyncthingService::handlePropertyChanged(QString &variable, void (SyncthingService::*signal)(const QString &), const QString &propertyName,
const QVariantMap &changedProperties, const QStringList &invalidatedProperties)
{
const QVariant valueVariant(changedProperties[propertyName]);
if (valueVariant.isValid()) {
const QString valueString(valueVariant.toString());
const auto valueVariant = changedProperties.find(propertyName);
if (valueVariant != changedProperties.end()) {
auto valueString = valueVariant->toString();
if (valueString != variable) {
emit(this->*signal)(variable = valueString);
emit(this->*signal)(variable = std::move(valueString));
return true;
}
} else if (invalidatedProperties.contains(propertyName) && !variable.isEmpty()) {
@ -571,10 +571,10 @@ bool SyncthingService::handlePropertyChanged(QString &variable, void (SyncthingS
bool SyncthingService::handlePropertyChanged(
DateTime &variable, const QString &propertyName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties)
{
const QVariant valueVariant(changedProperties[propertyName]);
if (valueVariant.isValid()) {
const auto valueVariant = changedProperties.find(propertyName);
if (valueVariant != changedProperties.end()) {
bool ok;
const qulonglong valueInt = valueVariant.toULongLong(&ok);
const qulonglong valueInt = valueVariant->toULongLong(&ok);
if (ok) {
variable = dateTimeFromSystemdTimeStamp(valueInt);
return true;