From 45ef2518e8594d34acce52ef412d71dd064bfdb6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Aug 2018 15:47:43 +0200 Subject: [PATCH] Apply clang-format --- cli/application.cpp | 5 ++--- connector/syncthingconnection.cpp | 6 +++--- model/syncthingdevicemodel.cpp | 3 ++- model/syncthingdirectorymodel.cpp | 4 ++-- widgets/misc/statusinfo.cpp | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cli/application.cpp b/cli/application.cpp index 18bfa8c..2de559e 100644 --- a/cli/application.cpp +++ b/cli/application.cpp @@ -571,7 +571,7 @@ void Application::printStatus(const ArgumentOccurrence &) cout << TextAttribute::Bold << "Overall statistics\n" << TextAttribute::Reset; const auto &overallStats(m_connection.computeOverallDirStatistics()); const auto *statusString = "\e[32midle\e[0m"; - switch(m_connection.status()) { + switch (m_connection.status()) { case SyncthingStatus::Synchronizing: statusString = "\e[34msynchronizing\e[0m"; break; @@ -581,8 +581,7 @@ void Application::printStatus(const ArgumentOccurrence &) case SyncthingStatus::OutOfSync: statusString = "\e[31mout-of-sync\e[0m"; break; - default: - ; + default:; } printProperty("Status", statusString); printProperty("Global", directoryStatusString(overallStats.global), nullptr, 6); diff --git a/connector/syncthingconnection.cpp b/connector/syncthingconnection.cpp index 18ea8b7..9d3642c 100644 --- a/connector/syncthingconnection.cpp +++ b/connector/syncthingconnection.cpp @@ -857,13 +857,13 @@ void SyncthingConnection::requestCompletion(const QString &devId, const QString void SyncthingConnection::requestDeviceStatistics() { QObject::connect( - requestData(QStringLiteral("stats/device"), QUrlQuery()), &QNetworkReply::finished, this, &SyncthingConnection::readDeviceStatistics); + requestData(QStringLiteral("stats/device"), QUrlQuery()), &QNetworkReply::finished, this, &SyncthingConnection::readDeviceStatistics); } void SyncthingConnection::requestVersion() { - QObject::connect( - m_versionReply = requestData(QStringLiteral("system/version"), QUrlQuery()), &QNetworkReply::finished, this, &SyncthingConnection::readVersion); + QObject::connect(m_versionReply = requestData(QStringLiteral("system/version"), QUrlQuery()), &QNetworkReply::finished, this, + &SyncthingConnection::readVersion); } /*! diff --git a/model/syncthingdevicemodel.cpp b/model/syncthingdevicemodel.cpp index 004b698..93968cd 100644 --- a/model/syncthingdevicemodel.cpp +++ b/model/syncthingdevicemodel.cpp @@ -286,7 +286,8 @@ void SyncthingDeviceModel::newDevices() void SyncthingDeviceModel::devStatusChanged(const SyncthingDev &, int index) { const QModelIndex modelIndex1(this->index(index, 0, QModelIndex())); - static const QVector modelRoles1({ Qt::DisplayRole, Qt::EditRole, Qt::DecorationRole, DevicePaused, DeviceStatus, DeviceStatusString, DeviceStatusColor, DeviceId }); + static const QVector modelRoles1( + { Qt::DisplayRole, Qt::EditRole, Qt::DecorationRole, DevicePaused, DeviceStatus, DeviceStatusString, DeviceStatusColor, DeviceId }); emit dataChanged(modelIndex1, modelIndex1, modelRoles1); const QModelIndex modelIndex2(this->index(index, 1, QModelIndex())); static const QVector modelRoles2({ Qt::DisplayRole, Qt::EditRole, Qt::ForegroundRole }); diff --git a/model/syncthingdirectorymodel.cpp b/model/syncthingdirectorymodel.cpp index be464f0..566a95b 100644 --- a/model/syncthingdirectorymodel.cpp +++ b/model/syncthingdirectorymodel.cpp @@ -362,8 +362,8 @@ void SyncthingDirectoryModel::newDirs() void SyncthingDirectoryModel::dirStatusChanged(const SyncthingDir &, int index) { const QModelIndex modelIndex1(this->index(index, 0, QModelIndex())); - static const QVector modelRoles1( - { Qt::DisplayRole, Qt::EditRole, Qt::DecorationRole, DirectoryPaused, DirectoryStatus, DirectoryStatusString, DirectoryStatusColor, DirectoryId, DirectoryPath }); + static const QVector modelRoles1({ Qt::DisplayRole, Qt::EditRole, Qt::DecorationRole, DirectoryPaused, DirectoryStatus, + DirectoryStatusString, DirectoryStatusColor, DirectoryId, DirectoryPath }); emit dataChanged(modelIndex1, modelIndex1, modelRoles1); const QModelIndex modelIndex2(this->index(index, 1, QModelIndex())); static const QVector modelRoles2({ Qt::DisplayRole, Qt::EditRole, Qt::ForegroundRole }); diff --git a/widgets/misc/statusinfo.cpp b/widgets/misc/statusinfo.cpp index a91ed83..d2fd104 100644 --- a/widgets/misc/statusinfo.cpp +++ b/widgets/misc/statusinfo.cpp @@ -6,8 +6,8 @@ #include "../../model/syncthingicons.h" #include -#include #include +#include using namespace Data; @@ -40,7 +40,8 @@ void StatusInfo::updateConnectionStatus(const SyncthingConnection &connection) case SyncthingStatus::Disconnected: if (connection.autoReconnectInterval() > 0) { m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "Not connected to Syncthing"); - m_additionalStatusInfo = QCoreApplication::translate("QtGui::StatusInfo", "Trying to reconnect every %1 ms").arg(connection.autoReconnectInterval()); + m_additionalStatusInfo + = QCoreApplication::translate("QtGui::StatusInfo", "Trying to reconnect every %1 ms").arg(connection.autoReconnectInterval()); } else { m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "Not connected to Syncthing"); } @@ -54,8 +55,7 @@ void StatusInfo::updateConnectionStatus(const SyncthingConnection &connection) if (connection.hasOutOfSyncDirs()) { switch (connection.status()) { case SyncthingStatus::Synchronizing: - m_statusText - = QCoreApplication::translate("QtGui::StatusInfo", "Synchronization is ongoing"); + m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "Synchronization is ongoing"); m_additionalStatusInfo = QCoreApplication::translate("QtGui::StatusInfo", "At least one directory is out of sync"); m_statusIcon = &statusIcons().errorSync; break;