port from KTabWidget to QTabWidget

diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index f24b1bf22a0f0d407659355909c3cfade68fa9d5..f32cb9c9283ecc20d05547599117bef25fde2599 100644 (file)
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -28,8 +28,8 @@
 
 #include <KDialog>
 #include <KLocalizedString>
 
 #include <KDialog>
 #include <KLocalizedString>

-#include <KTabWidget>

 
 

+#include <QTabWidget>

 #include <QVBoxLayout>
 
 GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) :
 #include <QVBoxLayout>
 
 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());
 
     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);
 
     // initialize 'Behavior' tab
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(url, tabWidget);

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 68f515ac32120dc5ac4f8cda2ad7d22489aa3607..285633658d80b8d8c82926866ac3094624e1fb12 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,7 +19,6 @@
 
 #include "kcmdolphingeneral.h"
 
 
 #include "kcmdolphingeneral.h"
 

-#include <KTabWidget>

 #include <KDialog>
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KDialog>
 #include <KLocalizedString>
 #include <KPluginFactory>


@@ -31,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"))


@@ -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);

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index fc211cdab000afc42723be01886451e67fa3ef63..d9c8a1a4350e241ca40b28b6b4c28499ea355f01 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -19,7 +19,6 @@
 
 #include "kcmdolphinviewmodes.h"
 
 
 #include "kcmdolphinviewmodes.h"
 

-#include <KTabWidget>

 #include <KDialog>
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KDialog>
 #include <KLocalizedString>
 #include <KPluginFactory>


@@ -32,6 +31,7 @@
 #include <QDBusMessage>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QDBusMessage>
 #include <QPushButton>
 #include <QVBoxLayout>

+#include <QTabWidget>

 
 K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin<DolphinViewModesConfigModule>("dolphinviewmodes");)
 K_EXPORT_PLUGIN(KCMDolphinViewModesConfigFactory("kcmdolphinviewmodes"))
 
 K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin<DolphinViewModesConfigModule>("dolphinviewmodes");)
 K_EXPORT_PLUGIN(KCMDolphinViewModesConfigFactory("kcmdolphinviewmodes"))


@@ -51,7 +51,7 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
     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 'Icons' tab
     ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
 
     // 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 2b657c264dae4a01a37a6642c9bbe8d45758032d..12d4ce0e1744658c698067099d8865f30bed9f03 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -24,10 +24,10 @@
 #include "viewsettingstab.h"
 
 #include <QVBoxLayout>
 #include "viewsettingstab.h"
 
 #include <QVBoxLayout>

+#include <QTabWidget>

 
 #include <KDialog>
 #include <KLocalizedString>
 
 #include <KDialog>
 #include <KLocalizedString>

-#include <KTabWidget>

 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),


@@ -37,7 +37,7 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     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 'Icons' tab
     ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
 
     // Initialize 'Icons' tab
     ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);