SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 2881915ac1cf0624a9e51d5aa73dc9b6edc34795..33c5868d660df6df55beae52a4b80c1d3d1617b8 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -20,11 +20,12 @@
 #include <KCharsets>
 #include <KConfig>
 #include <KConfigGroup>
 #include <KCharsets>
 #include <KConfig>
 #include <KConfigGroup>

-#include <KIO/Scheduler>

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

+#include <QDBusConnection>
+#include <QDBusMessage>

 #include <QMenu>
 
 #define DATA_KEY QStringLiteral("Charset")
 #include <QMenu>
 
 #define DATA_KEY QStringLiteral("Charset")


@@ -87,7 +88,7 @@ void DolphinRemoteEncoding::fillMenu()
     QMenu *menu = m_menu->menu();
     menu->clear();
 
     QMenu *menu = m_menu->menu();
     menu->clear();
 

-    menu->addAction(i18n("Default"), this, SLOT(slotDefault()), 0)->setCheckable(true);
+    menu->addAction(i18n("Default"), this, &DolphinRemoteEncoding::slotDefault)->setCheckable(true);

     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);


@@ -96,7 +97,7 @@ void DolphinRemoteEncoding::fillMenu()
     }
     menu->addSeparator();
 
     }
     menu->addSeparator();
 

-    menu->addAction(i18n("Reload"), this, SLOT(slotReload()), 0);
+    menu->addAction(i18n("Reload"), this, &DolphinRemoteEncoding::slotReload);

     m_idDefault = m_encodingDescriptions.size() + 2;
 
     connect(menu, &QMenu::triggered, this, &DolphinRemoteEncoding::slotItemSelected);
     m_idDefault = m_encodingDescriptions.size() + 2;
 
     connect(menu, &QMenu::triggered, this, &DolphinRemoteEncoding::slotItemSelected);


@@ -150,7 +151,7 @@ void DolphinRemoteEncoding::slotItemSelected(QAction *action)
     if (action) {
         int id = action->data().toInt();
 
     if (action) {
         int id = action->data().toInt();
 

-        KConfig config(("kio_" + m_currentURL.scheme() + "rc").toLatin1());
+        KConfig config(QLatin1String("kio_%1rc").arg(m_currentURL.scheme()));

         QString host = m_currentURL.host();
         if (m_menu->menu()->actions().at(id)->isChecked()) {
             QString charset = KCharsets::charsets()->encodingForName(m_encodingDescriptions.at(id));
         QString host = m_currentURL.host();
         if (m_menu->menu()->actions().at(id)->isChecked()) {
             QString charset = KCharsets::charsets()->encodingForName(m_encodingDescriptions.at(id));


@@ -168,9 +169,9 @@ 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.scheme() + "rc").toLatin1());
+    KConfig config(QLatin1String("kio_%1rc").arg(m_currentURL.scheme()));

 
 

-    QStringList partList = m_currentURL.host().split('.', Qt::SkipEmptyParts);
+    QStringList partList = m_currentURL.host().split(QLatin1Char('.'), Qt::SkipEmptyParts);

     if (!partList.isEmpty()) {
         partList.erase(partList.begin());
 
     if (!partList.isEmpty()) {
         partList.erase(partList.begin());
 


@@ -197,8 +198,8 @@ void DolphinRemoteEncoding::slotDefault()
             qCDebug(DolphinDebug) << "Domain to remove: " << *it;
             if (config.hasGroup(*it)) {
                 config.deleteGroup(*it);
             qCDebug(DolphinDebug) << "Domain to remove: " << *it;
             if (config.hasGroup(*it)) {
                 config.deleteGroup(*it);

-            } else if (config.group("").hasKey(*it)) {
-                config.group("").deleteEntry(*it); //don't know what group name is supposed to be XXX
+            } else if (config.group(QString()).hasKey(*it)) {
+                config.group(QString()).deleteEntry(*it); // don't know what group name is supposed to be XXX

             }
         }
     }
             }
         }
     }


@@ -210,7 +211,11 @@ void DolphinRemoteEncoding::slotDefault()
 
 void DolphinRemoteEncoding::updateView()
 {
 
 void DolphinRemoteEncoding::updateView()
 {

-    KIO::Scheduler::emitReparseSlaveConfiguration();
+    QDBusMessage message =
+        QDBusMessage::createSignal(QStringLiteral("/KIO/Scheduler"), QStringLiteral("org.kde.KIO.Scheduler"), QStringLiteral("reparseSlaveConfiguration"));
+    message << QString();
+    QDBusConnection::sessionBus().send(message);
+

     // Reload the page with the new charset
     m_actionHandler->currentView()->setUrl(m_currentURL);
     m_actionHandler->currentView()->reload();
     // Reload the page with the new charset
     m_actionHandler->currentView()->setUrl(m_currentURL);
     m_actionHandler->currentView()->reload();