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

Apply clang-format

This commit is contained in:
Martchus 2018-08-04 15:47:43 +02:00
parent 7e09d9b707
commit 45ef2518e8
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/application.cpp
View File

@ -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);

6
connector/syncthingconnection.cpp
View File

@ -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);
}
/*!

3
model/syncthingdevicemodel.cpp
View File

@ -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<int> modelRoles1({ Qt::DisplayRole, Qt::EditRole, Qt::DecorationRole, DevicePaused, DeviceStatus, DeviceStatusString, DeviceStatusColor, DeviceId });
static const QVector<int> 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<int> modelRoles2({ Qt::DisplayRole, Qt::EditRole, Qt::ForegroundRole });

4
model/syncthingdirectorymodel.cpp
View File

@ -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<int> modelRoles1(
{ Qt::DisplayRole, Qt::EditRole, Qt::DecorationRole, DirectoryPaused, DirectoryStatus, DirectoryStatusString, DirectoryStatusColor, DirectoryId, DirectoryPath });
static const QVector<int> 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<int> modelRoles2({ Qt::DisplayRole, Qt::EditRole, Qt::ForegroundRole });

8
widgets/misc/statusinfo.cpp
View File

@ -6,8 +6,8 @@
#include "../../model/syncthingicons.h"
#include <QCoreApplication>
#include <QStringBuilder>
#include <QIcon>
#include <QStringBuilder>
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;