summary refs log tree commit diff
path: root/src/ChatPage.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 16:57:03 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 16:57:03 +0200
commit99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6 (patch)
treeb337a2a83b3795518f6f82bbad85938fea40d916 /src/ChatPage.cpp
parentImplement signature upload for own master key (diff)
parentMerge pull request #294 from trilene/master (diff)
downloadnheko-99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6.tar.xz
Merge remote-tracking branch 'origin/master' into cross-signing
Diffstat (limited to 'src/ChatPage.cpp')
-rw-r--r--src/ChatPage.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 87b4c277..8e93c0f4 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -22,7 +22,6 @@ #include <QShortcut> #include <QtConcurrent> -#include "ActiveCallBar.h" #include "AvatarProvider.h" #include "Cache.h" #include "Cache_p.h" @@ -41,7 +40,6 @@ #include "UserInfoWidget.h" #include "UserSettingsPage.h" #include "Utils.h" -#include "WebRTCSession.h" #include "ui/OverlayModal.h" #include "ui/Theme.h" @@ -130,12 +128,6 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) contentLayout_->addWidget(view_manager_->getWidget()); - activeCallBar_ = new ActiveCallBar(this); - contentLayout_->addWidget(activeCallBar_); - activeCallBar_->hide(); - connect( - &callManager_, &CallManager::newCallParty, activeCallBar_, &ActiveCallBar::setCallParty); - // Splitter splitter->addWidget(sideBar_); splitter->addWidget(content_);