From 20f62340054084ab9c1f114e515740eacb42abed Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 14 Dec 2014 18:42:54 +0100 Subject: [PATCH] port from KTabWidget to QTabWidget --- src/settings/general/generalsettingspage.cpp | 4 ++-- src/settings/kcm/kcmdolphingeneral.cpp | 4 ++-- src/settings/kcm/kcmdolphinviewmodes.cpp | 4 ++-- src/settings/viewmodes/viewsettingspage.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index f24b1bf22..f32cb9c92 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -28,8 +28,8 @@ #include #include -#include +#include #include GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : @@ -40,7 +40,7 @@ GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : 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); diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 68f515ac3..285633658 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -19,7 +19,6 @@ #include "kcmdolphingeneral.h" -#include #include #include #include @@ -31,6 +30,7 @@ #include #include +#include K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin("dolphingeneral");) K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral")) @@ -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); diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index fc211cdab..d9c8a1a43 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -19,7 +19,6 @@ #include "kcmdolphinviewmodes.h" -#include #include #include #include @@ -32,6 +31,7 @@ #include #include #include +#include K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin("dolphinviewmodes");) K_EXPORT_PLUGIN(KCMDolphinViewModesConfigFactory("kcmdolphinviewmodes")) @@ -51,7 +51,7 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons topLayout->setMargin(0); topLayout->setSpacing(KDialog::spacingHint()); - KTabWidget* tabWidget = new KTabWidget(this); + QTabWidget* tabWidget = new QTabWidget(this); // Initialize 'Icons' tab ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 2b657c264..12d4ce0e1 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -24,10 +24,10 @@ #include "viewsettingstab.h" #include +#include #include #include -#include ViewSettingsPage::ViewSettingsPage(QWidget* parent) : SettingsPageBase(parent), @@ -37,7 +37,7 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) : topLayout->setMargin(0); topLayout->setSpacing(KDialog::spacingHint()); - KTabWidget* tabWidget = new KTabWidget(this); + QTabWidget* tabWidget = new QTabWidget(this); // Initialize 'Icons' tab ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); -- 2.47.3