From: David Hallas Date: Tue, 28 Aug 2018 07:50:41 +0000 (+0200) Subject: Renames DolphinViewContainer::getCaption to caption X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/aaaaea8e28f8ec99605de0af7118c67d5a30c772?hp=-c Renames DolphinViewContainer::getCaption to caption Summary: This commit renames the DolphinViewContainer::getCaption to simply caption, this was a review comment that I failed to fix in a previous commit. Test Plan: None Reviewers: elvisangelaccio Reviewed By: elvisangelaccio Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D15114 --- aaaaea8e28f8ec99605de0af7118c67d5a30c772 diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 23894f346..b603b8cfa 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1001,7 +1001,7 @@ void DolphinMainWindow::tabCountChanged(int count) void DolphinMainWindow::updateWindowTitle() { - setWindowTitle(m_activeViewContainer->getCaption()); + setWindowTitle(m_activeViewContainer->caption()); } void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath) diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index ab2f42c62..edb7247cc 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -359,7 +359,7 @@ QString DolphinTabWidget::tabName(DolphinTabPage* tabPage) const if (!tabPage) { return QString(); } - QString name = tabPage->activeViewContainer()->getCaption(); + QString name = tabPage->activeViewContainer()->caption(); // 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("&&")); diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index fc3090183..f747d442e 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -410,7 +410,7 @@ void DolphinViewContainer::reload() m_messageWidget->hide(); } -QString DolphinViewContainer::getCaption() const +QString DolphinViewContainer::caption() const { if (GeneralSettings::showFullPathInTitlebar()) { if (!url().isLocalFile()) { diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 5d8a34714..409aecfcf 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -141,7 +141,7 @@ public: * calculated depending on settings, if a search is active and other * factors. */ - QString getCaption() const; + QString caption() const; public slots: /**