Merge branch 'master' of git.kde.org:dolphin

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

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 84b66e9567c5e7f3c1fac1817000a6bd2c07c237..3cf7e7652b97c8cdc00e6ce0a79973b603ace318 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,12 +19,9 @@
 
 #include "kcmdolphingeneral.h"
 
 
 #include "kcmdolphingeneral.h"
 

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

 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KPluginFactory>
 #include <KPluginLoader>

-#include <KGlobal>

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


@@ -32,8 +29,9 @@
 
 #include <QDir>
 #include <QVBoxLayout>
 
 #include <QDir>
 #include <QVBoxLayout>

+#include <QTabWidget>

 
 

-K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>("dolphingeneral");)
+K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>(QStringLiteral("dolphingeneral"));)

 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))
 
 DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args) :
 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))
 
 DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args) :


@@ -42,18 +40,15 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
 {
     Q_UNUSED(args);
 
 {
     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
 
     // initialize 'Behavior' tab

-    BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QDir::homePath(), tabWidget);
+    BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget);

     tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));
     connect(behaviorPage, &BehaviorSettingsPage::changed, this, static_cast<void(DolphinGeneralConfigModule::*)()>(&DolphinGeneralConfigModule::changed));
 
     tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));
     connect(behaviorPage, &BehaviorSettingsPage::changed, this, static_cast<void(DolphinGeneralConfigModule::*)()>(&DolphinGeneralConfigModule::changed));