dolphinview: Fix right click broken on placeholderLabel

[dolphin.git] / src / dolphintabpage.cpp

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index 771bbe9cd6fb98bbd8173bb4346fc0f62fd1bb1a..f6d288e7d1b3de4ba161c6fe170cf92bcb2ddc1e 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -9,12 +9,10 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphinviewcontainer.h"
-#include "global.h"
 
-#include <QVariantAnimation>
 #include <QGridLayout>
-#include <QWidgetAction>
 #include <QStyle>
+#include <QVariantAnimation>
 
 DolphinTabPage::DolphinTabPage(const QUrl &primaryUrl, const QUrl &secondaryUrl, QWidget* parent) :
     QWidget(parent),
@@ -122,7 +120,7 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, Animated animated, const
 
                     // If the primary view is active, we have to swap the pointers
                     // because the secondary view will be the new primary view.
-                    qSwap(m_primaryViewContainer, m_secondaryViewContainer);
+                    std::swap(m_primaryViewContainer, m_secondaryViewContainer);
                     m_primaryViewActive = false;
                 }
             } else {
@@ -134,7 +132,7 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, Animated animated, const
 
                     // If the secondary view is active, we have to swap the pointers
                     // because the secondary view will be the new primary view.
-                    qSwap(m_primaryViewContainer, m_secondaryViewContainer);
+                    std::swap(m_primaryViewContainer, m_secondaryViewContainer);
                     m_primaryViewActive = true;
                 }
             }
@@ -152,6 +150,8 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, Animated animated, const
                 view->setDisabled(true);
                 startExpandViewAnimation(m_primaryViewContainer);
             }
+
+            m_primaryViewContainer->slotSplitTabDisabled();
         }
     }
 }