Merged very early alpha-version of Dolphin 2.0

[dolphin.git] / src / settings / additionalinfodialog.cpp

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 9a56c2bca06c87acc1558516be2c26bf9a5a3dc9..9b47e928f7b522bd47b10e7f0a3f2054effea0e9 100644 (file)
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,7 +19,7 @@
 
 #include "additionalinfodialog.h"
 
 
 #include "additionalinfodialog.h"
 

-#include <klocale.h>
+#include <KLocale>

 
 #include <QCheckBox>
 #include <QLabel>
 
 #include <QCheckBox>
 #include <QLabel>


@@ -28,7 +28,7 @@
 #include "views/additionalinfoaccessor.h"
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
 #include "views/additionalinfoaccessor.h"
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,

-                                           KFileItemDelegate::InformationList infoList) :
+                                           const QList<DolphinView::AdditionalInfo>& infoList) :

     KDialog(parent),
     m_infoList(infoList),
     m_checkBoxes()
     KDialog(parent),
     m_infoList(infoList),
     m_checkBoxes()


@@ -43,14 +43,14 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
 
     // Add header
     QLabel* header = new QLabel(mainWidget);
 
     // Add header
     QLabel* header = new QLabel(mainWidget);

-    header->setText(i18nc("@label", "Select which additional information should be shown."));
+    header->setText(i18nc("@label", "Select which additional information should be shown:"));

     header->setWordWrap(true);
     layout->addWidget(header);
 
     // Add checkboxes
     const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
     header->setWordWrap(true);
     layout->addWidget(header);
 
     // Add checkboxes
     const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();

-    const KFileItemDelegate::InformationList keys = infoAccessor.keys();
-    foreach (const KFileItemDelegate::Information info, keys) {
+    const QList<DolphinView::AdditionalInfo> keys = infoAccessor.keys();
+    foreach (DolphinView::AdditionalInfo info, keys) {

         QCheckBox* checkBox = new QCheckBox(infoAccessor.translation(info), mainWidget);
         checkBox->setChecked(infoList.contains(info));
         layout->addWidget(checkBox);
         QCheckBox* checkBox = new QCheckBox(infoAccessor.translation(info), mainWidget);
         checkBox->setChecked(infoList.contains(info));
         layout->addWidget(checkBox);


@@ -75,7 +75,7 @@ AdditionalInfoDialog::~AdditionalInfoDialog()
     saveDialogSize(dialogConfig, KConfigBase::Persistent);
 }
 
     saveDialogSize(dialogConfig, KConfigBase::Persistent);
 }
 

-KFileItemDelegate::InformationList AdditionalInfoDialog::informationList() const
+QList<DolphinView::AdditionalInfo> AdditionalInfoDialog::informationList() const

 {
     return m_infoList;
 }
 {
     return m_infoList;
 }


@@ -84,9 +84,9 @@ void AdditionalInfoDialog::slotOk()
 {
     m_infoList.clear();
 
 {
     m_infoList.clear();
 

-    const KFileItemDelegate::InformationList keys = AdditionalInfoAccessor::instance().keys();
+    const QList<DolphinView::AdditionalInfo> keys = AdditionalInfoAccessor::instance().keys();

     int index = 0;
     int index = 0;

-    foreach (const KFileItemDelegate::Information info, keys) {
+    foreach (DolphinView::AdditionalInfo info, keys) {

         if (m_checkBoxes[index]->isChecked()) {
             m_infoList.append(info);
         }
         if (m_checkBoxes[index]->isChecked()) {
             m_infoList.append(info);
         }