diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h --- a/src/dolphintabwidget.h +++ b/src/dolphintabwidget.h @@ -191,9 +191,10 @@ private: /** - * Returns the name of the tab for the URL \a url. + * @param tabPage The tab page to get the name of + * @return The name of the tab page */ - QString tabName() const; + QString tabName(DolphinTabPage* tabPage) const; private: /** Caches the (negated) places panel visibility */ diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -116,7 +116,7 @@ { const int tabCount = count(); for (int i = 0; i < tabCount; ++i) { - tabBar()->setTabText(i, tabName()); + tabBar()->setTabText(i, tabName(tabPageAt(i))); tabPageAt(i)->refreshViews(); } } @@ -161,7 +161,7 @@ this, &DolphinTabWidget::activeViewChanged); connect(tabPage, &DolphinTabPage::activeViewUrlChanged, this, &DolphinTabWidget::tabUrlChanged); - addTab(tabPage, QIcon::fromTheme(KIO::iconNameForUrl(primaryUrl)), tabName()); + addTab(tabPage, QIcon::fromTheme(KIO::iconNameForUrl(primaryUrl)), tabName(tabPage)); if (focusWidget) { // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened @@ -306,7 +306,7 @@ { const int index = indexOf(qobject_cast(sender())); if (index >= 0) { - tabBar()->setTabText(index, tabName()); + tabBar()->setTabText(index, tabName(tabPageAt(index))); tabBar()->setTabIcon(index, QIcon::fromTheme(KIO::iconNameForUrl(url))); // Emit the currentUrlChanged signal if the url of the current tab has been changed. @@ -354,12 +354,12 @@ emit tabCountChanged(count()); } -QString DolphinTabWidget::tabName() const +QString DolphinTabWidget::tabName(DolphinTabPage* tabPage) const { - if (currentTabPage() == nullptr) { + if (tabPage == nullptr) { return QString(); } - QString name = currentTabPage()->activeViewContainer()->getCaption(); + QString name = tabPage->activeViewContainer()->getCaption(); // 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("&&"));