- adding missing const

- minor adjustment of name
- use same declaration order as other private methods

CCMAIL: predator106@gmail.com

svn path=/trunk/KDE/kdebase/apps/; revision=994089

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1c310b5b39ffbd2edb99dba08e7fdb99925185e8..8796e6b0f07cc1e8d40c082b7978a5f0e8b995a1 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -237,7 +237,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
         updateGoActions();
         setUrlAsCaption(url);
         if (m_viewTab.count() > 1) {
-            m_tabBar->setTabText(m_tabIndex, squeezeText(tabName(m_activeViewContainer->url())));
+            m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(m_activeViewContainer->url())));
         }
         const QString iconName = KMimeType::iconNameForUrl(url);
         m_tabBar->setTabIcon(m_tabIndex, KIcon(iconName));
@@ -339,11 +339,11 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
     if (m_viewTab.count() == 1) {
         // Only one view is open currently and hence no tab is shown at
         // all. Before creating a tab for 'url', provide a tab for the current URL.
-        m_tabBar->addTab(icon, squeezeText(tabName(m_activeViewContainer->url())));
+        m_tabBar->addTab(icon, squeezedText(tabName(m_activeViewContainer->url())));
         m_tabBar->blockSignals(false);
     }
 
-    m_tabBar->addTab(icon, squeezeText(tabName(url)));
+    m_tabBar->addTab(icon, squeezedText(tabName(url)));
 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
@@ -1434,7 +1434,7 @@ void DolphinMainWindow::rememberClosedTab(int index)
     const QString primaryPath = m_viewTab[index].primaryView->url().path();
     const QString iconName = KMimeType::iconNameForUrl(primaryPath);
 
-    QAction* action = new QAction(squeezeText(primaryPath), tabsMenu);
+    QAction* action = new QAction(squeezedText(primaryPath), tabsMenu);
 
     ClosedTab closedTab;
     closedTab.primaryUrl = m_viewTab[index].primaryView->url();
@@ -1577,11 +1577,10 @@ void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
     setCaption(caption);
 }
 
-QString DolphinMainWindow::squeezeText(const QString& text)
+QString DolphinMainWindow::squeezedText(const QString& text) const
 {
     const QFontMetrics fm = fontMetrics();
-    QString result = fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
-    return result;
+    return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
 }
 
 DolphinMainWindow::UndoUiInterface::UndoUiInterface() :

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 4d724ad2d3c5a352f7db0cf2d22743dd4b1a9db9..9ca28b557a94bddc0be62ddb89fe1712f1c9a4c5 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -441,6 +441,8 @@ private:
      */
     void setUrlAsCaption(const KUrl& url);
 
+    QString squeezedText(const QString& text) const;
+
 private:
     /**
      * Implements a custom error handling for the undo manager. This
@@ -455,8 +457,6 @@ private:
         virtual void jobError(KIO::Job* job);
     };
 
-    QString squeezeText(const QString& text);
-
     KNewMenu* m_newMenu;
     KActionMenu* m_recentTabsMenu;
     KAction* m_showMenuBar;