Speed up compilation a bit
5 files changed, 11 insertions, 10 deletions
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index 1e7ed7bc..f0c7ed52 100644
--- a/src/encryption/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -4,6 +4,13 @@
#include "DeviceVerificationFlow.h"
+#include <tuple>
+
+#include <QDateTime>
+#include <QTimer>
+
+#include <nlohmann/json.hpp>
+
#include "Cache.h"
#include "Cache_p.h"
#include "ChatPage.h"
@@ -11,11 +18,6 @@
#include "Utils.h"
#include "timeline/TimelineModel.h"
-#include <QDateTime>
-#include <QTimer>
-#include <iostream>
-#include <tuple>
-
static constexpr int TIMEOUT = 2 * 60 * 1000; // 2 minutes
static mtx::events::msg::KeyVerificationMac
diff --git a/src/encryption/DeviceVerificationFlow.h b/src/encryption/DeviceVerificationFlow.h
index 50818883..6b1776e0 100644
--- a/src/encryption/DeviceVerificationFlow.h
+++ b/src/encryption/DeviceVerificationFlow.h
@@ -11,7 +11,6 @@
#include "CacheCryptoStructs.h"
#include "Logging.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "timeline/TimelineModel.h"
class QTimer;
diff --git a/src/encryption/Olm.cpp b/src/encryption/Olm.cpp
index 7fa176b0..aaa7e43f 100644
--- a/src/encryption/Olm.cpp
+++ b/src/encryption/Olm.cpp
@@ -22,7 +22,6 @@
#include "Logging.h"
#include "MatrixClient.h"
#include "UserSettingsPage.h"
-#include "Utils.h"
namespace {
auto client_ = std::make_unique<mtx::crypto::OlmClient>();
diff --git a/src/encryption/Olm.h b/src/encryption/Olm.h
index 726b9590..252d08b4 100644
--- a/src/encryption/Olm.h
+++ b/src/encryption/Olm.h
@@ -4,7 +4,6 @@
#pragma once
-#include <memory>
#include <mtx/events.hpp>
#include <mtx/events/encrypted.hpp>
#include <mtxclient/crypto/client.hpp>
diff --git a/src/encryption/SelfVerificationStatus.cpp b/src/encryption/SelfVerificationStatus.cpp
index e54cbc2d..8981244d 100644
--- a/src/encryption/SelfVerificationStatus.cpp
+++ b/src/encryption/SelfVerificationStatus.cpp
@@ -6,6 +6,10 @@
#include <QApplication>
+#include <nlohmann/json.hpp>
+
+#include <mtx/responses/common.hpp>
+
#include "Cache.h"
#include "Cache_p.h"
#include "ChatPage.h"
@@ -16,8 +20,6 @@
#include "timeline/TimelineViewManager.h"
#include "ui/UIA.h"
-#include <mtx/responses/common.hpp>
-
SelfVerificationStatus::SelfVerificationStatus(QObject *o)
: QObject(o)
{
|
