port Dolphin from KUrl to QUrl

[dolphin.git] / src / views / dolphinremoteencoding.cpp

diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 8644f5cc2da9c5d72bb41d5509bef55ffa096c60..fbf21c08f1c03edcb7ee31cd73d43032606b7727 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -29,16 +29,13 @@
 #include <KDebug>
 #include <KActionMenu>
 #include <KActionCollection>
-#include <KIcon>
-#include <KLocale>
-#include <KGlobal>
-#include <KMimeType>
+#include <QIcon>
+#include <KLocalizedString>
 #include <KConfig>
 #include <KCharsets>
-#include <KMenu>
+#include <QMenu>
 #include <KProtocolInfo>
 #include <KProtocolManager>
-#include <KIO/SlaveConfig>
 #include <KIO/Scheduler>
 #include <KConfigGroup>
 
@@ -50,10 +47,10 @@ DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionH
     m_loaded(false),
     m_idDefault(0)
 {
-    m_menu = new KActionMenu(KIcon("character-set"), i18n("Select Remote Charset"), this);
+    m_menu = new KActionMenu(QIcon::fromTheme("character-set"), i18n("Select Remote Charset"), this);
     m_actionHandler->actionCollection()->addAction("change_remote_encoding", m_menu);
-    connect(m_menu->menu(), SIGNAL(aboutToShow()),
-          this, SLOT(slotAboutToShow()));
+    connect(m_menu->menu(), &QMenu::aboutToShow,
+          this, &DolphinRemoteEncoding::slotAboutToShow);
 
     m_menu->setEnabled(false);
     m_menu->setDelayed(false);
@@ -71,17 +68,17 @@ void DolphinRemoteEncoding::slotReload()
 void DolphinRemoteEncoding::loadSettings()
 {
     m_loaded = true;
-    m_encodingDescriptions = KGlobal::charsets()->descriptiveEncodingNames();
+    m_encodingDescriptions = KCharsets::charsets()->descriptiveEncodingNames();
 
     fillMenu();
 }
 
 void DolphinRemoteEncoding::slotAboutToOpenUrl()
 {
-    KUrl oldURL = m_currentURL;
+    QUrl oldURL = m_currentURL;
     m_currentURL = m_actionHandler->currentView()->url();
 
-    if (m_currentURL.protocol() != oldURL.protocol()) {
+    if (m_currentURL.scheme() != oldURL.scheme()) {
         // This plugin works on ftp, fish, etc.
         // everything whose type is T_FILESYSTEM except for local files
         if (!m_currentURL.isLocalFile() &&
@@ -102,7 +99,7 @@ void DolphinRemoteEncoding::slotAboutToOpenUrl()
 
 void DolphinRemoteEncoding::fillMenu()
 {
-    KMenu* menu = m_menu->menu();
+    QMenu* menu = m_menu->menu();
     menu->clear();
 
 
@@ -118,7 +115,7 @@ void DolphinRemoteEncoding::fillMenu()
     menu->addAction(i18n("Default"), this, SLOT(slotDefault()), 0)->setCheckable(true);
     m_idDefault = m_encodingDescriptions.size() + 2;
 
-    connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(slotItemSelected(QAction*)));
+    connect(menu, &QMenu::triggered, this, &DolphinRemoteEncoding::slotItemSelected);
 }
 
 void DolphinRemoteEncoding::updateMenu()
@@ -132,14 +129,12 @@ void DolphinRemoteEncoding::updateMenu()
         m_menu->menu()->actions().at(i)->setChecked(false);
     }
 
-    QString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(),
-                                                           m_currentURL.host(), DATA_KEY);
-
+    const QString charset = KCharsets::charsets()->descriptionForEncoding(KProtocolManager::charsetFor(m_currentURL));
     if (!charset.isEmpty()) {
         int id = 0;
         bool isFound = false;
         for (int i = 0; i < m_encodingDescriptions.size(); i++) {
-            if (m_encodingDescriptions.at(i).contains(charset)) {
+            if (m_encodingDescriptions.at(i) == charset) {
                 isFound = true;
                 id = i;
                 break;
@@ -172,10 +167,10 @@ void DolphinRemoteEncoding::slotItemSelected(QAction* action)
     if (action) {
         int id = action->data().toInt();
 
-        KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1());
+        KConfig config(("kio_" + m_currentURL.scheme() + "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();
@@ -190,7 +185,7 @@ void DolphinRemoteEncoding::slotDefault()
 {
     // We have no choice but delete all higher domain level
     // settings here since it affects what will be matched.
-    KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1());
+    KConfig config(("kio_" + m_currentURL.scheme() + "rc").toLatin1());
 
     QStringList partList = m_currentURL.host().split('.', QString::SkipEmptyParts);
     if (!partList.isEmpty()) {
@@ -238,4 +233,3 @@ void DolphinRemoteEncoding::updateView()
     m_actionHandler->currentView()->reload();
 }
 
-#include "dolphinremoteencoding.moc"