diff options
| author | CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com> | 2020-08-30 22:27:14 +0530 |
|---|---|---|
| committer | CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com> | 2020-08-30 22:27:14 +0530 |
| commit | b174bd938084a60fde5030dfc4dd0067a39f5a3f (patch) | |
| tree | 6f2bb24fb2ba01adb2957aea67aecda501aa41ac /src/ChatPage.h | |
| parent | Change the tag for mtxclient (diff) | |
| parent | Merge pull request #265 from trilene/voip (diff) | |
| download | nheko-b174bd938084a60fde5030dfc4dd0067a39f5a3f.tar.xz | |
Merge remote-tracking branch 'upstream/master' into device-verification
Diffstat (limited to 'src/ChatPage.h')
| -rw-r--r-- | src/ChatPage.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChatPage.h b/src/ChatPage.h index 10801342..de4cb4ca 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -36,11 +36,13 @@ #include <QWidget> #include "CacheStructs.h" +#include "CallManager.h" #include "CommunitiesList.h" #include "Utils.h" #include "notifications/Manager.h" #include "popups/UserMentions.h" +class ActiveCallBar; class OverlayModal; class QuickSwitcher; class RoomList; @@ -241,6 +243,9 @@ private: void showNotificationsDialog(const QPoint &point); + template<typename T> + void connectCallMessage(); + QHBoxLayout *topLayout_; Splitter *splitter; @@ -260,6 +265,7 @@ private: TopRoomBar *top_bar_; TextInputWidget *text_input_; + ActiveCallBar *activeCallBar_; QTimer connectivityTimer_; std::atomic_bool isConnected_; @@ -277,6 +283,7 @@ private: QSharedPointer<UserSettings> userSettings_; NotificationsManager notificationsManager; + CallManager callManager_; }; template<class Collection> |