summary refs log tree commit diff
path: root/src/MemberList.cpp
diff options
context:
space:
mode:
authorkamathmanu <manuriddle@gmail.com>2021-08-07 21:20:43 +0000
committerGitHub <noreply@github.com>2021-08-07 21:20:43 +0000
commit2dfccda73c44d97e9e3e52db3e03315e8ef656a5 (patch)
tree52c9855610cbdf6f6284cfacbaba07f676a0f621 /src/MemberList.cpp
parentFix Duplicate fetched chunk (diff)
parentShow encryption errors in qml and add request keys button (diff)
downloadnheko-2dfccda73c44d97e9e3e52db3e03315e8ef656a5.tar.xz
Merge branch 'master' into nhekoRoomDirectory
Diffstat (limited to 'src/MemberList.cpp')
-rw-r--r--src/MemberList.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/MemberList.cpp b/src/MemberList.cpp

index 0ef3b696..196647fe 100644 --- a/src/MemberList.cpp +++ b/src/MemberList.cpp
@@ -2,16 +2,6 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#include <QAbstractSlider> -#include <QLabel> -#include <QListWidgetItem> -#include <QPainter> -#include <QPushButton> -#include <QScrollBar> -#include <QShortcut> -#include <QStyleOption> -#include <QVBoxLayout> - #include "MemberList.h" #include "Cache.h" @@ -20,7 +10,6 @@ #include "Logging.h" #include "Utils.h" #include "timeline/TimelineViewManager.h" -#include "ui/Avatar.h" MemberList::MemberList(const QString &room_id, QObject *parent) : QAbstractListModel{parent}