diff --git a/src/dialogs/InviteUsers.cpp b/src/dialogs/InviteUsers.cpp
index 691035ce..f85adb8f 100644
--- a/src/dialogs/InviteUsers.cpp
+++ b/src/dialogs/InviteUsers.cpp
@@ -1,5 +1,6 @@
#include <QDebug>
#include <QIcon>
+#include <QLabel>
#include <QListWidget>
#include <QListWidgetItem>
#include <QPushButton>
diff --git a/src/dialogs/InviteUsers.h b/src/dialogs/InviteUsers.h
index 952c97a5..684f60b4 100644
--- a/src/dialogs/InviteUsers.h
+++ b/src/dialogs/InviteUsers.h
@@ -1,13 +1,13 @@
#pragma once
#include <QFrame>
-#include <QLabel>
-#include <QListWidgetItem>
#include <QStringList>
class QPushButton;
+class QLabel;
class TextField;
class QListWidget;
+class QListWidgetItem;
namespace dialogs {
diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp
index 0edd1ebf..970d9125 100644
--- a/src/dialogs/ReadReceipts.cpp
+++ b/src/dialogs/ReadReceipts.cpp
@@ -1,5 +1,6 @@
#include <QDebug>
#include <QIcon>
+#include <QLabel>
#include <QListWidgetItem>
#include <QPainter>
#include <QPushButton>
@@ -163,3 +164,10 @@ ReadReceipts::paintEvent(QPaintEvent *)
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
+
+void
+ReadReceipts::hideEvent(QHideEvent *event)
+{
+ userList_->clear();
+ QFrame::hideEvent(event);
+}
diff --git a/src/dialogs/ReadReceipts.h b/src/dialogs/ReadReceipts.h
index e298af0a..2e7a0217 100644
--- a/src/dialogs/ReadReceipts.h
+++ b/src/dialogs/ReadReceipts.h
@@ -2,12 +2,12 @@
#include <QDateTime>
#include <QFrame>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
class Avatar;
+class QLabel;
+class QListWidget;
+class QHBoxLayout;
+class QVBoxLayout;
namespace dialogs {
@@ -47,11 +47,7 @@ public slots:
protected:
void paintEvent(QPaintEvent *event) override;
- void hideEvent(QHideEvent *event) override
- {
- userList_->clear();
- QFrame::hideEvent(event);
- }
+ void hideEvent(QHideEvent *event) override;
private:
QLabel *topLabel_;
diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp
index cc10ac91..26aece32 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -1,5 +1,6 @@
#include <QApplication>
#include <QComboBox>
+#include <QEvent>
#include <QFileDialog>
#include <QFontDatabase>
#include <QImageReader>
@@ -41,6 +42,17 @@ constexpr int WIDGET_SPACING = 15;
constexpr int TEXT_SPACING = 4;
constexpr int BUTTON_SPACING = 2 * TEXT_SPACING;
+bool
+ClickableFilter::eventFilter(QObject *obj, QEvent *event)
+{
+ if (event->type() == QEvent::MouseButtonRelease) {
+ emit clicked();
+ return true;
+ }
+
+ return QObject::eventFilter(obj, event);
+}
+
EditModal::EditModal(const QString &roomId, QWidget *parent)
: QWidget(parent)
, roomId_{roomId}
@@ -94,6 +106,28 @@ EditModal::EditModal(const QString &roomId, QWidget *parent)
}
void
+EditModal::topicEventSent()
+{
+ errorField_->hide();
+ close();
+}
+
+void
+EditModal::nameEventSent(const QString &name)
+{
+ errorField_->hide();
+ emit nameChanged(name);
+ close();
+}
+
+void
+EditModal::error(const QString &msg)
+{
+ errorField_->setText(msg);
+ errorField_->show();
+}
+
+void
EditModal::applyClicked()
{
// Check if the values are changed from the originals.
diff --git a/src/dialogs/RoomSettings.h b/src/dialogs/RoomSettings.h
index e41c866c..e0918afd 100644
--- a/src/dialogs/RoomSettings.h
+++ b/src/dialogs/RoomSettings.h
@@ -1,9 +1,7 @@
#pragma once
-#include <QEvent>
#include <QFrame>
#include <QImage>
-#include <QLabel>
#include <mtx/events/guest_access.hpp>
@@ -21,6 +19,8 @@ class QPixmap;
class TextField;
class TextField;
class Toggle;
+class QLabel;
+class QEvent;
class ClickableFilter : public QObject
{
@@ -35,15 +35,7 @@ signals:
void clicked();
protected:
- bool eventFilter(QObject *obj, QEvent *event) override
- {
- if (event->type() == QEvent::MouseButtonRelease) {
- emit clicked();
- return true;
- }
-
- return QObject::eventFilter(obj, event);
- }
+ bool eventFilter(QObject *obj, QEvent *event) override;
};
/// Convenience class which connects events emmited from threads
@@ -72,24 +64,9 @@ signals:
void nameChanged(const QString &roomName);
private slots:
- void topicEventSent()
- {
- errorField_->hide();
- close();
- }
-
- void nameEventSent(const QString &name)
- {
- errorField_->hide();
- emit nameChanged(name);
- close();
- }
-
- void error(const QString &msg)
- {
- errorField_->setText(msg);
- errorField_->show();
- }
+ void topicEventSent();
+ void nameEventSent(const QString &name);
+ void error(const QString &msg);
void applyClicked();
|
