Rename AdditionalInfoManager to AdditionalInfoAccessor

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2b0fca801d48bcdd0b48643179eef21de268e06..e266fd1ccddd89e26c7e69081f3f679021d55129 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    additionalinfomanager.cpp
+    additionalinfoaccessor.cpp
     dolphindetailsview.cpp
     dolphindetailsviewexpander.cpp
     dolphiniconsview.cpp

diff --git a/src/additionalinfomanager.cpp b/src/additionalinfoaccessor.cpp
similarity index 81%
rename from src/additionalinfomanager.cpp
rename to src/additionalinfoaccessor.cpp
index e27bcd2625320ec1c50afee9768e8b40cc143e50..505da3f4c98b6fe0c2377d0df830da67f7865599 100644 (file)
--- a/src/additionalinfomanager.cpp
+++ b/src/additionalinfoaccessor.cpp
@@ -17,30 +17,30 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "additionalinfomanager.h"
+#include "additionalinfoaccessor.h"
 
 #include "dolphinmodel.h"
 #include <kglobal.h>
 #include <klocale.h>
 
-class AdditionalInfoManagerSingleton
+class AdditionalInfoAccessorSingleton
 {
 public:
-    AdditionalInfoManager instance;
+    AdditionalInfoAccessor instance;
 };
-K_GLOBAL_STATIC(AdditionalInfoManagerSingleton, s_additionalInfoManager)
+K_GLOBAL_STATIC(AdditionalInfoAccessorSingleton, s_additionalInfoManager)
 
-AdditionalInfoManager& AdditionalInfoManager::instance()
+AdditionalInfoAccessor& AdditionalInfoAccessor::instance()
 {
     return s_additionalInfoManager->instance;
 }
 
-KFileItemDelegate::InformationList AdditionalInfoManager::keys() const
+KFileItemDelegate::InformationList AdditionalInfoAccessor::keys() const
 {
     return m_informations;
 }
 
