Port away from QLinkedList

[dolphin.git] / src / settings / general / confirmationssettingspage.cpp

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 58d49062f5d4bbe2ef19bab24389a4d5bbb48312..6a72824d9ef2b2b86db84c185b536d6bab47ea51 100644 (file)
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -110,11 +110,7 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
     connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
     connect(m_confirmScriptExecution, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ConfirmationsSettingsPage::changed);
-#else
-    connect(m_confirmScriptExecution, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &ConfirmationsSettingsPage::changed);
-#endif
     connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
 
 #ifdef HAVE_TERMINAL
@@ -141,7 +137,7 @@ void ConfirmationsSettingsPage::applySettings()
         scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");
         break;
     case ScriptExecution::Open:
-        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk");
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "open");
         break;
     case ScriptExecution::Execute:
         scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute");
@@ -182,12 +178,12 @@ void ConfirmationsSettingsPage::loadSettings()
 
     const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
     const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
-    if (value == QLatin1String("dontAsk")) {
-        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open);
+    if (value == QLatin1String("alwaysAsk")) {
+        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk);
     } else if (value == QLatin1String("execute")) {
         m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Execute);
-    } else /* if (value == QLatin1String("alwaysAsk"))*/ {
-        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk);
+    } else /* if (value == QLatin1String("open"))*/ {
+        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open);
     }
 
     m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());