Fix style-issues in items when not using Oxygen

[dolphin.git] / src / views / additionalinfoaccessor.h

diff --git a/src/views/additionalinfoaccessor.h b/src/views/additionalinfoaccessor.h
index 0a3d51459aa245f02accce45152f0aa4bafcbb94..d6dcc8e3fb746522efc716826a27316028dea597 100644 (file)
--- a/src/views/additionalinfoaccessor.h
+++ b/src/views/additionalinfoaccessor.h
@@ -21,7 +21,7 @@
 #define ADDITIONALINFOACCESSOR_H
 
 #include <libdolphin_export.h>
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <views/dolphinview.h>
 
 #include <QList>
@@ -60,23 +60,21 @@ public:
      *         All entries of this list are keys for accessing the corresponding
      *         data (see actionCollectionName(), translation(), bitValue()).
      */
-    KFileItemDelegate::InformationList keys() const;
+    QList<DolphinView::AdditionalInfo> keys() const;
 
-    /**
-     * @return Key for the model column with the index \p columnIndex.
-     */
-    KFileItemDelegate::Information keyForColumn(int columnIndex) const;
+    QByteArray role(DolphinView::AdditionalInfo info) const;
 
-    QString actionCollectionName(KFileItemDelegate::Information info, ActionCollectionType type) const;
+    QString actionCollectionName(DolphinView::AdditionalInfo info, ActionCollectionType type) const;
 
-    QString translation(KFileItemDelegate::Information info) const;
-
-    DolphinView::Sorting sorting(KFileItemDelegate::Information info) const;
+    QString translation(DolphinView::AdditionalInfo info) const;
 
     /**
-     * @return Bitvalue for \p info that is stored in a ViewProperties instance.
+     * @return String representation of the value that is stored in the .directory
+     *         by ViewProperties.
      */
-    int bitValue(KFileItemDelegate::Information info) const;
+    QString value(DolphinView::AdditionalInfo info) const;
+
+    DolphinView::Sorting sorting(DolphinView::AdditionalInfo info) const;
 
 protected:
     AdditionalInfoAccessor();
@@ -88,12 +86,12 @@ private:
         const char* const actionCollectionName;
         const char* const context;
         const char* const translation;
+        const char* const value;
         const DolphinView::Sorting sorting;
-        const int bitValue;
     };
 
-    KFileItemDelegate::InformationList m_informations;
-    QMap<KFileItemDelegate::Information, const AdditionalInfo*> m_map;
+    QList<DolphinView::AdditionalInfo> m_infoList;
+    QMap<DolphinView::AdditionalInfo, const AdditionalInfo*> m_map;
 };
 
 #endif