kdelibs4support--

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 4576318bbd0bb870d4b81035206ef7636429b75d..41812aaa9071614a1db7db112abde6d796c9bb38 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -31,7 +31,8 @@
 DolphinApplication::DolphinApplication() :
     m_mainWindow(0)
 {
 DolphinApplication::DolphinApplication() :
     m_mainWindow(0)
 {

-    KGlobal::locale()->insertCatalog("libkonq"); // Needed for applications using libkonq
+    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
+//KLocale::global()->insertCatalog("libkonq"); // Needed for applications using libkonq

 
     m_mainWindow = new DolphinMainWindow();
     m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);
 
     m_mainWindow = new DolphinMainWindow();
     m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index d8f101454b82bd5a93cbfe4da6213d95f6c23d41..ccfd290e007ab879f407ba4181ee388e68fc36ea 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -397,7 +397,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
 
     // Insert 'Move to Trash' and/or 'Delete'
     if (properties.supportsDeleting()) {
 
     // Insert 'Move to Trash' and/or 'Delete'
     if (properties.supportsDeleting()) {

-        const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) ||
+        const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||

                                        !properties.isLocal());
         const bool showMoveToTrashAction = (properties.isLocal() &&
                                             properties.supportsMoving());
                                        !properties.isLocal());
         const bool showMoveToTrashAction = (properties.isLocal() &&
                                             properties.supportsMoving());

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 8668601b6714af49c1b4a8d194508d98840ec6f0..ac1cdff2e260e0c4e0fb9991fd2627af788efb46 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -417,7 +417,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
     }
 
     GeneralSettings::setVersion(CurrentDolphinVersion);
     }
 
     GeneralSettings::setVersion(CurrentDolphinVersion);

-    GeneralSettings::self()->writeConfig();
+    GeneralSettings::self()->save();

 
     KXmlGuiWindow::closeEvent(event);
 }
 
     KXmlGuiWindow::closeEvent(event);
 }

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0d28f3f1ad2a462b39919b06eab33807720272c4..28259aaee0dc869841e657e5a0d2387d6bf50ed5 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -430,7 +430,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
         const bool supportsMoving = capabilities.supportsMoving();
 
         if (capabilities.supportsDeleting()) {
         const bool supportsMoving = capabilities.supportsMoving();
 
         if (capabilities.supportsDeleting()) {

-            const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) ||
+            const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||

                                            !item.isLocalFile());
             const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
 
                                            !item.isLocalFile());
             const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
 

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 1ea537d1df7000a9c41a058223d811457dd2fe5d..4938e9d6dbf70ea8adba4b58d4550cf2e15b4b9f 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -27,6 +27,8 @@
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>

+#include <KFormat>
+#include <QMimeDatabase>

 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()


@@ -78,11 +80,11 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();

-            text = KGlobal::locale()->formatByteSize(size);
+            text = KFormat().formatByteSize(size);

         }
     } else if (role == "date") {
         const QDateTime dateTime = roleValue.toDateTime();
         }
     } else if (role == "date") {
         const QDateTime dateTime = roleValue.toDateTime();

-        text = KGlobal::locale()->formatDateTime(dateTime);
+        text = KLocale::global()->formatDateTime(dateTime);

     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }
     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }


@@ -142,7 +144,8 @@ int KFileItemListWidget::selectionLength(const QString& text) const
         return selectionLength;
     }
 
         return selectionLength;
     }
 

