Removed a few references to this-pointer and made some small cosmetic changes

[situare] / src / ui / tabbedpanel.cpp

diff --git a/src/ui/tabbedpanel.cpp b/src/ui/tabbedpanel.cpp
index 424496a..0e28947 100644 (file)
--- a/src/ui/tabbedpanel.cpp
+++ b/src/ui/tabbedpanel.cpp
@@ -27,7 +27,7 @@
 #include <QStateMachine>
 
 #include "panelbar.h"
-#include "panelcontent.h"
+#include "panelcontentstack.h"
 #include "paneltabbar.h"
 
 #include "tabbedpanel.h"
@@ -42,8 +42,6 @@ TabbedPanel::TabbedPanel(QWidget *parent)
     move(PANEL_CLOSED_X, PANEL_TOP_PADDING);
 
     // --- TABS ---
-    m_panelWidgetStack = new QStackedWidget(this);
-
     m_panelTabBar = new PanelTabBar(this);
 
     connect(m_panelTabBar, SIGNAL(currentChanged(int)),
@@ -60,9 +58,8 @@ TabbedPanel::TabbedPanel(QWidget *parent)
     m_panelBar->move(PANEL_TAB_WIDTH, 0);
 
     // --- PANEL CONTENT ---
-    m_panelContent = new PanelContent(this);
-    m_panelContent->setContentWidget(m_panelWidgetStack);
-    m_panelContent->move(PANEL_TAB_WIDTH + PANEL_BAR_WIDTH, 0);
+    m_panelContentStack = new PanelContentStack(this);
+    m_panelContentStack->move(PANEL_TAB_WIDTH + PANEL_BAR_WIDTH, 0);
 
     // --- PANEL ANIMATION ---
     m_panelStateMachine = new QStateMachine(this);
@@ -97,7 +94,6 @@ int TabbedPanel::addTab(QWidget *widget, const QIcon& icon)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-
     const int APPEND_INDEX = -1;
 
     return insertTab(APPEND_INDEX, widget, icon);
@@ -107,7 +103,7 @@ void TabbedPanel::closePanel()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if(m_isOpen)
+    if (m_isOpen)
         emit toggleState();
 }
 
@@ -115,7 +111,7 @@ int TabbedPanel::insertTab(int index, QWidget *widget, const QIcon& icon)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    index = m_panelWidgetStack->insertWidget(index, widget);
+    index = m_panelContentStack->insertWidget(index, widget);
     m_panelTabBar->insertTab(index, icon);
 
     return index;
@@ -125,8 +121,8 @@ void TabbedPanel::removeTab(int index)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if(QWidget *widget = m_panelWidgetStack->widget(index)) {
-        m_panelWidgetStack->removeWidget(widget);
+    if (QWidget *widget = m_panelContentStack->widget(index)) {
+        m_panelContentStack->removeWidget(widget);
         m_panelTabBar->removeTab(index);
     }
 }
@@ -145,7 +141,7 @@ void TabbedPanel::resizePanel(const QSize &size)
 
     m_panelBar->resizeBar(size);
 
-    m_panelContent->resizePanelContent(size);
+    m_panelContentStack->resizePanelContentStack(size);
 
     QPoint closedPosition(size.width() - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH, PANEL_TOP_PADDING);
     m_panelStateClosed->assignProperty(this, "pos", closedPosition);
@@ -153,24 +149,23 @@ void TabbedPanel::resizePanel(const QSize &size)
     QPoint openedPosition(size.width() - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH - PANEL_WIDTH,
                           PANEL_TOP_PADDING);
     m_panelStateOpened->assignProperty(this, "pos", openedPosition);
-
 }
 
 void TabbedPanel::showPanel(QWidget *widget)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_panelTabBar->selectTab(m_panelWidgetStack->indexOf(widget));
+    m_panelTabBar->selectTab(m_panelContentStack->indexOf(widget));
 }
 
 void TabbedPanel::setCurrentIndex(int index)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if ((index < m_panelWidgetStack->count()) && (index >= 0)) {
-        m_panelWidgetStack->setCurrentIndex(index);
+    if ((index < m_panelContentStack->count()) && (index >= 0)) {
+        m_panelContentStack->setCurrentIndex(index);
 
-        if(!m_isOpen)
+        if (!m_isOpen)
             emit toggleState();
 
         emit currentChanged(index);
@@ -181,7 +176,7 @@ void TabbedPanel::stateChanged()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if(!m_isOpen) {
+    if (!m_isOpen) {
         m_isOpen = true;
         emit panelOpened();
     } else {