summary refs log tree commit diff
path: root/src/timeline/TimelineViewManager.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-10-14 22:53:11 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2021-10-17 17:18:14 +0200
commit550c80525a1633edc983a7fe0d1dae11220cb35f (patch)
tree4c90537272055230fe944fca314c9c773fd54ea0 /src/timeline/TimelineViewManager.cpp
parentMerge pull request #766 from Thulinma/deviceDeletion (diff)
downloadnheko-550c80525a1633edc983a7fe0d1dae11220cb35f.tar.xz
Move voip and encryption stuff into their own directories
Diffstat (limited to 'src/timeline/TimelineViewManager.cpp')
-rw-r--r--src/timeline/TimelineViewManager.cpp4
1 files changed, 2 insertions, 2 deletions
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"