Use capitalized KDE includes

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

diff --git a/src/views/additionalinfoaccessor.cpp b/src/views/additionalinfoaccessor.cpp
index 1b445cc99eec25309bbc5cda1ea695b2a200abd6..426d7a2c4b6d37e9e975dd7c1f33e3eec3b95d92 100644 (file)
--- a/src/views/additionalinfoaccessor.cpp
+++ b/src/views/additionalinfoaccessor.cpp
@@ -20,8 +20,8 @@
 #include "additionalinfoaccessor.h"
 
 #include "dolphinmodel.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <KGlobal>
+#include <KLocale>
 
 class AdditionalInfoAccessorSingleton
 {
@@ -37,7 +37,7 @@ AdditionalInfoAccessor& AdditionalInfoAccessor::instance()
 
 KFileItemDelegate::InformationList AdditionalInfoAccessor::keys() const
 {
-    return m_informations;
+    return m_information;
 }
 
 KFileItemDelegate::Information AdditionalInfoAccessor::keyForColumn(int columnIndex) const
@@ -81,6 +81,11 @@ QString AdditionalInfoAccessor::translation(KFileItemDelegate::Information info)
     return i18nc(m_map[info]->context, m_map[info]->translation);
 }
 
+QString AdditionalInfoAccessor::value(KFileItemDelegate::Information info) const
+{
+    return m_map[info]->value;
+}
+
 DolphinView::Sorting AdditionalInfoAccessor::sorting(KFileItemDelegate::Information info) const
 {
     return m_map[info]->sorting;
@@ -92,39 +97,41 @@ int AdditionalInfoAccessor::bitValue(KFileItemDelegate::Information info) const
 }
 
 AdditionalInfoAccessor::AdditionalInfoAccessor() :
-    m_informations(),
+    m_information(),
     m_map()
 {
-    static const AdditionalInfoAccessor::AdditionalInfo additionalInfos[] = {
-        { "size",        I18N_NOOP2_NOSTRIP("@label", "Size"),             DolphinView::SortBySize,          1 },
-        { "date",        I18N_NOOP2_NOSTRIP("@label", "Date"),             DolphinView::SortByDate,          2 },
-        { "permissions", I18N_NOOP2_NOSTRIP("@label", "Permissions"),      DolphinView::SortByPermissions,   4 },
-        { "owner",       I18N_NOOP2_NOSTRIP("@label", "Owner"),            DolphinView::SortByOwner,         8 },
-        { "group",       I18N_NOOP2_NOSTRIP("@label", "Group"),            DolphinView::SortByGroup,        16 },
-        { "type",        I18N_NOOP2_NOSTRIP("@label", "Type"),             DolphinView::SortByType,         32 },
-        { "destination", I18N_NOOP2_NOSTRIP("@label", "Link Destination"), DolphinView::SortByDestination,  64 },
-        { "path",        I18N_NOOP2_NOSTRIP("@label", "Path"),             DolphinView::SortByPath,        128 }
+    static const AdditionalInfoAccessor::AdditionalInfo additionalInfo[] = {
+        // Entries for view-properties version 1:
+        { "size",        I18N_NOOP2_NOSTRIP("@label", "Size"),             "Size",            DolphinView::SortBySize,          1 },
+        { "date",        I18N_NOOP2_NOSTRIP("@label", "Date"),             "Date",            DolphinView::SortByDate,          2 },
+        { "permissions", I18N_NOOP2_NOSTRIP("@label", "Permissions"),      "Permissions",     DolphinView::SortByPermissions,   4 },
+        { "owner",       I18N_NOOP2_NOSTRIP("@label", "Owner"),            "Owner",           DolphinView::SortByOwner,         8 },
+        { "group",       I18N_NOOP2_NOSTRIP("@label", "Group"),            "Group",           DolphinView::SortByGroup,        16 },
+        { "type",        I18N_NOOP2_NOSTRIP("@label", "Type"),             "Type",            DolphinView::SortByType,         32 },
+        { "destination", I18N_NOOP2_NOSTRIP("@label", "Link Destination"), "LinkDestination", DolphinView::SortByDestination,  64 },
+        { "path",        I18N_NOOP2_NOSTRIP("@label", "Path"),             "Path",            DolphinView::SortByPath,        128 }
+        // Entries for view-properties version >= 2 (the last column can be set to 0):
     };
 
-    m_map.insert(KFileItemDelegate::Size, &additionalInfos[0]);
-    m_map.insert(KFileItemDelegate::ModificationTime, &additionalInfos[1]);
-    m_map.insert(KFileItemDelegate::Permissions, &additionalInfos[2]);
-    m_map.insert(KFileItemDelegate::Owner, &additionalInfos[3]);
-    m_map.insert(KFileItemDelegate::OwnerAndGroup, &additionalInfos[4]);
-    m_map.insert(KFileItemDelegate::FriendlyMimeType, &additionalInfos[5]);
-    m_map.insert(KFileItemDelegate::LinkDest, &additionalInfos[6]);
-    m_map.insert(KFileItemDelegate::LocalPathOrUrl, &additionalInfos[7]);
-
-    // The m_informations list defines all available keys and the sort order
-    // (don't use m_informations = m_map.keys(), as the order is undefined).
-    m_informations.append(KFileItemDelegate::Size);
-    m_informations.append(KFileItemDelegate::ModificationTime);
-    m_informations.append(KFileItemDelegate::Permissions);
-    m_informations.append(KFileItemDelegate::Owner);
-    m_informations.append(KFileItemDelegate::OwnerAndGroup);
-    m_informations.append(KFileItemDelegate::FriendlyMimeType);
-    m_informations.append(KFileItemDelegate::LinkDest);
-    m_informations.append(KFileItemDelegate::LocalPathOrUrl);
+    m_map.insert(KFileItemDelegate::Size, &additionalInfo[0]);
+    m_map.insert(KFileItemDelegate::ModificationTime, &additionalInfo[1]);
+    m_map.insert(KFileItemDelegate::Permissions, &additionalInfo[2]);
+    m_map.insert(KFileItemDelegate::Owner, &additionalInfo[3]);
+    m_map.insert(KFileItemDelegate::OwnerAndGroup, &additionalInfo[4]);
+    m_map.insert(KFileItemDelegate::FriendlyMimeType, &additionalInfo[5]);
+    m_map.insert(KFileItemDelegate::LinkDest, &additionalInfo[6]);
+    m_map.insert(KFileItemDelegate::LocalPathOrUrl, &additionalInfo[7]);
+
+    // The m_information list defines all available keys and the sort order
+    // (don't use m_information = m_map.keys(), as the order is undefined).
+    m_information.append(KFileItemDelegate::Size);
+    m_information.append(KFileItemDelegate::ModificationTime);
+    m_information.append(KFileItemDelegate::Permissions);
+    m_information.append(KFileItemDelegate::Owner);
+    m_information.append(KFileItemDelegate::OwnerAndGroup);
+    m_information.append(KFileItemDelegate::FriendlyMimeType);
+    m_information.append(KFileItemDelegate::LinkDest);
+    m_information.append(KFileItemDelegate::LocalPathOrUrl);
 }
 
 AdditionalInfoAccessor::~AdditionalInfoAccessor()