-    const QString extension = KMimeType::extractKnownExtension(text);
+    QMimeDatabase db;
+    const QString extension = db.suffixForFileName(text);

     if (extension.isEmpty()) {
         // For an unknown extension just exclude the extension after
         // the last point. This does not work for multiple extensions like
     if (extension.isEmpty()) {
         // For an unknown extension just exclude the extension after
         // the last point. This does not work for multiple extensions like

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 5c212a98422f0a937c53edea02646ad5117bc39c..b8c56bd532e90c4904da2b8d2344d3637ba833e5 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -97,7 +97,7 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
 {
     Q_ASSERT(model);
 
 {
     Q_ASSERT(model);
 

-    const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

     m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                          << "directorythumbnail"
                                                          << "imagethumbnail"
     m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                          << "directorythumbnail"
                                                          << "imagethumbnail"

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 674f04c0d68974a053e41d0774cbf3379282c53e..afeeb64a9e3ee75140fcb3ca087b07007c7414c0 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -61,7 +61,7 @@ FoldersPanel::FoldersPanel(QWidget* parent) :
 
 FoldersPanel::~FoldersPanel()
 {
 
 FoldersPanel::~FoldersPanel()
 {

-    FoldersPanelSettings::self()->writeConfig();
+    FoldersPanelSettings::self()->save();

 
     if (m_controller) {
         KItemListView* view = m_controller->view();
 
     if (m_controller) {
         KItemListView* view = m_controller->view();

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 327e72ba950684d2713b22f5d6dfdddc05f4659f..6a9439b8ee1c7c5d68c20122000a703d7a9fa815 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -159,7 +159,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
 
 InformationPanelContent::~InformationPanelContent()
 {
 
 InformationPanelContent::~InformationPanelContent()
 {

-    InformationPanelSettings::self()->writeConfig();
+    InformationPanelSettings::self()->save();

 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
 }
 
 void InformationPanelContent::showItem(const KFileItem& item)

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 63cc1555379630bc5685099b2659d6ac42e3eb70..c8352f73a461c5073acb747f175707b7f8bd8700 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -70,7 +70,7 @@ void TerminalPanel::dockVisibilityChanged()
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives

-        changeDir(KUrl::fromPath("/"));
+        changeDir(QUrl::fromLocalFile("/"));

 
         // Because we have disconnected from the part's currentDirectoryChanged()
         // signal, we have to update m_konsolePartCurrentDirectory manually. If this
 
         // Because we have disconnected from the part's currentDirectoryChanged()
         // signal, we have to update m_konsolePartCurrentDirectory manually. If this

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 0fb1e41d7c1c129f215dc454cbac247a5bb60918..efb17faf6b9e990cf2eae80f9ae3b1ed6dca7c38 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -46,6 +46,7 @@
     #include <Baloo/Query>
     #include <Baloo/Term>
     #include <Baloo/IndexerConfig>
     #include <Baloo/Query>
     #include <Baloo/Term>
     #include <Baloo/IndexerConfig>

+#include <QFontDatabase>

 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :


@@ -324,7 +325,7 @@ void DolphinSearchBox::saveSettings()
     SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
     SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
     SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
     SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());

-    SearchSettings::self()->writeConfig();
+    SearchSettings::self()->save();

 }
 
 void DolphinSearchBox::init()
 }
 
 void DolphinSearchBox::init()


@@ -351,7 +352,7 @@ void DolphinSearchBox::init()
     m_searchInput = new KLineEdit(this);
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonShown(true);
     m_searchInput = new KLineEdit(this);
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonShown(true);

-    m_searchInput->setFont(KGlobalSettings::generalFont());
+    m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));

     connect(m_searchInput, &KLineEdit::returnPressed,
             this, &DolphinSearchBox::slotReturnPressed);
     connect(m_searchInput, &KLineEdit::textChanged,
     connect(m_searchInput, &KLineEdit::returnPressed,
             this, &DolphinSearchBox::slotReturnPressed);
     connect(m_searchInput, &KLineEdit::textChanged,

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 428e4fe28dd16f4a4683e98f5049ac24f9574185..7ca5506fa689941840d4e44cd66f1c782097d027 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -119,7 +119,7 @@ void PreviewsSettingsPage::applySettings()
         }
     }
 
         }
     }
 

-    KConfigGroup globalConfig(KGlobal::config(), QLatin1String("PreviewSettings"));
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), QLatin1String("PreviewSettings"));

     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;


