Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / settings / general / generalsettingspage.cpp

diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index 3b196e8377277ee1e9879da8f3f8e8ea88be14c1..f9a2c67d0b0d6971efaa6fe93b6d34ae7722c11b 100644 (file)
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -26,22 +26,19 @@
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 

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

 
 

+#include <QTabWidget>

 #include <QVBoxLayout>
 
 #include <QVBoxLayout>
 

-GeneralSettingsPage::GeneralSettingsPage(const KUrl& url, QWidget* parent) :
+GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) :

     SettingsPageBase(parent),
     m_pages()
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     SettingsPageBase(parent),
     m_pages()
 {
     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
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(url, tabWidget);
 
     // initialize 'Behavior' tab
     BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(url, tabWidget);


@@ -68,7 +65,7 @@ GeneralSettingsPage::GeneralSettingsPage(const KUrl& url, QWidget* parent) :
     m_pages.append(confirmationsPage);
     m_pages.append(statusBarPage);
 
     m_pages.append(confirmationsPage);
     m_pages.append(statusBarPage);
 

-    topLayout->addWidget(tabWidget, 0, 0);
+    topLayout->addWidget(tabWidget, 0, nullptr);

 }
 
 GeneralSettingsPage::~GeneralSettingsPage()
 }
 
 GeneralSettingsPage::~GeneralSettingsPage()