Change default Dolphin toolbar layout

[dolphin.git] / src / settings / viewmodes / dolphinfontrequester.cpp

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index b9c5d97cf8e899600faf32c221a37ef496f74494..09aacc3dfeeb1d600ff582a6fdecc1011f37b16b 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -20,27 +20,27 @@
 #include "dolphinfontrequester.h"
 
 #include <KLocalizedString>
 #include "dolphinfontrequester.h"
 
 #include <KLocalizedString>

-#include <KComboBox>

 
 

-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QComboBox>

 #include <QFontDatabase>
 #include <QFontDialog>
 #include <QFontDatabase>
 #include <QFontDialog>

+#include <QHBoxLayout>
+#include <QPushButton>

 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),

-    m_modeCombo(0),
-    m_chooseFontButton(0),
+    m_modeCombo(nullptr),
+    m_chooseFontButton(nullptr),

     m_mode(SystemFont),
     m_customFont()
 {
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     m_mode(SystemFont),
     m_customFont()
 {
     QHBoxLayout* topLayout = new QHBoxLayout(this);

-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);

 
 

-    m_modeCombo = new KComboBox(this);
+    m_modeCombo = new QComboBox(this);

     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font"));
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font"));
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font"));
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font"));

-    connect(m_modeCombo, static_cast<void(KComboBox::*)(int)>(&KComboBox::activated),
+    connect(m_modeCombo, QOverload<int>::of(&QComboBox::activated),

             this, &DolphinFontRequester::changeMode);
 
     m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);
             this, &DolphinFontRequester::changeMode);
 
     m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);