From 4ad2f6e165a4eb486155eae652e187dc4d6b7d99 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Thu, 25 Aug 2022 20:02:35 +0200
Subject: Cleanup
---
lib/connection.cpp | 7 +++----
lib/connection.h | 13 ++-----------
lib/room.cpp | 1 +
quotest/quotest.cpp | 1 +
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 9e4444df..98720f3b 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -6,11 +6,12 @@
#include "connection.h"
+#include "accountregistry.h"
#include "connectiondata.h"
+#include "qt_connection_util.h"
#include "room.h"
#include "settings.h"
#include "user.h"
-#include "accountregistry.h"
// NB: since Qt 6, moc_connection.cpp needs Room and User fully defined
#include "moc_connection.cpp"
@@ -20,10 +21,8 @@
#include "csapi/joining.h"
#include "csapi/leaving.h"
#include "csapi/logout.h"
-#include "csapi/receipts.h"
#include "csapi/room_send.h"
#include "csapi/to_device.h"
-#include "csapi/versions.h"
#include "csapi/voip.h"
#include "csapi/wellknown.h"
#include "csapi/whoami.h"
@@ -2184,8 +2183,8 @@ PicklingMode Connection::picklingMode() const
void Connection::saveOlmAccount()
{
- qCDebug(E2EE) << "Saving olm account";
#ifdef Quotient_E2EE_ENABLED
+ qCDebug(E2EE) << "Saving olm account";
if (const auto expectedPickle = d->olmAccount->pickle(d->picklingMode))
d->database->setAccountPickle(*expectedPickle);
else
diff --git a/lib/connection.h b/lib/connection.h
index 0d0c85b6..0e0abc39 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -5,13 +5,12 @@
#pragma once
-#include "ssosession.h"
-#include "qt_connection_util.h"
#include "quotient_common.h"
+#include "ssosession.h"
#include "util.h"
-#include "csapi/login.h"
#include "csapi/create_room.h"
+#include "csapi/login.h"
#include "events/accountdataevents.h"
@@ -379,20 +378,12 @@ public:
/**
* Call this before first sync to load from previously saved file.
- *
- * \param fromFile A local path to read the state from. Uses QUrl
- * to be QML-friendly. Empty parameter means saving to the directory
- * defined by stateCachePath() / stateCacheDir().
*/
Q_INVOKABLE void loadState();
/**
* This method saves the current state of rooms (but not messages
* in them) to a local cache file, so that it could be loaded by
* loadState() on a next run of the client.
- *
- * \param toFile A local path to save the state to. Uses QUrl to be
- * QML-friendly. Empty parameter means saving to the directory
- * defined by stateCachePath() / stateCacheDir().
*/
Q_INVOKABLE void saveState() const;
diff --git a/lib/room.cpp b/lib/room.cpp
index c6fbb353..007446dc 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -16,6 +16,7 @@
#include "user.h"
#include "eventstats.h"
#include "roomstateview.h"
+#include "qt_connection_util.h"
// NB: since Qt 6, moc_room.cpp needs User fully defined
#include "moc_room.cpp"
diff --git a/quotest/quotest.cpp b/quotest/quotest.cpp
index 90a5a69b..b6c855bb 100644
--- a/quotest/quotest.cpp
+++ b/quotest/quotest.cpp
@@ -6,6 +6,7 @@
#include "user.h"
#include "uriresolver.h"
#include "networkaccessmanager.h"
+#include "qt_connection_util.h"
#include "csapi/joining.h"
#include "csapi/leaving.h"
--
cgit v1.2.3