Add DolphinTabPage::inactiveViewContainer()

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index c8da707dfe72c0ed0585cb08b1e21c0b8d5aa43b..2979cb568e41d3a43d005ec386e1a241f51e799e 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -164,6 +164,15 @@ DolphinViewContainer *DolphinTabPage::activeViewContainer() const
     return m_primaryViewActive ? m_primaryViewContainer : m_secondaryViewContainer;
 }
 
     return m_primaryViewActive ? m_primaryViewContainer : m_secondaryViewContainer;
 }
 

+DolphinViewContainer *DolphinTabPage::inactiveViewContainer() const
+{
+    if (!splitViewEnabled()) {
+        return nullptr;
+    }
+
+    return primaryViewActive() ? secondaryViewContainer() : primaryViewContainer();
+}
+

 KFileItemList DolphinTabPage::selectedItems() const
 {
     KFileItemList items = m_primaryViewContainer->view()->selectedItems();
 KFileItemList DolphinTabPage::selectedItems() const
 {
     KFileItemList items = m_primaryViewContainer->view()->selectedItems();

diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index 1c8ae094b85b6a6d214f73cefb14f6c0150b968b..4e89d22ee9c44679379c75cf0e0d39b5657785a2 100644 (file)
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -66,6 +66,12 @@ public:
      */
     DolphinViewContainer *activeViewContainer() const;
 
      */
     DolphinViewContainer *activeViewContainer() const;
 

+    /**
+     * @return DolphinViewContainer of the inactive view
+     * if split view is enabled, or nullptr otherwise.
+     */
+    DolphinViewContainer *inactiveViewContainer() const;
+

     /**
      * Returns the selected items. The list is empty if no item has been
      * selected.
     /**
      * Returns the selected items. The list is empty if no item has been
      * selected.

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 9ee80160a695cd819db476328e985eeec3566c0e..d4271847f8afb6659d7cbb5d094eaadf14e75012 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -335,12 +335,7 @@ void DolphinTabWidget::copyToInactiveSplitView()
         return;
     }
 
         return;
     }
 

-    DolphinView *inactiveView;
-    if (tabPage->primaryViewActive()) {
-        inactiveView = tabPage->secondaryViewContainer()->view();
-    } else {
-        inactiveView = tabPage->primaryViewContainer()->view();
-    }
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();

     inactiveView->copySelectedItems(selectedItems, inactiveView->url());
 }
 
     inactiveView->copySelectedItems(selectedItems, inactiveView->url());
 }
 


@@ -356,12 +351,7 @@ void DolphinTabWidget::moveToInactiveSplitView()
         return;
     }
 
         return;
     }
 

-    DolphinView *inactiveView;
-    if (tabPage->primaryViewActive()) {
-        inactiveView = tabPage->secondaryViewContainer()->view();
-    } else {
-        inactiveView = tabPage->primaryViewContainer()->view();
-    }
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();

     inactiveView->moveSelectedItems(selectedItems, inactiveView->url());
 }
 
     inactiveView->moveSelectedItems(selectedItems, inactiveView->url());
 }