Move voip and encryption stuff into their own directories
6 files changed, 6 insertions, 8 deletions
diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
index 7144424a..d7296a7c 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -15,7 +15,6 @@
#include "EventAccessors.h"
#include "Logging.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "Utils.h"
Q_DECLARE_METATYPE(Reaction)
diff --git a/src/timeline/EventStore.h b/src/timeline/EventStore.h
index 53dbaff4..9b857dcf 100644
--- a/src/timeline/EventStore.h
+++ b/src/timeline/EventStore.h
@@ -15,8 +15,8 @@
#include <mtx/responses/messages.hpp>
#include <mtx/responses/sync.hpp>
-#include "Olm.h"
#include "Reaction.h"
+#include "encryption/Olm.h"
class EventStore : public QObject
{
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index f33d1dfd..ed97a2ca 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -26,7 +26,6 @@
#include "Logging.h"
#include "MainWindow.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "RoomsModel.h"
#include "TimelineModel.h"
#include "TimelineViewManager.h"
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 720a78fe..0e5ce510 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -27,10 +27,10 @@
#include "MatrixClient.h"
#include "MemberList.h"
#include "MxcImageProvider.h"
-#include "Olm.h"
#include "ReadReceiptsModel.h"
#include "TimelineViewManager.h"
#include "Utils.h"
+#include "encryption/Olm.h"
Q_DECLARE_METATYPE(QModelIndex)
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index a30a145d..86f59c52 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -18,7 +18,6 @@
#include "CombinedImagePackModel.h"
#include "CompletionProxyModel.h"
#include "DelegateChooser.h"
-#include "DeviceVerificationFlow.h"
#include "EventAccessors.h"
#include "ImagePackListModel.h"
#include "InviteesModel.h"
@@ -29,13 +28,14 @@
#include "ReadReceiptsModel.h"
#include "RoomDirectoryModel.h"
#include "RoomsModel.h"
-#include "SelfVerificationStatus.h"
#include "SingleImagePackModel.h"
#include "UserSettingsPage.h"
#include "UsersModel.h"
#include "dialogs/ImageOverlay.h"
#include "emoji/EmojiModel.h"
#include "emoji/Provider.h"
+#include "encryption/DeviceVerificationFlow.h"
+#include "encryption/SelfVerificationStatus.h"
#include "ui/MxcAnimatedImage.h"
#include "ui/MxcMediaProxy.h"
#include "ui/NhekoCursorShape.h"
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index ab078aa7..723282d6 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -17,16 +17,16 @@
#include <mtx/responses/sync.hpp>
#include "Cache.h"
-#include "CallManager.h"
#include "JdenticonProvider.h"
#include "Logging.h"
#include "TimelineModel.h"
#include "Utils.h"
-#include "WebRTCSession.h"
#include "emoji/EmojiModel.h"
#include "emoji/Provider.h"
#include "timeline/CommunitiesModel.h"
#include "timeline/RoomlistModel.h"
+#include "voip/CallManager.h"
+#include "voip/WebRTCSession.h"
class MxcImageProvider;
class BlurhashProvider;
|
