take care for const-correctness

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

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f70c5bb4565d93b1e27232c249557675c97fbfbb..81562d282304488cb29f2dabe6c264e145c7e26d 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -260,11 +260,6 @@ void DolphinViewContainer::renameSelectedItems()
     }
 }
 
-DolphinStatusBar* DolphinViewContainer::statusBar() const
-{
-    return m_statusBar;
-}
-
 bool DolphinViewContainer::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();
@@ -281,11 +276,6 @@ KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const
     return m_dirModel->itemForIndex(dirModelIndex);
 }
 
-DolphinMainWindow* DolphinViewContainer::mainWindow() const
-{
-    return m_mainWindow;
-}
-
 void DolphinViewContainer::updateProgress(int percent)
 {
     if (!m_showProgress) {

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 6f849d57540e63c4bc744a5f90dc36c2cb6f3cbd..a9676ca96f91e1bf2c71bc639aef10aa720031c4 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -101,7 +101,8 @@ public:
 
     KFileItem* fileItem(const QModelIndex index) const;
 
-    DolphinStatusBar* statusBar() const;
+    inline const DolphinStatusBar* statusBar() const;
+    inline DolphinStatusBar* statusBar();
 
     /**
      * Returns true, if the URL shown by the navigation bar is editable.
@@ -109,9 +110,11 @@ public:
      */
     bool isUrlEditable() const;
 
-    inline KUrlNavigator* urlNavigator() const;
+    inline const KUrlNavigator* urlNavigator() const;
+    inline KUrlNavigator* urlNavigator();
 
-    inline DolphinView* view() const;
+    inline const DolphinView* view() const;
+    inline DolphinView* view();
 
     /** Returns true, if the filter bar is visible. */
     bool isFilterBarVisible() const;
@@ -120,7 +123,7 @@ public:
      * Return the DolphinMainWindow this View belongs to. It is guaranteed
      * that we have one.
      */
-    DolphinMainWindow* mainWindow() const ;
+    inline const DolphinMainWindow* mainWindow() const;
 
 public slots:
     /**
@@ -230,14 +233,38 @@ private:
     DolphinSortFilterProxyModel* m_proxyModel;
 };
 
-KUrlNavigator* DolphinViewContainer::urlNavigator() const
+const DolphinStatusBar* DolphinViewContainer::statusBar() const
+{
+    return m_statusBar;
+}
+
+DolphinStatusBar* DolphinViewContainer::statusBar()
+{
+    return m_statusBar;
+}
+
+const KUrlNavigator* DolphinViewContainer::urlNavigator() const
+{
+    return m_urlNavigator;
+}
+
+KUrlNavigator* DolphinViewContainer::urlNavigator()
 {
     return m_urlNavigator;
 }
 
-DolphinView* DolphinViewContainer::view() const
+const DolphinView* DolphinViewContainer::view() const
+{
+    return m_view;
+}
+
+DolphinView* DolphinViewContainer::view()
 {
     return m_view;
 }
 
+const DolphinMainWindow* DolphinViewContainer::mainWindow() const
+{
+    return m_mainWindow;
+}
 #endif // DOLPHINVIEWCONTAINER_H