svn merge -r764536:HEAD from 4.0 branch: refactor "additional info" actions and provide them in the part

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

1 files changed, 6 insertions, 26 deletions

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index e99add896..444a4a946 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -273,23 +273,11 @@ private slots:
     /** Switches between sorting by categories or not. */
     void toggleSortCategorization();
 
-    /** Switches between showing the size as additional information for the item or not. */
-    void toggleSizeInfo();
-
-    /** Switchtes between showing the date as additional information for the item or not. */
-    void toggleDateInfo();
-
-    /** Switchtes between showing the permissions as additional information for the item or not. */
-    void togglePermissionsInfo();
-
-    /** Switchtes between showing the owner as additional information for the item or not. */
-    void toggleOwnerInfo();
-
-    /** Switchtes between showing the group as additional information for the item or not. */
-    void toggleGroupInfo();
-
-    /** Switches between showing the MIME type as additional information for the item or not. */
-    void toggleMimeInfo();
+    /**
+     * Switches on or off the displaying of additional information
+     * as specified by \a action.
+     */
+    void toggleAdditionalInfo(QAction* action);
 
     /**
      * Switches between one and two views:
@@ -388,7 +376,7 @@ private slots:
     void slotSortOrderChanged(Qt::SortOrder order);
 
     /** Updates the state of the 'Additional Information' actions. */
-    void slotAdditionalInfoChanged(KFileItemDelegate::InformationList info);
+    void slotAdditionalInfoChanged();
 
     /**
      * Updates the state of the 'Edit' menu actions and emits
@@ -453,14 +441,6 @@ private:
      */
     void updateSplitAction();
 
-    /**
-     * Helper method for the slots toggleDateInfo(), toggleSizeInfo()
-     * and toggleMimeInfo(). Applies \a info dependent from the  current
-     * checked state of the action \a actionName to the file item delegate.
-     */
-    void toggleAdditionalInfo(const char* actionName,
-                              KFileItemDelegate::Information info);
-
 private:
     /**
      * DolphinMainWindow supports up to two views beside each other.