Merge master and fix conflicts

1 files changed, 0 insertions, 45 deletions

diff --git a/src/dialogs/InviteUsers.h b/src/dialogs/InviteUsers.h
deleted file mode 100644

index e40183c1..00000000
--- a/src/dialogs/InviteUsers.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <QFrame>
-#include <QStringList>
-
-class QPushButton;
-class QLabel;
-class TextField;
-class QListWidget;
-class QListWidgetItem;
-
-namespace dialogs {
-
-class InviteUsers : public QFrame
-{
-        Q_OBJECT
-public:
-        explicit InviteUsers(QWidget *parent = nullptr);
-
-protected:
-        void showEvent(QShowEvent *event) override;
-
-signals:
-        void sendInvites(QStringList invitees);
-
-private slots:
-        void removeInvitee(QListWidgetItem *item);
-
-private:
-        void addUser();
-        QStringList invitedUsers() const;
-
-        QPushButton *confirmBtn_;
-        QPushButton *cancelBtn_;
-
-        TextField *inviteeInput_;
-        QLabel *errorLabel_;
-
-        QListWidget *inviteeList_;
-};
-} // dialogs