From: Dawit Alemayehu Date: Thu, 22 Nov 2012 16:07:58 +0000 (-0500) Subject: KIO::SlaveConfig::configData -> KProtocolManager::charsetFor for KF5. X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/6285f4b9df25618fe5bcfddb49066ec96be23a2d KIO::SlaveConfig::configData -> KProtocolManager::charsetFor for KF5. --- diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 375b3fd46..04b350eda 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -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;