X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/38c34eeca315c7be58e65d4d3fb72aaf7b866719..be51e7233294263e3c2866e101e1151dbc61ccbe:/src/settings/kcm/kcmdolphinviewmodes.cpp

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 50ee13618..983a7b80d 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -8,27 +8,31 @@
 
 #include "settings/viewmodes/viewsettingstab.h"
 
+#include <KCModule>
 #include <KLocalizedString>
 #include <KPluginFactory>
 
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QIcon>
+#include <QTabBar>
 #include <QTabWidget>
 #include <QVBoxLayout>
 
 K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json")
 
-DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget *parent, const QVariantList &args)
-    : KCModule(parent, args)
+DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data)
+    : KCModule(parent, data)
     , m_tabs()
 {
     setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
 
-    QVBoxLayout *topLayout = new QVBoxLayout(this);
+    QVBoxLayout *topLayout = new QVBoxLayout(widget());
     topLayout->setContentsMargins(0, 0, 0, 0);
 
-    QTabWidget *tabWidget = new QTabWidget(this);
+    QTabWidget *tabWidget = new QTabWidget(widget());
+    tabWidget->setDocumentMode(true);
+    tabWidget->tabBar()->setExpanding(true);
 
     // Initialize 'Icons' tab
     ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
@@ -58,7 +62,7 @@ DolphinViewModesConfigModule::~DolphinViewModesConfigModule()
 
 void DolphinViewModesConfigModule::save()
 {
-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
+    for (ViewSettingsTab *tab : std::as_const(m_tabs)) {
         tab->applySettings();
     }
     reparseConfiguration();
@@ -66,8 +70,8 @@ void DolphinViewModesConfigModule::save()
 
 void DolphinViewModesConfigModule::defaults()
 {
-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
-        tab->restoreDefaultSettings();
+    for (ViewSettingsTab *tab : std::as_const(m_tabs)) {
+        tab->restoreDefaults();
     }
     reparseConfiguration();
 }
@@ -85,3 +89,5 @@ void DolphinViewModesConfigModule::viewModeChanged()
 }
 
 #include "kcmdolphinviewmodes.moc"
+
+#include "moc_kcmdolphinviewmodes.cpp"