Load KFileItemAction plugins with json metadata

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

diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index dddefdd5c2d8301ee23ab05d4fcf4feb2077c9e8..d8f61ef90b17f00401bd551eea2d1f88c90c807a 100644 (file)
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -21,51 +21,48 @@
 #include "generalsettingspage.h"
 
 #include "behaviorsettingspage.h"
 #include "generalsettingspage.h"
 
 #include "behaviorsettingspage.h"

-#include "contextmenusettingspage.h"
+#include "confirmationssettingspage.h"

 #include "previewssettingspage.h"
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 
 #include "previewssettingspage.h"
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 

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

 
 

+#include <QTabWidget>

 #include <QVBoxLayout>
 
 #include <QVBoxLayout>
 

-GeneralSettingsPage::GeneralSettingsPage(const KUrl& url, QWidget* parent) :
+GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) :

     SettingsPageBase(parent),
     m_pages()
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     SettingsPageBase(parent),
     m_pages()
 {
     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(url, tabWidget);
     tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));
 
     // initialize 'Behavior' tab
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(url, tabWidget);
     tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));

-    connect(behaviorPage, SIGNAL(changed()), this, SIGNAL(changed()));
+    connect(behaviorPage, &BehaviorSettingsPage::changed, this, &GeneralSettingsPage::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, SIGNAL(changed()));
+    connect(previewsPage, &PreviewsSettingsPage::changed, this, &GeneralSettingsPage::changed);

 
     // initialize 'Context Menu' tab
 
     // 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, SIGNAL(changed()));
+    ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
+    tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations"));
+    connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &GeneralSettingsPage::changed);

 
     // initialize 'Status Bar' tab
     StatusBarSettingsPage* statusBarPage = new StatusBarSettingsPage(tabWidget);
     tabWidget->addTab(statusBarPage, i18nc("@title:tab Status Bar settings", "Status Bar"));
 
     // initialize 'Status Bar' tab
     StatusBarSettingsPage* statusBarPage = new StatusBarSettingsPage(tabWidget);
     tabWidget->addTab(statusBarPage, i18nc("@title:tab Status Bar settings", "Status Bar"));

-    connect(statusBarPage, SIGNAL(changed()), this, SIGNAL(changed()));
+    connect(statusBarPage, &StatusBarSettingsPage::changed, this, &GeneralSettingsPage::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);

     m_pages.append(statusBarPage);
 
     topLayout->addWidget(tabWidget, 0, 0);
     m_pages.append(statusBarPage);
 
     topLayout->addWidget(tabWidget, 0, 0);


@@ -89,4 +86,3 @@ void GeneralSettingsPage::restoreDefaults()
     }
 }
 
     }
 }
 

-#include "generalsettingspage.moc"