@@ -176,7 +176,7 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 
 void PreviewsSettingsPage::loadSettings()
 {
 
 void PreviewsSettingsPage::loadSettings()
 {

-    KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                      << QLatin1String("directorythumbnail")
                                                      << QLatin1String("imagethumbnail")
     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                      << QLatin1String("directorythumbnail")
                                                      << QLatin1String("imagethumbnail")

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 84b66e9567c5e7f3c1fac1817000a6bd2c07c237..821e37a04353e144e9f2cc686f00d0da8cbf9dab 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -42,7 +42,8 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
+    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
+//KLocale::global()->insertCatalog("dolphin");

 
     setButtons(KCModule::Default | KCModule::Help);
 
 
     setButtons(KCModule::Default | KCModule::Help);
 

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 8096bc24aecdf5661c6ae024a1d6bd47b9703789..6265df58660170f89762fece12e66fe98912e605 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -39,7 +39,8 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
+    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
+//KLocale::global()->insertCatalog("dolphin");

 
     setButtons(KCModule::Default | KCModule::Help);
 
 
     setButtons(KCModule::Default | KCModule::Help);
 

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 87778dd81b4d2b4380a012acaf37d40f88007106..150ea6d6d9dbda812035f8b27cb06fae0c5cc9ac 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -39,7 +39,8 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
+    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
+//KLocale::global()->insertCatalog("dolphin");

 
     setButtons(KCModule::Default | KCModule::Help);
 
 
     setButtons(KCModule::Default | KCModule::Help);
 

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index ec862957bd3050449e1821918d5babe5714dacb1..9f2829c1b5fd677ac01296820fcc7eebfc524892 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -44,7 +44,8 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
+    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
+//KLocale::global()->insertCatalog("dolphin");

 
     setButtons(KCModule::Default | KCModule::Help);
 
 
     setButtons(KCModule::Default | KCModule::Help);
 

diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index e4f5b3fab7b1f03fb146bd9550d9ab3382c7de8f..da49c7d0a30d2aa4c3943f8b45450c402d7789b6 100644 (file)
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -125,7 +125,7 @@ void ServicesSettingsPage::applySettings()
             configGroup.sync();
         } else if (service == QLatin1String(CopyToMoveToService)) {
             GeneralSettings::setShowCopyMoveMenu(checked);
             configGroup.sync();
         } else if (service == QLatin1String(CopyToMoveToService)) {
             GeneralSettings::setShowCopyMoveMenu(checked);

-            GeneralSettings::self()->writeConfig();
+            GeneralSettings::self()->save();

         } else {
             showGroup.writeEntry(service, checked);
         }
         } else {
             showGroup.writeEntry(service, checked);
         }


