Merge origin/master and fix conflicts

1 files changed, 0 insertions, 28 deletions

diff --git a/src/InviteeItem.cpp b/src/InviteeItem.cpp
deleted file mode 100644

index 27f02560..00000000
--- a/src/InviteeItem.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-
-#include "InviteeItem.h"
-
-constexpr int SidePadding = 10;
-
-InviteeItem::InviteeItem(mtx::identifiers::User user, QWidget *parent)
-  : QWidget{parent}
-  , user_{QString::fromStdString(user.to_string())}
-{
-        auto topLayout_ = new QHBoxLayout(this);
-        topLayout_->setSpacing(0);
-        topLayout_->setContentsMargins(SidePadding, 0, 3 * SidePadding, 0);
-
-        name_          = new QLabel(user_, this);
-        removeUserBtn_ = new QPushButton(tr("Remove"), this);
-
-        topLayout_->addWidget(name_);
-        topLayout_->addWidget(removeUserBtn_, 0, Qt::AlignRight);
-
-        connect(removeUserBtn_, &QPushButton::clicked, this, &InviteeItem::removeItem);
-}