Finalised the classes for panels

[situare] / src / ui / panelsidebar.cpp

diff --git a/src/ui/panelsidebar.cpp b/src/ui/panelsidebar.cpp
index b665db6..5635757 100644 (file)
--- a/src/ui/panelsidebar.cpp
+++ b/src/ui/panelsidebar.cpp
@@ -23,26 +23,26 @@
 #include "panelsidebar.h"
 #include "panelcommon.h"
 
-PanelSideBar::PanelSideBar(QWidget *parent, QString side)
+PanelSideBar::PanelSideBar(QWidget *parent, Side side)
     : QWidget(parent)
 {
-    if(side == "left") {
-        this->setObjectName("SidePanelLeft");
-        this->setStyleSheet(QString(
+    if (side == LEFT) {
+        setObjectName("SidePanelLeft");
+        setStyleSheet(QString(
                 "#SidePanelLeft{background-image: url(:/res/images/side_bar_left.png)}"));
-        this->move(QPoint(USERPANEL_OPENED_X, PANEL_TOP_Y));
+        move(QPoint(USERPANEL_OPENED_X, PANEL_TOP_Y));
     }
-    else if(side == "right"){
-        this->setObjectName("SidePanelRight");
-        this->setStyleSheet(QString(
+    else if (side == RIGHT){
+        setObjectName("SidePanelRight");
+        setStyleSheet(QString(
                 "#SidePanelRight{background-image: url(:/res/images/side_bar_right.png)}"));
-        this->move(QPoint(DEFAULT_SCREEN_WIDTH - SIDEBAR_WIDTH + MARGIN_CORRECTION2, PANEL_TOP_Y));
+        move(QPoint(DEFAULT_SCREEN_WIDTH - SIDEBAR_WIDTH + MARGIN_CORRECTION2, PANEL_TOP_Y));
     }
     else {
         qFatal("Illegal PanelSideBar 2nd argument");
     }
-    this->resize(SIDEBAR_WIDTH, SIDEBAR_HEIGHT);
-    this->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+    resize(SIDEBAR_WIDTH, SIDEBAR_HEIGHT);
+    setAttribute(Qt::WA_TransparentForMouseEvents, true);
 }
 
 void PanelSideBar::paintEvent(QPaintEvent *)
@@ -60,7 +60,7 @@ void PanelSideBar::reDrawSidebar(int width, int height)
 {
     Q_UNUSED(height);
     qDebug() << __PRETTY_FUNCTION__;
-    if(this->objectName() == "SidePanelRight") {
-        this->move(width - SIDEBAR_WIDTH + MARGIN_CORRECTION2, PANEL_TOP_Y);
+    if (objectName() == "SidePanelRight") {
+        move(width - SIDEBAR_WIDTH + MARGIN_CORRECTION2, PANEL_TOP_Y);
     }
 }