Fix a bunch of Qt6/Kf6 warnings

[dolphin.git] / src / dolphintabwidget.cpp

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 04653f33c84c72441f44a3caa2075b203c936c58..2ceb3c7c61146876e53bea2913cb939c50c90a75 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -10,34 +10,30 @@
 #include "dolphintabbar.h"
 #include "dolphinviewcontainer.h"
 
 #include "dolphintabbar.h"
 #include "dolphinviewcontainer.h"
 

+#include <KAcceleratorManager>

 #include <KConfigGroup>
 #include <KConfigGroup>

+#include <KIO/CommandLauncherJob>
+#include <KLocalizedString>

 #include <KShell>
 #include <kio/global.h>
 #include <KShell>
 #include <kio/global.h>

-#include <KIO/CommandLauncherJob>
-#include <KAcceleratorManager>

 
 #include <QApplication>
 #include <QDropEvent>
 
 
 #include <QApplication>
 #include <QDropEvent>
 

-DolphinTabWidget::DolphinTabWidget(DolphinNavigatorsWidgetAction *navigatorsWidget, QWidget* parent) :
-    QTabWidget(parent),
-    m_lastViewedTab(nullptr),
-    m_navigatorsWidget{navigatorsWidget}
+DolphinTabWidget::DolphinTabWidget(DolphinNavigatorsWidgetAction *navigatorsWidget, QWidget *parent)
+    : QTabWidget(parent)
+    , m_lastViewedTab(nullptr)
+    , m_navigatorsWidget{navigatorsWidget}

 {
     KAcceleratorManager::setNoAccel(this);
 
 {
     KAcceleratorManager::setNoAccel(this);
 

-    connect(this, &DolphinTabWidget::tabCloseRequested,
-            this, QOverload<int>::of(&DolphinTabWidget::closeTab));
-    connect(this, &DolphinTabWidget::currentChanged,
-            this, &DolphinTabWidget::currentTabChanged);
-
-    DolphinTabBar* tabBar = new DolphinTabBar(this);
-    connect(tabBar, &DolphinTabBar::openNewActivatedTab,
-            this, QOverload<int>::of(&DolphinTabWidget::openNewActivatedTab));
-    connect(tabBar, &DolphinTabBar::tabDropEvent,
-            this, &DolphinTabWidget::tabDropEvent);
-    connect(tabBar, &DolphinTabBar::tabDetachRequested,
-            this, &DolphinTabWidget::detachTab);
+    connect(this, &DolphinTabWidget::tabCloseRequested, this, QOverload<int>::of(&DolphinTabWidget::closeTab));
+    connect(this, &DolphinTabWidget::currentChanged, this, &DolphinTabWidget::currentTabChanged);
+
+    DolphinTabBar *tabBar = new DolphinTabBar(this);
+    connect(tabBar, &DolphinTabBar::openNewActivatedTab, this, QOverload<int>::of(&DolphinTabWidget::openNewActivatedTab));
+    connect(tabBar, &DolphinTabBar::tabDropEvent, this, &DolphinTabWidget::tabDropEvent);
+    connect(tabBar, &DolphinTabBar::tabDetachRequested, this, &DolphinTabWidget::detachTab);

     tabBar->hide();
 
     setTabBar(tabBar);
     tabBar->hide();
 
     setTabBar(tabBar);


@@ -46,41 +42,41 @@ DolphinTabWidget::DolphinTabWidget(DolphinNavigatorsWidgetAction *navigatorsWidg
     setUsesScrollButtons(true);
 }
 
     setUsesScrollButtons(true);
 }
 

-DolphinTabPage* DolphinTabWidget::currentTabPage() const
+DolphinTabPage *DolphinTabWidget::currentTabPage() const

 {
     return tabPageAt(currentIndex());
 }
 
 {
     return tabPageAt(currentIndex());
 }
 

-DolphinTabPage* DolphinTabWidget::nextTabPage() const
+DolphinTabPage *DolphinTabWidget::nextTabPage() const

 {
     const int index = currentIndex() + 1;
     return tabPageAt(index < count() ? index : 0);
 }
 
 {
     const int index = currentIndex() + 1;
     return tabPageAt(index < count() ? index : 0);
 }
 

-DolphinTabPage* DolphinTabWidget::prevTabPage() const
+DolphinTabPage *DolphinTabWidget::prevTabPage() const

 {
     const int index = currentIndex() - 1;
     return tabPageAt(index >= 0 ? index : (count() - 1));
 }
 
 {
     const int index = currentIndex() - 1;
     return tabPageAt(index >= 0 ? index : (count() - 1));
 }
 

-DolphinTabPage* DolphinTabWidget::tabPageAt(const int index) const
+DolphinTabPage *DolphinTabWidget::tabPageAt(const int index) const

 {
 {

-    return static_cast<DolphinTabPage*>(widget(index));
+    return static_cast<DolphinTabPage *>(widget(index));

 }
 
 }
 

-void DolphinTabWidget::saveProperties(KConfigGroup& group) const
+void DolphinTabWidget::saveProperties(KConfigGroup &group) const

 {
     const int tabCount = count();
     group.writeEntry("Tab Count", tabCount);
     group.writeEntry("Active Tab Index", currentIndex());
 
     for (int i = 0; i < tabCount; ++i) {
 {
     const int tabCount = count();
     group.writeEntry("Tab Count", tabCount);
     group.writeEntry("Active Tab Index", currentIndex());
 
     for (int i = 0; i < tabCount; ++i) {

-        const DolphinTabPage* tabPage = tabPageAt(i);
+        const DolphinTabPage *tabPage = tabPageAt(i);

         group.writeEntry("Tab Data " % QString::number(i), tabPage->saveState());
     }
 }
 
         group.writeEntry("Tab Data " % QString::number(i), tabPage->saveState());
     }
 }
 

-void DolphinTabWidget::readProperties(const KConfigGroup& group)
+void DolphinTabWidget::readProperties(const KConfigGroup &group)

 {
     const int tabCount = group.readEntry("Tab Count", 0);
     for (int i = 0; i < tabCount; ++i) {
 {
     const int tabCount = group.readEntry("Tab Count", 0);
     for (int i = 0; i < tabCount; ++i) {


@@ -131,12 +127,12 @@ void DolphinTabWidget::openNewActivatedTab()
         oldNavigatorState = m_navigatorsWidget->secondaryUrlNavigator()->visualState();
     }
 
         oldNavigatorState = m_navigatorsWidget->secondaryUrlNavigator()->visualState();
     }
 

-    const DolphinViewContainer* oldActiveViewContainer = currentTabPage()->activeViewContainer();
+    const DolphinViewContainer *oldActiveViewContainer = currentTabPage()->activeViewContainer();

     Q_ASSERT(oldActiveViewContainer);
 
     openNewActivatedTab(oldActiveViewContainer->url());
 
     Q_ASSERT(oldActiveViewContainer);
 
     openNewActivatedTab(oldActiveViewContainer->url());
 

-    DolphinViewContainer* newActiveViewContainer = currentTabPage()->activeViewContainer();
+    DolphinViewContainer *newActiveViewContainer = currentTabPage()->activeViewContainer();

     Q_ASSERT(newActiveViewContainer);
 
     // The URL navigator of the new tab should have the same editable state
     Q_ASSERT(newActiveViewContainer);
 
     // The URL navigator of the new tab should have the same editable state


@@ -147,7 +143,7 @@ void DolphinTabWidget::openNewActivatedTab()
     newActiveViewContainer->view()->setFocus();
 }
 
     newActiveViewContainer->view()->setFocus();
 }
 

-void DolphinTabWidget::openNewActivatedTab(const QUrl& primaryUrl, const QUrl& secondaryUrl)
+void DolphinTabWidget::openNewActivatedTab(const QUrl &primaryUrl, const QUrl &secondaryUrl)

 {
     openNewTab(primaryUrl, secondaryUrl);
     if (GeneralSettings::openNewTabAfterLastTab()) {
 {
     openNewTab(primaryUrl, secondaryUrl);
     if (GeneralSettings::openNewTabAfterLastTab()) {


@@ -157,16 +153,14 @@ void DolphinTabWidget::openNewActivatedTab(const QUrl& primaryUrl, const QUrl& s
     }
 }
 
     }
 }
 

-void DolphinTabWidget::openNewTab(const QUrl& primaryUrl, const QUrl& secondaryUrl, DolphinTabWidget::NewTabPosition position)
+void DolphinTabWidget::openNewTab(const QUrl &primaryUrl, const QUrl &secondaryUrl, DolphinTabWidget::NewTabPosition position)

 {
 {

-    QWidget* focusWidget = QApplication::focusWidget();
+    QWidget *focusWidget = QApplication::focusWidget();

 
 

-    DolphinTabPage* tabPage = new DolphinTabPage(primaryUrl, secondaryUrl, this);
+    DolphinTabPage *tabPage = new DolphinTabPage(primaryUrl, secondaryUrl, this);

     tabPage->setActive(false);
     tabPage->setActive(false);

-    connect(tabPage, &DolphinTabPage::activeViewChanged,
-            this, &DolphinTabWidget::activeViewChanged);
-    connect(tabPage, &DolphinTabPage::activeViewUrlChanged,
-            this, &DolphinTabWidget::tabUrlChanged);
+    connect(tabPage, &DolphinTabPage::activeViewChanged, this, &DolphinTabWidget::activeViewChanged);
+    connect(tabPage, &DolphinTabPage::activeViewUrlChanged, this, &DolphinTabWidget::tabUrlChanged);

     connect(tabPage->activeViewContainer(), &DolphinViewContainer::captionChanged, this, [this, tabPage]() {
         const int tabIndex = indexOf(tabPage);
         Q_ASSERT(tabIndex >= 0);
     connect(tabPage->activeViewContainer(), &DolphinViewContainer::captionChanged, this, [this, tabPage]() {
         const int tabIndex = indexOf(tabPage);
         Q_ASSERT(tabIndex >= 0);


@@ -195,7 +189,7 @@ void DolphinTabWidget::openNewTab(const QUrl& primaryUrl, const QUrl& secondaryU
     }
 }
 
     }
 }
 

-void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+void DolphinTabWidget::openDirectories(const QList<QUrl> &dirs, bool splitView)

 {
     Q_ASSERT(dirs.size() > 0);
 
 {
     Q_ASSERT(dirs.size() > 0);
 


@@ -203,16 +197,16 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
 
     QList<QUrl>::const_iterator it = dirs.constBegin();
     while (it != dirs.constEnd()) {
 
     QList<QUrl>::const_iterator it = dirs.constBegin();
     while (it != dirs.constEnd()) {

-        const QUrl& primaryUrl = *(it++);
-        const std::optional<ViewIndex> alreadyOpenDirectory = viewOpenAtDirectory(primaryUrl);
+        const QUrl &primaryUrl = *(it++);
+        const std::optional<ViewIndex> viewIndexAtDirectory = viewOpenAtDirectory(primaryUrl);

 
         // When the user asks for a URL that's already open,
         // activate it instead of opening a new tab
 
         // When the user asks for a URL that's already open,
         // activate it instead of opening a new tab

-        if (alreadyOpenDirectory.has_value()) {
+        if (viewIndexAtDirectory.has_value()) {

             somethingWasAlreadyOpen = true;
             somethingWasAlreadyOpen = true;

-            activateViewContainerAt(alreadyOpenDirectory.value());
+            activateViewContainerAt(viewIndexAtDirectory.value());

         } else if (splitView && (it != dirs.constEnd())) {
         } else if (splitView && (it != dirs.constEnd())) {

-            const QUrl& secondaryUrl = *(it++);
+            const QUrl &secondaryUrl = *(it++);

             if (somethingWasAlreadyOpen) {
                 openNewTab(primaryUrl, secondaryUrl);
             } else {
             if (somethingWasAlreadyOpen) {
                 openNewTab(primaryUrl, secondaryUrl);
             } else {


@@ -228,14 +222,14 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
     }
 }
 
     }
 }
 

-void DolphinTabWidget::openFiles(const QList<QUrl>& files, bool splitView)
+void DolphinTabWidget::openFiles(const QList<QUrl> &files, bool splitView)

 {
     Q_ASSERT(files.size() > 0);
 
     // Get all distinct directories from 'files'.
     QList<QUrl> dirsThatNeedToBeOpened;
     QList<QUrl> dirsThatWereAlreadyOpen;
 {
     Q_ASSERT(files.size() > 0);
 
     // Get all distinct directories from 'files'.
     QList<QUrl> dirsThatNeedToBeOpened;
     QList<QUrl> dirsThatWereAlreadyOpen;

-    for (const QUrl& file : files) {
+    for (const QUrl &file : files) {

         const QUrl dir(file.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash));
         if (dirsThatNeedToBeOpened.contains(dir) || dirsThatWereAlreadyOpen.contains(dir)) {
             continue;
         const QUrl dir(file.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash));
         if (dirsThatNeedToBeOpened.contains(dir) || dirsThatWereAlreadyOpen.contains(dir)) {
             continue;


@@ -266,7 +260,7 @@ void DolphinTabWidget::openFiles(const QList<QUrl>& files, bool splitView)
     // tabs, there is no need to split 'files' accordingly, as
     // the DolphinView will just ignore invalid selections.
     for (int i = 0; i < tabCount; ++i) {
     // tabs, there is no need to split 'files' accordingly, as
     // the DolphinView will just ignore invalid selections.
     for (int i = 0; i < tabCount; ++i) {

-        DolphinTabPage* tabPage = tabPageAt(i);
+        DolphinTabPage *tabPage = tabPageAt(i);

         tabPage->markUrlsAsSelected(files);
         tabPage->markUrlAsCurrent(files.first());
         if (i < oldTabCount) {
         tabPage->markUrlsAsSelected(files);
         tabPage->markUrlAsCurrent(files.first());
         if (i < oldTabCount) {


@@ -292,7 +286,7 @@ void DolphinTabWidget::closeTab(const int index)
         return;
     }
 
         return;
     }
 

-    DolphinTabPage* tabPage = tabPageAt(index);
+    DolphinTabPage *tabPage = tabPageAt(index);

     Q_EMIT rememberClosedTab(tabPage->activeViewContainer()->url(), tabPage->saveState());
 
     removeTab(index);
     Q_EMIT rememberClosedTab(tabPage->activeViewContainer()->url(), tabPage->saveState());
 
     removeTab(index);


@@ -323,7 +317,7 @@ void DolphinTabWidget::activatePrevTab()
     setCurrentIndex(index >= 0 ? index : (count() - 1));
 }
 
     setCurrentIndex(index >= 0 ? index : (count() - 1));
 }
 

-void DolphinTabWidget::restoreClosedTab(const QByteArray& state)
+void DolphinTabWidget::restoreClosedTab(const QByteArray &state)

 {
     openNewActivatedTab();
     currentTabPage()->restoreState(state);
 {
     openNewActivatedTab();
     currentTabPage()->restoreState(state);


@@ -331,36 +325,34 @@ void DolphinTabWidget::restoreClosedTab(const QByteArray& state)
 
 void DolphinTabWidget::copyToInactiveSplitView()
 {
 
 void DolphinTabWidget::copyToInactiveSplitView()
 {

-    const DolphinTabPage* tabPage = tabPageAt(currentIndex());
-    DolphinViewContainer* activeViewContainer = currentTabPage()->activeViewContainer();
-    if (!tabPage->splitViewEnabled() || activeViewContainer->view()->selectedItems().isEmpty()) {
+    const DolphinTabPage *tabPage = currentTabPage();
+    if (!tabPage->splitViewEnabled()) {

         return;
     }
 
         return;
     }
 

-    if (tabPage->primaryViewActive()) {
-        // copy from left panel to right
-        activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
-    } else {
-        // copy from right panel to left
-        activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
+    const KFileItemList selectedItems = tabPage->activeViewContainer()->view()->selectedItems();
+    if (selectedItems.isEmpty()) {
+        return;

     }
     }

+
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
+    inactiveView->copySelectedItems(selectedItems, inactiveView->url());

 }
 
 void DolphinTabWidget::moveToInactiveSplitView()
 {
 }
 
 void DolphinTabWidget::moveToInactiveSplitView()
 {

-    const DolphinTabPage* tabPage = tabPageAt(currentIndex());
-    DolphinViewContainer* activeViewContainer = currentTabPage()->activeViewContainer();
-    if (!tabPage->splitViewEnabled() || activeViewContainer->view()->selectedItems().isEmpty()) {
+    const DolphinTabPage *tabPage = currentTabPage();
+    if (!tabPage->splitViewEnabled()) {

         return;
     }
 
         return;
     }
 

-    if (tabPage->primaryViewActive()) {
-        // move from left panel to right
-        activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
-    } else {
-        // move from right panel to left
-        activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
+    const KFileItemList selectedItems = tabPage->activeViewContainer()->view()->selectedItems();
+    if (selectedItems.isEmpty()) {
+        return;

     }
     }

+
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
+    inactiveView->moveSelectedItems(selectedItems, inactiveView->url());

 }
 
 void DolphinTabWidget::detachTab(int index)
 }
 
 void DolphinTabWidget::detachTab(int index)


@@ -369,7 +361,7 @@ void DolphinTabWidget::detachTab(int index)
 
     QStringList args;
 
 
     QStringList args;
 

-    const DolphinTabPage* tabPage = tabPageAt(index);
+    const DolphinTabPage *tabPage = tabPageAt(index);

     args << tabPage->primaryViewContainer()->url().url();
     if (tabPage->splitViewEnabled()) {
         args << tabPage->secondaryViewContainer()->url().url();
     args << tabPage->primaryViewContainer()->url().url();
     if (tabPage->splitViewEnabled()) {
         args << tabPage->secondaryViewContainer()->url().url();


@@ -387,20 +379,20 @@ void DolphinTabWidget::detachTab(int index)
 void DolphinTabWidget::openNewActivatedTab(int index)
 {
     Q_ASSERT(index >= 0);
 void DolphinTabWidget::openNewActivatedTab(int index)
 {
     Q_ASSERT(index >= 0);

-    const DolphinTabPage* tabPage = tabPageAt(index);
+    const DolphinTabPage *tabPage = tabPageAt(index);

     openNewActivatedTab(tabPage->activeViewContainer()->url());
 }
 
     openNewActivatedTab(tabPage->activeViewContainer()->url());
 }
 

-void DolphinTabWidget::tabDropEvent(int index, QDropEvent* event)
+void DolphinTabWidget::tabDropEvent(int index, QDropEvent *event)

 {
     if (index >= 0) {
 {
     if (index >= 0) {

-        DolphinView* view = tabPageAt(index)->activeViewContainer()->view();
+        DolphinView *view = tabPageAt(index)->activeViewContainer()->view();

         view->dropUrls(view->url(), event, view);
     } else {
         const auto urls = event->mimeData()->urls();
 
         for (const QUrl &url : urls) {
         view->dropUrls(view->url(), event, view);
     } else {
         const auto urls = event->mimeData()->urls();
 
         for (const QUrl &url : urls) {

-            auto *job = KIO::statDetails(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo);
+            auto *job = KIO::stat(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo);

             connect(job, &KJob::result, this, [this, job]() {
                 if (!job->error() && job->statResult().isDir()) {
                     openNewTab(job->url(), QUrl(), NewTabPosition::AtEnd);
             connect(job, &KJob::result, this, [this, job]() {
                 if (!job->error() && job->statResult().isDir()) {
                     openNewTab(job->url(), QUrl(), NewTabPosition::AtEnd);


@@ -410,9 +402,9 @@ void DolphinTabWidget::tabDropEvent(int index, QDropEvent* event)
     }
 }
 
     }
 }
 

-void DolphinTabWidget::tabUrlChanged(const QUrl& url)
+void DolphinTabWidget::tabUrlChanged(const QUrl &url)

 {
 {

-    const int index = indexOf(qobject_cast<QWidget*>(sender()));
+    const int index = indexOf(qobject_cast<QWidget *>(sender()));

     if (index >= 0) {
         tabBar()->setTabText(index, tabName(tabPageAt(index)));
         tabBar()->setTabToolTip(index, url.toDisplayString(QUrl::PreferLocalFile));
     if (index >= 0) {
         tabBar()->setTabText(index, tabName(tabPageAt(index)));
         tabBar()->setTabToolTip(index, url.toDisplayString(QUrl::PreferLocalFile));


@@ -445,7 +437,7 @@ void DolphinTabWidget::currentTabChanged(int index)
     if (tabPage->splitViewEnabled() && !m_navigatorsWidget->secondaryUrlNavigator()) {
         m_navigatorsWidget->createSecondaryUrlNavigator();
     }
     if (tabPage->splitViewEnabled() && !m_navigatorsWidget->secondaryUrlNavigator()) {
         m_navigatorsWidget->createSecondaryUrlNavigator();
     }

-    DolphinViewContainer* viewContainer = tabPage->activeViewContainer();
+    DolphinViewContainer *viewContainer = tabPage->activeViewContainer();

     Q_EMIT activeViewChanged(viewContainer);
     Q_EMIT currentUrlChanged(viewContainer->url());
     tabPage->setActive(true);
     Q_EMIT activeViewChanged(viewContainer);
     Q_EMIT currentUrlChanged(viewContainer->url());
     tabPage->setActive(true);


@@ -491,12 +483,28 @@ void DolphinTabWidget::tabRemoved(int index)
     Q_EMIT tabCountChanged(count());
 }
 
     Q_EMIT tabCountChanged(count());
 }
 

-QString DolphinTabWidget::tabName(DolphinTabPage* tabPage) const
+QString DolphinTabWidget::tabName(DolphinTabPage *tabPage) const

 {
     if (!tabPage) {
         return QString();
     }
 {
     if (!tabPage) {
         return QString();
     }

-    QString name = tabPage->activeViewContainer()->caption();
+    // clang-format off
+    QString name;
+    if (tabPage->splitViewEnabled()) {
+        if (tabPage->primaryViewActive()) {
+            // i18n: %1 is the primary view and %2 the secondary view. For left to right languages the primary view is on the left so we also want it to be on the
+            // left in the tab name. In right to left languages the primary view would be on the right so the tab name should match.
+            name = i18nc("@title:tab Active primary view | (Inactive secondary view)", "%1 | (%2)", tabPage->primaryViewContainer()->caption(), tabPage->secondaryViewContainer()->caption());
+        } else {
+            // i18n: %1 is the primary view and %2 the secondary view. For left to right languages the primary view is on the left so we also want it to be on the
+            // left in the tab name. In right to left languages the primary view would be on the right so the tab name should match.
+            name = i18nc("@title:tab (Inactive primary view) | Active secondary view", "(%1) | %2", tabPage->primaryViewContainer()->caption(), tabPage->secondaryViewContainer()->caption());
+        }
+    } else {
+        name = tabPage->activeViewContainer()->caption();
+    }
+    // clang-format on
+

     // Make sure that a '&' inside the directory name is displayed correctly
     // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
     return name.replace('&', QLatin1String("&&"));
     // Make sure that a '&' inside the directory name is displayed correctly
     // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
     return name.replace('&', QLatin1String("&&"));


@@ -522,7 +530,7 @@ DolphinViewContainer *DolphinTabWidget::activateViewContainerAt(DolphinTabWidget
     return viewContainer;
 }
 
     return viewContainer;
 }
 

-const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewOpenAtDirectory(const QUrl& directory) const
+const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewOpenAtDirectory(const QUrl &directory) const

 {
     int i = currentIndex();
     if (i < 0) {
 {
     int i = currentIndex();
     if (i < 0) {


@@ -540,13 +548,12 @@ const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewOpe
         }
 
         i = (i + 1) % count();
         }
 
         i = (i + 1) % count();

-    }
-    while (i != currentIndex());
+    } while (i != currentIndex());

 
     return std::nullopt;
 }
 
 
     return std::nullopt;
 }
 

-const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewShowingItem(const QUrl& item) const
+const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewShowingItem(const QUrl &item) const

 {
     // The item might not be loaded yet even though it exists. So instead
     // we check if the folder containing the item is showing its contents.
 {
     // The item might not be loaded yet even though it exists. So instead
     // we check if the folder containing the item is showing its contents.


@@ -584,8 +591,7 @@ const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewSho
         }
 
         i = (i + 1) % count();
         }
 
         i = (i + 1) % count();

-    }
-    while (i != currentIndex());
+    } while (i != currentIndex());

 
     return std::nullopt;
 }
 
     return std::nullopt;
 }