diff --git a/model/syncthingrecentchangesmodel.cpp b/model/syncthingrecentchangesmodel.cpp index 8362847..842d988 100644 --- a/model/syncthingrecentchangesmodel.cpp +++ b/model/syncthingrecentchangesmodel.cpp @@ -125,7 +125,7 @@ QVariant SyncthingRecentChangesModel::data(const QModelIndex &index, int role) c } break; case Action: - return change.fileChange.action; + return change.fileChange.action; case ModifiedBy: return change.fileChange.modifiedBy; case DirectoryId: diff --git a/widgets/settings/settings.cpp b/widgets/settings/settings.cpp index 52916d2..b0880d1 100644 --- a/widgets/settings/settings.cpp +++ b/widgets/settings/settings.cpp @@ -234,8 +234,7 @@ void restore() = settings.value(QStringLiteral("errorsPollInterval"), connectionSettings->errorsPollInterval).toInt(); connectionSettings->reconnectInterval = settings.value(QStringLiteral("reconnectInterval"), connectionSettings->reconnectInterval).toInt(); - connectionSettings->autoConnect - = settings.value(QStringLiteral("autoConnect"), connectionSettings->autoConnect).toBool(); + connectionSettings->autoConnect = settings.value(QStringLiteral("autoConnect"), connectionSettings->autoConnect).toBool(); connectionSettings->httpsCertPath = settings.value(QStringLiteral("httpsCertPath")).toString(); if (!connectionSettings->loadHttpsCert()) { QMessageBox::critical(nullptr, QCoreApplication::applicationName(), @@ -283,7 +282,8 @@ void restore() launcher.autostartEnabled = settings.value(QStringLiteral("syncthingAutostart"), launcher.autostartEnabled).toBool(); launcher.useLibSyncthing = settings.value(QStringLiteral("useLibSyncthing"), launcher.useLibSyncthing).toBool(); launcher.libSyncthing.configDir = settings.value(QStringLiteral("libSyncthingConfigDir"), launcher.libSyncthing.configDir).toString(); - launcher.libSyncthing.logLevel = static_cast(settings.value(QStringLiteral("libSyncthingLogLevel"), static_cast(launcher.libSyncthing.logLevel)).toInt()); + launcher.libSyncthing.logLevel = static_cast( + settings.value(QStringLiteral("libSyncthingLogLevel"), static_cast(launcher.libSyncthing.logLevel)).toInt()); launcher.syncthingPath = settings.value(QStringLiteral("syncthingPath"), launcher.syncthingPath).toString(); launcher.syncthingArgs = settings.value(QStringLiteral("syncthingArgs"), launcher.syncthingArgs).toString(); launcher.considerForReconnect = settings.value(QStringLiteral("considerLauncherForReconnect"), launcher.considerForReconnect).toBool(); diff --git a/widgets/settings/settings.h b/widgets/settings/settings.h index a423c8f..7a0e4e1 100644 --- a/widgets/settings/settings.h +++ b/widgets/settings/settings.h @@ -2,8 +2,8 @@ #define SETTINGS_H #include "../../connector/syncthingconnectionsettings.h" -#include "../../model/syncthingicons.h" #include "../../libsyncthing/interface.h" +#include "../../model/syncthingicons.h" #include "../global.h" #include diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp index ba2498d..07dfb1c 100644 --- a/widgets/settings/settingsdialog.cpp +++ b/widgets/settings/settingsdialog.cpp @@ -914,7 +914,8 @@ QWidget *LauncherOptionPage::setupWidget() connect(m_launcher, &SyncthingLauncher::outputAvailable, this, &LauncherOptionPage::handleSyncthingOutputAvailable, Qt::QueuedConnection); connect(m_launcher, &SyncthingLauncher::exited, this, &LauncherOptionPage::handleSyncthingExited, Qt::QueuedConnection); connect(m_launcher, &SyncthingLauncher::errorOccurred, this, &LauncherOptionPage::handleSyncthingError, Qt::QueuedConnection); - connect(ui()->logLevelComboBox, static_cast(&QComboBox::currentIndexChanged), this, &LauncherOptionPage::updateLibSyncthingLogLevel); + connect(ui()->logLevelComboBox, static_cast(&QComboBox::currentIndexChanged), this, + &LauncherOptionPage::updateLibSyncthingLogLevel); m_launcher->setEmittingOutput(true); } connect(ui()->launchNowPushButton, &QPushButton::clicked, this, &LauncherOptionPage::launch);