Merge branch 'master' into frameworks

[dolphin.git] / src / settings / kcm / kcmdolphingeneral.cpp

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index b803c98cfeb7b6903b72e1100ca9273b315d9526..fb3956880a273c8586aa6fa7f151f018ea2a5b72 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,56 +19,52 @@
 
 #include "kcmdolphingeneral.h"
 
 
 #include "kcmdolphingeneral.h"
 

-#include <KTabWidget>
-#include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 #include <KPluginFactory>
 #include <KPluginLoader>
 
 #include <settings/general/behaviorsettingspage.h>
 #include <settings/general/previewssettingspage.h>
 #include <KPluginFactory>
 #include <KPluginLoader>
 
 #include <settings/general/behaviorsettingspage.h>
 #include <settings/general/previewssettingspage.h>

-#include <settings/general/contextmenusettingspage.h>
+#include <settings/general/confirmationssettingspage.h>

 
 #include <QDir>
 #include <QVBoxLayout>
 
 #include <QDir>
 #include <QVBoxLayout>

+#include <QTabWidget>

 
 K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>("dolphingeneral");)
 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))
 
 DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args) :
 
 K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>("dolphingeneral");)
 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))
 
 DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args) :

-    KCModule(KCMDolphinGeneralConfigFactory::componentData(), parent),
+    KCModule(parent),

     m_pages()
 {
     Q_UNUSED(args);
 
     m_pages()
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
-

     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);

-    topLayout->setSpacing(KDialog::spacingHint());

 
 

-    KTabWidget* tabWidget = new KTabWidget(this);
+    QTabWidget* tabWidget = new QTabWidget(this);

 
     // initialize 'Behavior' tab
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QDir::homePath(), tabWidget);
     tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));
 
     // initialize 'Behavior' tab
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QDir::homePath(), tabWidget);
     tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));

-    connect(behaviorPage, SIGNAL(changed()), this, SLOT(changed()));
+    connect(behaviorPage, &BehaviorSettingsPage::changed, this, static_cast<void(DolphinGeneralConfigModule::*)()>(&DolphinGeneralConfigModule::changed));

 
     // initialize 'Previews' tab
     PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget);
     tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
 
     // initialize 'Previews' tab
     PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget);
     tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));

-    connect(previewsPage, SIGNAL(changed()), this, SLOT(changed()));
+    connect(previewsPage, &PreviewsSettingsPage::changed, this, static_cast<void(DolphinGeneralConfigModule::*)()>(&DolphinGeneralConfigModule::changed));

 
 

-    // initialize 'Context Menu' tab
-    ContextMenuSettingsPage *contextMenuPage = new ContextMenuSettingsPage(tabWidget);
-    tabWidget->addTab(contextMenuPage,  i18nc("@title:tab Context Menu settings", "Context Menu"));
-    connect(contextMenuPage, SIGNAL(changed()), this, SLOT(changed()));
+    // initialize 'Confirmations' tab
+    ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
+    tabWidget->addTab(confirmationsPage,  i18nc("@title:tab Confirmations settings", "Confirmations"));
+    connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, static_cast<void(DolphinGeneralConfigModule::*)()>(&DolphinGeneralConfigModule::changed));

 
     m_pages.append(behaviorPage);
     m_pages.append(previewsPage);
 
     m_pages.append(behaviorPage);
     m_pages.append(previewsPage);

-    m_pages.append(contextMenuPage);
+    m_pages.append(confirmationsPage);

 
     topLayout->addWidget(tabWidget, 0, 0);
 }
 
     topLayout->addWidget(tabWidget, 0, 0);
 }