diff --git a/connector/syncthingconnection.h b/connector/syncthingconnection.h index 0ce9f96..c9490c7 100644 --- a/connector/syncthingconnection.h +++ b/connector/syncthingconnection.h @@ -1,9 +1,9 @@ #ifndef SYNCTHINGCONNECTION_H #define SYNCTHINGCONNECTION_H +#include "./syncthingconnectionstatus.h" #include "./syncthingdev.h" #include "./syncthingdir.h" -#include "./syncthingconnectionstatus.h" #include #include diff --git a/connector/tests/connectiontests.cpp b/connector/tests/connectiontests.cpp index f5d518a..073a6aa 100644 --- a/connector/tests/connectiontests.cpp +++ b/connector/tests/connectiontests.cpp @@ -630,11 +630,13 @@ void ConnectionTests::testDisconnecting() waitForConnected(); m_connection.requestVersion(); m_connection.requestDirStatistics(); - waitForSignals([this] { - m_connection.requestDeviceStatistics(); - m_connection.requestCompletion("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7", "test1"); - QTimer::singleShot(0, &m_connection, defaultDisconnect()); - }, 5000, connectionSignal(&SyncthingConnection::statusChanged)); + waitForSignals( + [this] { + m_connection.requestDeviceStatistics(); + m_connection.requestCompletion("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7", "test1"); + QTimer::singleShot(0, &m_connection, defaultDisconnect()); + }, + 5000, connectionSignal(&SyncthingConnection::statusChanged)); CPPUNIT_ASSERT_EQUAL_MESSAGE("disconnected", QStringLiteral("disconnected"), m_connection.statusText()); } diff --git a/model/syncthingrecentchangesmodel.h b/model/syncthingrecentchangesmodel.h index 3e3566a..4b0bda8 100644 --- a/model/syncthingrecentchangesmodel.h +++ b/model/syncthingrecentchangesmodel.h @@ -3,8 +3,8 @@ #include "./syncthingmodel.h" -#include "../connector/syncthingdir.h" #include "../connector/syncthingconnectionstatus.h" +#include "../connector/syncthingdir.h" #include