-KFileItemDelegate::Information AdditionalInfoManager::keyForColumn(int columnIndex) const
+KFileItemDelegate::Information AdditionalInfoAccessor::keyForColumn(int columnIndex) const
 {
     KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;
 
@@ -59,26 +59,26 @@ KFileItemDelegate::Information AdditionalInfoManager::keyForColumn(int columnInd
     return info;
 }
 
-QString AdditionalInfoManager::actionCollectionName(KFileItemDelegate::Information info) const
+QString AdditionalInfoAccessor::actionCollectionName(KFileItemDelegate::Information info) const
 {
     return QLatin1String(m_map[info]->actionCollectionName);
 }
 
-QString AdditionalInfoManager::translation(KFileItemDelegate::Information info) const
+QString AdditionalInfoAccessor::translation(KFileItemDelegate::Information info) const
 {
     return i18n(m_map[info]->translation);
 }
 
-int AdditionalInfoManager::bitValue(KFileItemDelegate::Information info) const
+int AdditionalInfoAccessor::bitValue(KFileItemDelegate::Information info) const
 {
     return m_map[info]->bitValue;
 }
 
-AdditionalInfoManager::AdditionalInfoManager() :
+AdditionalInfoAccessor::AdditionalInfoAccessor() :
     m_informations(),
     m_map()
 {
-    static const AdditionalInfoManager::AdditionalInfo additionalInfos[] = {
+    static const AdditionalInfoAccessor::AdditionalInfo additionalInfos[] = {
         { "size",        I18N_NOOP2("@label", "Size"),          1 },
         { "date",        I18N_NOOP2("@label", "Date"),          2 },
         { "permissions", I18N_NOOP2("@label", "Permissions"),   4 },
@@ -101,7 +101,7 @@ AdditionalInfoManager::AdditionalInfoManager() :
     m_informations = m_map.keys();
 }
 
-AdditionalInfoManager::~AdditionalInfoManager()
+AdditionalInfoAccessor::~AdditionalInfoAccessor()
 {
 }
 

diff --git a/src/additionalinfomanager.h b/src/additionalinfoaccessor.h
similarity index 87%
rename from src/additionalinfomanager.h
rename to src/additionalinfoaccessor.h
index 83b62c158c37dda75a497ceb6a3bc4904a8e950d..4e8df46a8856961196b3907f6df3ba986a052906 100644 (file)
--- a/src/additionalinfomanager.h
+++ b/src/additionalinfoaccessor.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef ADDITIONALINFOMANAGER_H
-#define ADDITIONALINFOMANAGER_H
+#ifndef ADDITIONALINFOACCESSOR_H
+#define ADDITIONALINFOACCESSOR_H
 
 #include <libdolphin_export.h>
 #include <kfileitemdelegate.h>
@@ -27,7 +27,7 @@
 #include <QMap>
 
 /**
- * @brief Manages the information that is available by KFileItemDelegate::Information.
+ * @brief Allows to access the information that is available by KFileItemDelegate::Information.
  *
  * The information that is available by KFileItemDelegate::Information will be shown
  * in Dolphin the following way:
@@ -37,15 +37,15 @@
  * - As popup menu entries in the details view header popup
  * - As checkable entries in the View Properties dialog
  *
- * The AdditionalInfoManager provides a central place to get all available keys,
+ * The AdditionalInfoAccessor provides a central place to get all available keys,
  * the corresponding translations, action names, etc., so that modifications or
  * extensions in KFileItemDelegate only require adjustments in the implementation
  * of this class.
  */
-class LIBDOLPHINPRIVATE_EXPORT AdditionalInfoManager
+class LIBDOLPHINPRIVATE_EXPORT AdditionalInfoAccessor
 {
 public:
-    static AdditionalInfoManager& instance();
+    static AdditionalInfoAccessor& instance();
 
     /**
      * @return List of all available information entries of KFileItemDelegate.
@@ -69,9 +69,9 @@ public:
     int bitValue(KFileItemDelegate::Information info) const;
 
 protected:
-    AdditionalInfoManager();
-    virtual ~AdditionalInfoManager();
-    friend class AdditionalInfoManagerSingleton;
+    AdditionalInfoAccessor();
+    virtual ~AdditionalInfoAccessor();
+    friend class AdditionalInfoAccessorSingleton;
 
 private:
     struct AdditionalInfo {

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 130c9e9b37c31bbc7e09ffedc0e63f6091b0254a..ee4d3e42e86a869818b3a40254783926856cc342 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -20,7 +20,7 @@
 
 #include "dolphindetailsview.h"
 
-#include "additionalinfomanager.h"
+#include "additionalinfoaccessor.h"
 #include "dolphinmodel.h"
 #include "dolphinviewcontroller.h"
 #include "dolphinfileitemdelegate.h"
@@ -992,7 +992,7 @@ void DolphinDetailsView::updateDecorationSize(bool showPreview)
 
 KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
 {
-    return AdditionalInfoManager::instance().keyForColumn(columnIndex);
+    return AdditionalInfoAccessor::instance().keyForColumn(columnIndex);
 }
 
 void DolphinDetailsView::resizeColumns()

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 3cfeccfdeecfcdc2c944b49524bb0cadbe73bb06..83f700374835ab745647c42aeaa47076324c32da 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -49,7 +49,7 @@
 #include <ktoggleaction.h>
 #include <kurl.h>
 
-#include "additionalinfomanager.h"
+#include "additionalinfoaccessor.h"
 #include "dolphinmodel.h"
 #include "dolphincolumnviewcontainer.h"
 #include "dolphinviewcontroller.h"
@@ -972,16 +972,16 @@ void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList&
 
 void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
 {
-    const AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
+    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
 
     const KFileItemDelegate::InformationList checkedInfos = m_viewAccessor.itemDelegate()->showInformation();
-    const KFileItemDelegate::InformationList infos = infoManager.keys();
+    const KFileItemDelegate::InformationList infos = infoAccessor.keys();
 
     const bool enable = (m_mode == DolphinView::DetailsView) ||
                         (m_mode == DolphinView::IconsView);
 
     foreach (const KFileItemDelegate::Information& info, infos) {
-        QAction* action = collection->action(infoManager.actionCollectionName(info));
+        QAction* action = collection->action(infoAccessor.actionCollectionName(info));
         Q_ASSERT(action != 0);
         action->setEnabled(enable);
         action->setChecked(checkedInfos.contains(info));

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 62dd4fcfa4f332cba53a877d91300c1d917f9c0d..2f98d842691be0ae8306e7c882bb1bdbd744a95b 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include "additionalinfomanager.h"
+#include "additionalinfoaccessor.h"
 #include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"
@@ -221,13 +221,13 @@ QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
     showInformationMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
     showInformationMenu->setDelayed(false);
 
-    const AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
+    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
 
-    const KFileItemDelegate::InformationList infos = infoManager.keys();
+    const KFileItemDelegate::InformationList infos = infoAccessor.keys();
     foreach (KFileItemDelegate::Information info, infos) {
-        const QString name = infoManager.actionCollectionName(info);
+        const QString name = infoAccessor.actionCollectionName(info);
         KToggleAction* action = m_actionCollection->add<KToggleAction>(name);
-        action->setText(infoManager.translation(info));
+        action->setText(infoAccessor.translation(info));
         action->setData(info);
         action->setActionGroup(additionalInfoGroup);
     }
@@ -247,12 +247,12 @@ QActionGroup* DolphinViewActionHandler::createSortByActionGroup()
     sortByName->setData(QVariant::fromValue(DolphinView::SortByName));
     sortByActionGroup->addAction(sortByName);
 
-    const AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
-    const KFileItemDelegate::InformationList infos = infoManager.keys();
+    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+    const KFileItemDelegate::InformationList infos = infoAccessor.keys();
     foreach (KFileItemDelegate::Information info, infos) {
-        const QString name = infoManager.actionCollectionName(info);
+        const QString name = infoAccessor.actionCollectionName(info);
         KToggleAction* action = m_actionCollection->add<KToggleAction>(name);
-        action->setText(infoManager.translation(info));
+        action->setText(infoAccessor.translation(info));
         // TODO: replace DolphinView::Sorting by KFileItemDelegate::Information!
         action->setData(QVariant::fromValue(DolphinView::SortByName));
         sortByActionGroup->addAction(action);

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index d153e542793461bbfa6c80e1ee5bf1ee02dbe73d..9107828d6cbe1c32984adac41b824b159f953a75 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,7 +20,7 @@
 
 #include "viewproperties.h"
 
-#include "additionalinfomanager.h"
+#include "additionalinfoaccessor.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
@@ -192,11 +192,11 @@ bool ViewProperties::sortFoldersFirst() const
 
 void ViewProperties::setAdditionalInfo(const KFileItemDelegate::InformationList& list)
 {
-    AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
+    AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
 
     int infoMask = 0;
     foreach (KFileItemDelegate::Information currentInfo, list) {
-        infoMask = infoMask | infoManager.bitValue(currentInfo);
+        infoMask = infoMask | infoAccessor.bitValue(currentInfo);
     }
 
     const int encodedInfo = encodedAdditionalInfo(infoMask);
@@ -212,11 +212,11 @@ KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
 
     const int decodedInfo = decodedAdditionalInfo();
 
-    AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
-    const KFileItemDelegate::InformationList infos = infoManager.keys();
+    AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+    const KFileItemDelegate::InformationList infos = infoAccessor.keys();
 
     foreach (const KFileItemDelegate::Information info, infos) {
-        if (decodedInfo & infoManager.bitValue(info)) {
+        if (decodedInfo & infoAccessor.bitValue(info)) {
             usedInfos.append(info);
         }
     }
@@ -304,9 +304,9 @@ int ViewProperties::decodedAdditionalInfo() const
         if (decodedInfo == 0) {
             // A details view without any additional info makes no sense, hence
             // provide at least a size-info and date-info as fallback
-            AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
-            decodedInfo = infoManager.bitValue(KFileItemDelegate::Size) |
-                          infoManager.bitValue(KFileItemDelegate::ModificationTime);
+            AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+            decodedInfo = infoAccessor.bitValue(KFileItemDelegate::Size) |
+                          infoAccessor.bitValue(KFileItemDelegate::ModificationTime);
         }
         break;
     case DolphinView::IconsView: