Merge remote-tracking branch 'origin/master' into new-event-store

Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp

1 files changed, 37 insertions, 0 deletions

diff --git a/src/dialogs/PlaceCall.h b/src/dialogs/PlaceCall.h
new file mode 100644

index 00000000..5a1e982c
--- /dev/null
+++ b/src/dialogs/PlaceCall.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <QSharedPointer>
+#include <QWidget>
+
+class QPushButton;
+class QString;
+class UserSettings;
+
+namespace dialogs {
+
+class PlaceCall : public QWidget
+{
+        Q_OBJECT
+
+public:
+        PlaceCall(const QString &callee,
+                  const QString &displayName,
+                  const QString &roomName,
+                  const QString &avatarUrl,
+                  QSharedPointer<UserSettings> settings,
+                  QWidget *parent = nullptr);
+
+signals:
+        void voice();
+        void cancel();
+
+private:
+        QPushButton *voiceBtn_;
+        QPushButton *cancelBtn_;
+        std::vector<std::string> audioDevices_;
+};
+
+}