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 475769e9122afec47781e0d6fedf97b7f7511edc..fbf21c08f1c03edcb7ee31cd73d43032606b7727 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -16,29 +16,26 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/

- 
+

  /*
  * This code is largely based on the kremoteencodingplugin
  * Copyright (c) 2003 Thiago Macieira <thiago.macieira@kdemail.net>
  * Distributed under the same terms.
  */
  /*
  * This code is largely based on the kremoteencodingplugin
  * Copyright (c) 2003 Thiago Macieira <thiago.macieira@kdemail.net>
  * Distributed under the same terms.
  */

- 
+

 #include "dolphinremoteencoding.h"
 #include "dolphinviewactionhandler.h"
 
 #include <KDebug>
 #include <KActionMenu>
 #include <KActionCollection>
 #include "dolphinremoteencoding.h"
 #include "dolphinviewactionhandler.h"
 
 #include <KDebug>
 #include <KActionMenu>
 #include <KActionCollection>

-#include <KIcon>
-#include <KLocale>
-#include <KGlobal>
-#include <KMimeType>
+#include <QIcon>
+#include <KLocalizedString>

 #include <KConfig>
 #include <KCharsets>
 #include <KConfig>
 #include <KCharsets>

-#include <KMenu>
+#include <QMenu>

 #include <KProtocolInfo>
 #include <KProtocolManager>
 #include <KProtocolInfo>
 #include <KProtocolManager>

-#include <KIO/SlaveConfig>

 #include <KIO/Scheduler>
 #include <KConfigGroup>
 
 #include <KIO/Scheduler>
 #include <KConfigGroup>
 


@@ -48,12 +45,12 @@ DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionH
    :QObject(parent),
     m_actionHandler(actionHandler),
     m_loaded(false),
    :QObject(parent),
     m_actionHandler(actionHandler),
     m_loaded(false),

-    m_idDefault(0)    
+    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);
     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);
 
     m_menu->setEnabled(false);
     m_menu->setDelayed(false);


@@ -71,22 +68,22 @@ 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();
 }
 
 void DolphinRemoteEncoding::slotAboutToOpenUrl()
 {
 
     fillMenu();
 }
 
 void DolphinRemoteEncoding::slotAboutToOpenUrl()
 {

-    KUrl oldURL = m_currentURL;
+    QUrl oldURL = m_currentURL;

     m_currentURL = m_actionHandler->currentView()->url();
 
     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() &&
             KProtocolManager::outputType(m_currentURL) == KProtocolInfo::T_FILESYSTEM) {
         // This plugin works on ftp, fish, etc.
         // everything whose type is T_FILESYSTEM except for local files
         if (!m_currentURL.isLocalFile() &&
             KProtocolManager::outputType(m_currentURL) == KProtocolInfo::T_FILESYSTEM) {

-          
+

             m_menu->setEnabled(true);
             loadSettings();
         } else {
             m_menu->setEnabled(true);
             loadSettings();
         } else {


@@ -102,10 +99,10 @@ void DolphinRemoteEncoding::slotAboutToOpenUrl()
 
 void DolphinRemoteEncoding::fillMenu()
 {
 
 void DolphinRemoteEncoding::fillMenu()
 {

-    KMenu* menu = m_menu->menu();
+    QMenu* menu = m_menu->menu();

     menu->clear();
 
     menu->clear();
 

- 
+

     for (int i = 0; i < m_encodingDescriptions.size();i++) {
         QAction* action = new QAction(m_encodingDescriptions.at(i), this);
         action->setCheckable(true);
     for (int i = 0; i < m_encodingDescriptions.size();i++) {
         QAction* action = new QAction(m_encodingDescriptions.at(i), this);
         action->setCheckable(true);


@@ -117,8 +114,8 @@ void DolphinRemoteEncoding::fillMenu()
     menu->addAction(i18n("Reload"), this, SLOT(slotReload()), 0);
     menu->addAction(i18n("Default"), this, SLOT(slotDefault()), 0)->setCheckable(true);
     m_idDefault = m_encodingDescriptions.size() + 2;
     menu->addAction(i18n("Reload"), this, SLOT(slotReload()), 0);
     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()
 }
 
 void DolphinRemoteEncoding::updateMenu()


@@ -126,26 +123,24 @@ void DolphinRemoteEncoding::updateMenu()
     if (!m_loaded) {
         loadSettings();
     }
     if (!m_loaded) {
         loadSettings();
     }

-  
+

     // uncheck everything
     for (int i =  0; i < m_menu->menu()->actions().count(); i++) {
         m_menu->menu()->actions().at(i)->setChecked(false);
     }
     // uncheck everything
     for (int i =  0; i < m_menu->menu()->actions().count(); i++) {
         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 (!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;
             }
         }
                 isFound = true;
                 id = i;
                 break;
             }
         }

-      
+

         kDebug() << "URL=" << m_currentURL << " charset=" << charset;
 
         if (!isFound) {
         kDebug() << "URL=" << m_currentURL << " charset=" << charset;
 
         if (!isFound) {


@@ -156,7 +151,7 @@ void DolphinRemoteEncoding::updateMenu()
     } else {
         m_menu->menu()->actions().at(m_idDefault)->setChecked(true);
     }
     } else {
         m_menu->menu()->actions().at(m_idDefault)->setChecked(true);
     }

-    
+

 }
 
 void DolphinRemoteEncoding::slotAboutToShow()
 }
 
 void DolphinRemoteEncoding::slotAboutToShow()


@@ -171,11 +166,11 @@ void DolphinRemoteEncoding::slotItemSelected(QAction* action)
 {
     if (action) {
         int id = action->data().toInt();
 {
     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 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();


@@ -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.
 {
     // 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()) {
 
     QStringList partList = m_currentURL.host().split('.', QString::SkipEmptyParts);
     if (!partList.isEmpty()) {


@@ -238,4 +233,3 @@ void DolphinRemoteEncoding::updateView()
     m_actionHandler->currentView()->reload();
 }
 
     m_actionHandler->currentView()->reload();
 }
 

-#include "dolphinremoteencoding.moc"