diff options
| author | trilene <trilene@runbox.com> | 2020-10-27 15:29:53 -0400 |
|---|---|---|
| committer | trilene <trilene@runbox.com> | 2020-10-27 15:29:53 -0400 |
| commit | d9ca5309ac0e5f25e0af6cc75a9b31e79a33d4d7 (patch) | |
| tree | ecf31e7dde13cae5c4c24b256542b77dd31f6d79 /src/timeline/TimelineViewManager.h | |
| parent | Support video calls (diff) | |
| parent | Translated using Weblate (English) (diff) | |
| download | nheko-d9ca5309ac0e5f25e0af6cc75a9b31e79a33d4d7.tar.xz | |
Merge remote-tracking branch 'upstream/master' into webrtc-video
Diffstat (limited to 'src/timeline/TimelineViewManager.h')
| -rw-r--r-- | src/timeline/TimelineViewManager.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h index 1a2d4c4e..895c4b39 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h @@ -42,9 +42,7 @@ class TimelineViewManager : public QObject Q_PROPERTY(bool isMicMuted READ isMicMuted NOTIFY micMuteChanged) public: - TimelineViewManager(QSharedPointer<UserSettings> userSettings, - CallManager *callManager, - ChatPage *parent = nullptr); + TimelineViewManager(CallManager *callManager, ChatPage *parent = nullptr); QWidget *getWidget() const { return container; } void sync(const mtx::responses::Rooms &rooms); @@ -98,6 +96,7 @@ signals: public slots: void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids); + void receivedSessionKey(const std::string &room_id, const std::string &session_id); void initWithMessages(const std::map<QString, mtx::responses::Timeline> &msgs); void setHistoryView(const QString &room_id); @@ -180,7 +179,6 @@ private: bool isInitialSync_ = true; bool isNarrowView_ = false; - QSharedPointer<UserSettings> settings; QHash<QString, QColor> userColors; QHash<QString, QSharedPointer<DeviceVerificationFlow>> dvList; |