From: Peter Penz <peter.penz19@gmail.com>
Date: Tue, 21 Sep 2010 19:18:16 +0000 (+0000)
Subject: SVN_SILENT: There is no plural for "information"
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/801e28d7d6783671e8e39f2f6f1aab1180666f58

SVN_SILENT: There is no plural for "information"


svn path=/trunk/KDE/kdebase/apps/; revision=1177951
---

diff --git a/src/views/additionalinfoaccessor.cpp b/src/views/additionalinfoaccessor.cpp
index bcd971516..cafc4fa23 100644
--- a/src/views/additionalinfoaccessor.cpp
+++ b/src/views/additionalinfoaccessor.cpp
@@ -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
@@ -97,10 +97,10 @@ int AdditionalInfoAccessor::bitValue(KFileItemDelegate::Information info) const
 }
 
 AdditionalInfoAccessor::AdditionalInfoAccessor() :
-    m_informations(),
+    m_information(),
     m_map()
 {
-    static const AdditionalInfoAccessor::AdditionalInfo additionalInfos[] = {
+    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 },
@@ -113,25 +113,25 @@ AdditionalInfoAccessor::AdditionalInfoAccessor() :
         // 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()
diff --git a/src/views/additionalinfoaccessor.h b/src/views/additionalinfoaccessor.h
index a1778008c..b3d564088 100644
--- a/src/views/additionalinfoaccessor.h
+++ b/src/views/additionalinfoaccessor.h
@@ -101,7 +101,7 @@ private:
         const int bitValue; // for backward compatibility with version 1 of view-properties
     };
 
-    KFileItemDelegate::InformationList m_informations;
+    KFileItemDelegate::InformationList m_information;
     QMap<KFileItemDelegate::Information, const AdditionalInfo*> m_map;
 };
 
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 483fc0be7..72042179b 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -231,15 +231,15 @@ void ViewProperties::setAdditionalInfo(const KFileItemDelegate::InformationList&
 
 KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
 {
-    KFileItemDelegate::InformationList usedInfos;
+    KFileItemDelegate::InformationList usedInfo;
 
     switch (m_node->version()) {
-    case 1: usedInfos = additionalInfoV1(); break;
-    case 2: usedInfos = additionalInfoV2(); break;
+    case 1: usedInfo = additionalInfoV1(); break;
+    case 2: usedInfo = additionalInfoV2(); break;
     default: kWarning() << "Unknown version of the view properties";
     }
 
-    return usedInfos;
+    return usedInfo;
 }
 
 
@@ -310,7 +310,7 @@ QString ViewProperties::destinationDir(const QString& subDir) const
 
 KFileItemDelegate::InformationList ViewProperties::additionalInfoV1() const
 {
-    KFileItemDelegate::InformationList usedInfos;
+    KFileItemDelegate::InformationList usedInfo;
 
     int decodedInfo = m_node->additionalInfo();
 
@@ -339,11 +339,11 @@ KFileItemDelegate::InformationList ViewProperties::additionalInfoV1() const
 
     foreach (const KFileItemDelegate::Information info, infoKeys) {
         if (decodedInfo & infoAccessor.bitValue(info)) {
-            usedInfos.append(info);
+            usedInfo.append(info);
         }
     }
 
-    return usedInfos;
+    return usedInfo;
 }
 
 KFileItemDelegate::InformationList ViewProperties::additionalInfoV2() const
@@ -356,7 +356,7 @@ KFileItemDelegate::InformationList ViewProperties::additionalInfoV2() const
     // To get the representation as KFileItemDelegate::InformationList, the current
     // view-mode must be checked and the values of this mode added to the list.
 
-    KFileItemDelegate::InformationList usedInfos;
+    KFileItemDelegate::InformationList usedInfo;
 
     // infoHash allows to get the mapped KFileItemDelegate::Information value
     // for a stored string-value in a fast way
@@ -378,11 +378,11 @@ KFileItemDelegate::InformationList ViewProperties::additionalInfoV2() const
         if (infoString.startsWith(prefix)) {
             const QString key = infoString.right(infoString.length() - prefixLength);
             Q_ASSERT(infoHash.contains(key));
-            usedInfos.append(infoHash.value(key));
+            usedInfo.append(infoHash.value(key));
         }
     }
 
-    return usedInfos;
+    return usedInfo;
 }
 
 QString ViewProperties::viewModePrefix() const