Fix for crash which was introduced by commit

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

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

-#include <KTabWidget>

 #include <KDialog>
 #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,6 +30,7 @@
 
 #include <QDir>
 #include <QVBoxLayout>
 
 #include <QDir>
 #include <QVBoxLayout>

+#include <QTabWidget>

 
 K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>("dolphingeneral");)
 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))
 
 K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>("dolphingeneral");)
 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))


@@ -42,7 +41,8 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
+    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
+//KLocale::global()->insertCatalog("dolphin");

 
     setButtons(KCModule::Default | KCModule::Help);
 
 
     setButtons(KCModule::Default | KCModule::Help);
 


@@ -50,7 +50,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
     topLayout->setMargin(0);
     topLayout->setSpacing(KDialog::spacingHint());
 
     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);
 
     // initialize 'Behavior' tab
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QDir::homePath(), tabWidget);