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

Apply clang-format

This commit is contained in:
Martchus 2020-03-17 18:56:59 +01:00
parent ccb2ac3144
commit f14a34b877
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connector/syncthingconnection.h
View File

@ -1,9 +1,9 @@
#ifndef SYNCTHINGCONNECTION_H #ifndef SYNCTHINGCONNECTION_H
#define SYNCTHINGCONNECTION_H #define SYNCTHINGCONNECTION_H
#include "./syncthingconnectionstatus.h"
#include "./syncthingdev.h" #include "./syncthingdev.h"
#include "./syncthingdir.h" #include "./syncthingdir.h"
#include "./syncthingconnectionstatus.h"
#include <QJsonObject> #include <QJsonObject>
#include <QList> #include <QList>

12
connector/tests/connectiontests.cpp
View File

@ -630,11 +630,13 @@ void ConnectionTests::testDisconnecting()
waitForConnected(); waitForConnected();
m_connection.requestVersion(); m_connection.requestVersion();
m_connection.requestDirStatistics(); m_connection.requestDirStatistics();
waitForSignals([this] { waitForSignals(
m_connection.requestDeviceStatistics(); [this] {
m_connection.requestCompletion("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7", "test1"); m_connection.requestDeviceStatistics();
QTimer::singleShot(0, &m_connection, defaultDisconnect()); m_connection.requestCompletion("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7", "test1");
}, 5000, connectionSignal(&SyncthingConnection::statusChanged)); QTimer::singleShot(0, &m_connection, defaultDisconnect());
},
5000, connectionSignal(&SyncthingConnection::statusChanged));
CPPUNIT_ASSERT_EQUAL_MESSAGE("disconnected", QStringLiteral("disconnected"), m_connection.statusText()); CPPUNIT_ASSERT_EQUAL_MESSAGE("disconnected", QStringLiteral("disconnected"), m_connection.statusText());
} }

2
model/syncthingrecentchangesmodel.h
View File

@ -3,8 +3,8 @@
#include "./syncthingmodel.h" #include "./syncthingmodel.h"
#include "../connector/syncthingdir.h"
#include "../connector/syncthingconnectionstatus.h" #include "../connector/syncthingconnectionstatus.h"
#include "../connector/syncthingdir.h"
#include <deque> #include <deque>