]> cloud.milkyroute.net Git - dolphin.git/commitdiff
KIO::SlaveConfig::configData -> KProtocolManager::charsetFor for KF5.
authorDawit Alemayehu <adawit@kde.org>
Thu, 22 Nov 2012 16:07:58 +0000 (11:07 -0500)
committerDawit Alemayehu <adawit@kde.org>
Fri, 21 Dec 2012 13:14:39 +0000 (08:14 -0500)
src/views/dolphinremoteencoding.cpp

index 375b3fd46aac7fbcc12792d47356223a14c60296..04b350eda78c26b3832bf1dd54a2ab6bec567bd3 100644 (file)
@@ -38,7 +38,6 @@
 #include <KMenu>
 #include <KProtocolInfo>
 #include <KProtocolManager>
-#include <KIO/SlaveConfig>
 #include <KIO/Scheduler>
 #include <KConfigGroup>
 
@@ -132,9 +131,7 @@ void DolphinRemoteEncoding::updateMenu()
         m_menu->menu()->actions().at(i)->setChecked(false);
     }
 
-    QString charset = KGlobal::charsets()->descriptionForEncoding(KIO::SlaveConfig::self()->configData(m_currentURL.protocol(),
-                                                                  m_currentURL.host(), DATA_KEY));
-
+    const QString charset = KGlobal::charsets()->descriptionForEncoding(KProtocolManager::charsetFor(m_currentURL));
     if (!charset.isEmpty()) {
         int id = 0;
         bool isFound = false;