X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/39cfd051ef25f3a90fdfa411325829ca119a421c..119f7a3f:/src/settings/kcm/kcmdolphingeneral.cpp diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 84b66e956..285633658 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -19,12 +19,10 @@ #include "kcmdolphingeneral.h" -#include #include -#include +#include #include #include -#include #include #include @@ -32,6 +30,7 @@ #include #include +#include K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin("dolphingeneral");) K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral")) @@ -42,7 +41,8 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV { 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); @@ -50,7 +50,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV 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);