Group emoji and dialogs with namespaces

4 files changed, 21 insertions, 13 deletions

diff --git a/src/dialogs/ImageOverlayDialog.cc b/src/dialogs/ImageOverlay.cc

index ad87d144..1e30b3ff 100644
--- a/src/dialogs/ImageOverlayDialog.cc
+++ b/src/dialogs/ImageOverlay.cc
@@ -19,9 +19,11 @@
 #include <QDesktopWidget>
 #include <QPainter>
 
-#include "dialogs/ImageOverlayDialog.h"
+#include "dialogs/ImageOverlay.h"
 
-ImageOverlayDialog::ImageOverlayDialog(QPixmap image, QWidget *parent)
+using namespace dialogs;
+
+ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent)
   : QWidget{parent}
   , originalImage_{image}
 {
@@ -47,7 +49,7 @@ ImageOverlayDialog::ImageOverlayDialog(QPixmap image, QWidget *parent)
 
 // TODO: Move this into Utils
 void
-ImageOverlayDialog::scaleImage(int max_width, int max_height)
+ImageOverlay::scaleImage(int max_width, int max_height)
 {
         if (originalImage_.isNull())
                 return;
@@ -73,7 +75,7 @@ ImageOverlayDialog::scaleImage(int max_width, int max_height)
 }
 
 void
-ImageOverlayDialog::paintEvent(QPaintEvent *event)
+ImageOverlay::paintEvent(QPaintEvent *event)
 {
         Q_UNUSED(event);
 
@@ -117,7 +119,7 @@ ImageOverlayDialog::paintEvent(QPaintEvent *event)
 }
 
 void
-ImageOverlayDialog::mousePressEvent(QMouseEvent *event)
+ImageOverlay::mousePressEvent(QMouseEvent *event)
 {
         if (event->button() != Qt::LeftButton)
                 return;
diff --git a/src/dialogs/JoinRoomDialog.cc b/src/dialogs/JoinRoom.cc

index 2cee7ef6..5b874011 100644
--- a/src/dialogs/JoinRoomDialog.cc
+++ b/src/dialogs/JoinRoom.cc
@@ -5,9 +5,11 @@
 #include "FlatButton.h"
 #include "Theme.h"
 
-#include "dialogs/JoinRoomDialog.h"
+#include "dialogs/JoinRoom.h"
 
-JoinRoomDialog::JoinRoomDialog(QWidget *parent)
+using namespace dialogs;
+
+JoinRoom::JoinRoom(QWidget *parent)
   : QFrame(parent)
 {
         setMaximumSize(400, 400);
diff --git a/src/dialogs/LeaveRoomDialog.cc b/src/dialogs/LeaveRoom.cc

index b0d1679f..6a8447d4 100644
--- a/src/dialogs/LeaveRoomDialog.cc
+++ b/src/dialogs/LeaveRoom.cc
@@ -6,9 +6,11 @@
 #include "FlatButton.h"
 #include "Theme.h"
 
-#include "dialogs/LeaveRoomDialog.h"
+#include "dialogs/LeaveRoom.h"
 
-LeaveRoomDialog::LeaveRoomDialog(QWidget *parent)
+using namespace dialogs;
+
+LeaveRoom::LeaveRoom(QWidget *parent)
   : QFrame(parent)
 {
         setMaximumSize(400, 400);
@@ -45,7 +47,7 @@ LeaveRoomDialog::LeaveRoomDialog(QWidget *parent)
 }
 
 void
-LeaveRoomDialog::paintEvent(QPaintEvent *)
+LeaveRoom::paintEvent(QPaintEvent *)
 {
         QStyleOption opt;
         opt.init(this);
diff --git a/src/dialogs/LogoutDialog.cc b/src/dialogs/Logout.cc

index 73e09745..f4752b0a 100644
--- a/src/dialogs/LogoutDialog.cc
+++ b/src/dialogs/Logout.cc
@@ -24,9 +24,11 @@
 #include "FlatButton.h"
 #include "Theme.h"
 
-#include "dialogs/LogoutDialog.h"
+#include "dialogs/Logout.h"
 
-LogoutDialog::LogoutDialog(QWidget *parent)
+using namespace dialogs;
+
+Logout::Logout(QWidget *parent)
   : QFrame(parent)
 {
         setMaximumSize(400, 400);
@@ -63,7 +65,7 @@ LogoutDialog::LogoutDialog(QWidget *parent)
 }
 
 void
-LogoutDialog::paintEvent(QPaintEvent *)
+Logout::paintEvent(QPaintEvent *)
 {
         QStyleOption opt;
         opt.init(this);