Internal cleanup: Remove some public toggle-slots from DolphinView. Setters- and...

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 0237a1dca37b7036533032e47b3a48cff0ebef67..346c7b691800a3037f7a78cc735c9ae09e81d734 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -699,40 +699,6 @@ void DolphinView::setCategorizedSorting(bool categorized)
     emit categorizedSortingChanged();
 }
 
     emit categorizedSortingChanged();
 }
 

-void DolphinView::toggleSortOrder()
-{
-    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
-                                Qt::DescendingOrder :
-                                Qt::AscendingOrder;
-    setSortOrder(order);
-}
-
-void DolphinView::toggleSortFoldersFirst()
-{
-    setSortFoldersFirst(!sortFoldersFirst());
-}
-
-void DolphinView::toggleAdditionalInfo(QAction* action)
-{
-    const KFileItemDelegate::Information info =
-        static_cast<KFileItemDelegate::Information>(action->data().toInt());
-
-    KFileItemDelegate::InformationList list = additionalInfo();
-
-    const bool show = action->isChecked();
-
-    const int index = list.indexOf(info);
-    const bool containsInfo = (index >= 0);
-    if (show && !containsInfo) {
-        list.append(info);
-        setAdditionalInfo(list);
-    } else if (!show && containsInfo) {
-        list.removeAt(index);
-        setAdditionalInfo(list);
-        Q_ASSERT(list.indexOf(info) < 0);
-    }
-}
-

 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 7416edf587a4f4eb5fc171c2d72c2560235f0a5d..178e0ca6a8fdfe8d86bf8fc93472e60798d0e397 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -411,18 +411,6 @@ public slots:
      */
     void setCategorizedSorting(bool categorized);
 
      */
     void setCategorizedSorting(bool categorized);
 

-    /** Switches between an ascending and descending sorting order. */
-    void toggleSortOrder();
-
-    /** Switches between a separate sorting (with folders first) and a mixed sorting of files and folders. */
-    void toggleSortFoldersFirst();
-
-    /**
-     * Switches on or off the displaying of additional information
-     * as specified by \a action.
-     */
-    void toggleAdditionalInfo(QAction* action);
-

 signals:
     /**
      * Is emitted if the view has been activated by e. g. a mouse click.
 signals:
     /**
      * Is emitted if the view has been activated by e. g. a mouse click.

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 1886ef08b0cc23b59661b7699cf36437eff550e8..9c0d33f9e2fe26fdf94bfa9beb92e5be1066de07 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -358,12 +358,16 @@ void DolphinViewActionHandler::zoomOut()
 
 void DolphinViewActionHandler::toggleSortOrder()
 {
 
 void DolphinViewActionHandler::toggleSortOrder()
 {

-    m_currentView->toggleSortOrder();
+    const Qt::SortOrder order = (m_currentView->sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    m_currentView->setSortOrder(order);

 }
 
 void DolphinViewActionHandler::toggleSortFoldersFirst()
 {
 }
 
 void DolphinViewActionHandler::toggleSortFoldersFirst()
 {

-    m_currentView->toggleSortFoldersFirst();
+    const bool sortFirst = m_currentView->sortFoldersFirst();
+    m_currentView->setSortFoldersFirst(!sortFirst);

 }
 
 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
 }
 
 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)


@@ -381,7 +385,24 @@ void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)
 void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action)
 {
     emit actionBeingHandled();
 void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action)
 {
     emit actionBeingHandled();

-    m_currentView->toggleAdditionalInfo(action);
+
+    const KFileItemDelegate::Information info =
+        static_cast<KFileItemDelegate::Information>(action->data().toInt());
+
+    KFileItemDelegate::InformationList list = m_currentView->additionalInfo();
+
+    const bool show = action->isChecked();
+
+    const int index = list.indexOf(info);
+    const bool containsInfo = (index >= 0);
+    if (show && !containsInfo) {
+        list.append(info);
+        m_currentView->setAdditionalInfo(list);
+    } else if (!show && containsInfo) {
+        list.removeAt(index);
+        m_currentView->setAdditionalInfo(list);
+        Q_ASSERT(list.indexOf(info) < 0);
+    }

 }
 
 void DolphinViewActionHandler::slotAdditionalInfoChanged()
 }
 
 void DolphinViewActionHandler::slotAdditionalInfoChanged()