@@ -135,7 +135,7 @@ void ServicesSettingsPage::applySettings()
 
     if (m_enabledVcsPlugins != enabledPlugins) {
         VersionControlSettings::setEnabledPlugins(enabledPlugins);
 
     if (m_enabledVcsPlugins != enabledPlugins) {
         VersionControlSettings::setEnabledPlugins(enabledPlugins);

-        VersionControlSettings::self()->writeConfig();
+        VersionControlSettings::self()->save();

 
         KMessageBox::information(window(),
                                  i18nc("@info", "Dolphin must be restarted to apply the "
 
         KMessageBox::information(window(),
                                  i18nc("@info", "Dolphin must be restarted to apply the "

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 660aacdf9d0cdeb4e82f7c4ebd10430ebc803a5e..278fb0933d3ca7363772c40fcf7466b01ecfe977 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -27,6 +27,7 @@
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QPushButton>

+#include <QFontDatabase>

 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),


@@ -72,7 +73,7 @@ DolphinFontRequester::Mode DolphinFontRequester::mode() const
 
 QFont DolphinFontRequester::currentFont() const
 {
 
 QFont DolphinFontRequester::currentFont() const
 {

-    return (m_mode == CustomFont) ? m_customFont : KGlobalSettings::generalFont();
+    return (m_mode == CustomFont) ? m_customFont : QFontDatabase::systemFont(QFontDatabase::GeneralFont);

 }
 
 void DolphinFontRequester::setCustomFont(const QFont& font)
 }
 
 void DolphinFontRequester::setCustomFont(const QFont& font)

diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 5b9334c22b577af7ef2875fcb9146e43294dc2a5..01601f71165a144ebc8508dbd0b7905dc6df220e 100644 (file)
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -125,9 +125,9 @@ int ViewModeSettings::fontWeight() const
 void ViewModeSettings::readConfig()
 {
     switch (m_mode) {
 void ViewModeSettings::readConfig()
 {
     switch (m_mode) {

-    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->readConfig(); break;
-    case ViewModeSettings::CompactMode: CompactModeSettings::self()->readConfig(); break;
-    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->readConfig(); break;
+    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->load(); break;
+    case ViewModeSettings::CompactMode: CompactModeSettings::self()->load(); break;
+    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->load(); break;

     default: Q_ASSERT(false); break;
     }
 }
     default: Q_ASSERT(false); break;
     }
 }


@@ -135,9 +135,9 @@ void ViewModeSettings::readConfig()
 void ViewModeSettings::writeConfig()
 {
     switch (m_mode) {
 void ViewModeSettings::writeConfig()
 {
     switch (m_mode) {

-    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->writeConfig(); break;
-    case ViewModeSettings::CompactMode: CompactModeSettings::self()->writeConfig(); break;
-    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->writeConfig(); break;
+    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->save(); break;
+    case ViewModeSettings::CompactMode: CompactModeSettings::self()->save(); break;
+    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->save(); break;

     default: Q_ASSERT(false); break;
     }
 }
     default: Q_ASSERT(false); break;
     }
 }

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index eeef45d926a35341fb9140510f086f7cafe9c8f9..cd16aead03fccbf2fbacede65a105b66589c157a 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -95,7 +95,7 @@ void DolphinItemListView::readSettings()
     updateFont();
     updateGridSize();
 
     updateFont();
     updateGridSize();
 

-    const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

     const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()
                                                        << "directorythumbnail"
                                                        << "imagethumbnail"
     const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()
                                                        << "directorythumbnail"
                                                        << "imagethumbnail"


@@ -107,9 +107,9 @@ void DolphinItemListView::readSettings()
 
 void DolphinItemListView::writeSettings()
 {
 
 void DolphinItemListView::writeSettings()
 {

-    IconsModeSettings::self()->writeConfig();
-    CompactModeSettings::self()->writeConfig();
-    DetailsModeSettings::self()->writeConfig();
+    IconsModeSettings::self()->save();
+    CompactModeSettings::self()->save();
+    DetailsModeSettings::self()->save();

 }
 
 KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const
 }
 
 KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const

diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 9a15600036d1fe6cfad2475311f07f8197243294..8fe66b92d59ff0bf4046c3935f41fd79537f2c06 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -70,7 +70,7 @@ void DolphinRemoteEncoding::slotReload()
 void DolphinRemoteEncoding::loadSettings()
 {
     m_loaded = true;
 void DolphinRemoteEncoding::loadSettings()
 {
     m_loaded = true;

-    m_encodingDescriptions = KGlobal::charsets()->descriptiveEncodingNames();
+    m_encodingDescriptions = KCharsets::charsets()->descriptiveEncodingNames();

 
     fillMenu();
 }
 
     fillMenu();
 }


@@ -131,7 +131,7 @@ void DolphinRemoteEncoding::updateMenu()
         m_menu->menu()->actions().at(i)->setChecked(false);
     }
 
         m_menu->menu()->actions().at(i)->setChecked(false);
     }
 

-    const QString charset = KGlobal::charsets()->descriptionForEncoding(KProtocolManager::charsetFor(m_currentURL));
+    const QString charset = KCharsets::charsets()->descriptionForEncoding(KProtocolManager::charsetFor(m_currentURL));

     if (!charset.isEmpty()) {
         int id = 0;
         bool isFound = false;
     if (!charset.isEmpty()) {
         int id = 0;
         bool isFound = false;


@@ -172,7 +172,7 @@ void DolphinRemoteEncoding::slotItemSelected(QAction* action)
         KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1());
         QString host = m_currentURL.host();
         if (m_menu->menu()->actions().at(id)->isChecked()) {
         KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1());
         QString host = m_currentURL.host();
         if (m_menu->menu()->actions().at(id)->isChecked()) {

-            QString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions.at(id));
+            QString charset = KCharsets::charsets()->encodingForName(m_encodingDescriptions.at(id));

             KConfigGroup cg(&config, host);
             cg.writeEntry(DATA_KEY, charset);
             config.sync();
             KConfigGroup cg(&config, host);
             cg.writeEntry(DATA_KEY, charset);
             config.sync();

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 2eb16fe2dd0c28397358843fb82feff46cff41f9..171b3cbaf702a5c4a48add86d1f2e831d7bc2af7 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -80,6 +80,7 @@
 
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
 
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>

+#include <KFormat>

 #endif
 
 namespace {
 #endif
 
 namespace {


@@ -489,7 +490,7 @@ void DolphinView::readSettings()
 {
     const int oldZoomLevel = m_view->zoomLevel();
 
 {
     const int oldZoomLevel = m_view->zoomLevel();
 

-    GeneralSettings::self()->readConfig();
+    GeneralSettings::self()->load();

     m_view->readSettings();
     applyViewProperties();
 
     m_view->readSettings();
     applyViewProperties();
 


@@ -504,7 +505,7 @@ void DolphinView::readSettings()
 
 void DolphinView::writeSettings()
 {
 
 void DolphinView::writeSettings()
 {

-    GeneralSettings::self()->writeConfig();
+    GeneralSettings::self()->save();

     m_view->writeSettings();
 }
 
     m_view->writeSettings();
 }
 


@@ -567,11 +568,11 @@ QString DolphinView::statusBarText() const
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
                         foldersText, filesText,
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
                         foldersText, filesText,

-                        KGlobal::locale()->formatByteSize(totalFileSize));
+                        KFormat().formatByteSize(totalFileSize));

     } else if (fileCount > 0) {
         summary = i18nc("@info:status files (size)", "%1 (%2)",
                         filesText,
     } else if (fileCount > 0) {
         summary = i18nc("@info:status files (size)", "%1 (%2)",
                         filesText,

-                        KGlobal::locale()->formatByteSize(totalFileSize));
+                        KFormat().formatByteSize(totalFileSize));

     } else if (folderCount > 0) {
         summary = foldersText;
     } else {
     } else if (folderCount > 0) {
         summary = foldersText;
     } else {

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 5124795125b7d871b019c916c858912a67256ce6..6556cbe2288628e3097b03e95d0644f9ca0a3378 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -33,6 +33,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QVBoxLayout>

+#include <QMimeDatabase>

 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     KDialog(parent),
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     KDialog(parent),


@@ -83,7 +84,8 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {
         const QString fileName = items.first().url().toDisplayString();
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {
         const QString fileName = items.first().url().toDisplayString();

-        const QString extension = KMimeType::extractKnownExtension(fileName.toLower());
+        QMimeDatabase db;
+        const QString extension = db.suffixForFileName(fileName.toLower());

 
         // If the current item is a directory, select the whole file name.
         if ((extension.length() > 0) && !items.first().isDir()) {
 
         // If the current item is a directory, select the whole file name.
         if ((extension.length() > 0) && !items.first().isDir()) {


@@ -105,7 +107,8 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     if (!m_renameOneItem) {
         QSet<QString> extensions;
         foreach (const KFileItem& item, m_items) {
     if (!m_renameOneItem) {
         QSet<QString> extensions;
         foreach (const KFileItem& item, m_items) {

-            const QString extension = KMimeType::extractKnownExtension(item.url().toDisplayString().toLower());
+            QMimeDatabase db;
+            const QString extension = db.suffixForFileName(item.url().toDisplayString().toLower());

 
             if (extensions.contains(extension)) {
                 m_allExtensionsDifferent = false;
 
             if (extensions.contains(extension)) {
                 m_allExtensionsDifferent = false;


@@ -191,7 +194,8 @@ void RenameDialog::renameItems()
         ++index;
 
         const QUrl oldUrl = item.url();
         ++index;
 
         const QUrl oldUrl = item.url();

-        const QString extension = KMimeType::extractKnownExtension(oldUrl.path().toLower());
+        QMimeDatabase db;
+        const QString extension = db.suffixForFileName(oldUrl.path().toLower());

         if (!extension.isEmpty()) {
             newName.append(QLatin1Char('.'));
             newName.append(extension);
         if (!extension.isEmpty()) {
             newName.append(QLatin1Char('.'));
             newName.append(extension);