From 4f0f6e6156adcb10964ea50379d78f0947f10f7e Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 14 May 2010 05:27:47 +0000 Subject: [PATCH] Rename AdditionalInfoManager to AdditionalInfoAccessor svn path=/trunk/KDE/kdebase/apps/; revision=1126483 --- src/CMakeLists.txt | 2 +- ...manager.cpp => additionalinfoaccessor.cpp} | 26 +++++++++---------- ...infomanager.h => additionalinfoaccessor.h} | 18 ++++++------- src/dolphindetailsview.cpp | 4 +-- src/dolphinview.cpp | 8 +++--- src/dolphinviewactionhandler.cpp | 18 ++++++------- src/viewproperties.cpp | 18 ++++++------- 7 files changed, 47 insertions(+), 47 deletions(-) rename src/{additionalinfomanager.cpp => additionalinfoaccessor.cpp} (81%) rename src/{additionalinfomanager.h => additionalinfoaccessor.h} (87%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c2b0fca80..e266fd1cc 100644 --- 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 e27bcd262..505da3f4c 100644 --- 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 #include -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 83b62c158..4e8df46a8 100644 --- 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 #include @@ -27,7 +27,7 @@ #include /** - * @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 130c9e9b3..ee4d3e42e 100644 --- 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 3cfeccfde..83f700374 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -49,7 +49,7 @@ #include #include -#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 62dd4fcfa..2f98d8426 100644 --- 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(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(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 d153e5427..9107828d6 100644 --- 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: -- 2.47.3