From b488dc01260e3a279380af0d344e26ae2d447342 Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Tue, 26 Jun 2018 16:46:50 -0600 Subject: Port from KComboBox to QComboBox Summary: None of Dolphin's current usages of `KComboBox` use any of its additional features beyond `QComboBox`, so let's use `QComboBox` instead. Test Plan: Tested all features that use comboboxes in Dolphin. No visual or functional changes or regressions. Reviewers: #dolphin, elvisangelaccio, broulik Reviewed By: #dolphin, elvisangelaccio Subscribers: broulik, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D13749 --- src/settings/viewmodes/dolphinfontrequester.cpp | 6 +++--- src/settings/viewmodes/dolphinfontrequester.h | 4 ++-- src/settings/viewmodes/viewsettingstab.cpp | 14 +++++++------- src/settings/viewmodes/viewsettingstab.h | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/settings/viewmodes') diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index 0a9eb166c..ff42e39aa 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -19,9 +19,9 @@ #include "dolphinfontrequester.h" -#include #include +#include #include #include #include @@ -37,10 +37,10 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) : QHBoxLayout* topLayout = new QHBoxLayout(this); topLayout->setMargin(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")); - connect(m_modeCombo, static_cast(&KComboBox::activated), + connect(m_modeCombo, static_cast(&QComboBox::activated), this, &DolphinFontRequester::changeMode); m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this); diff --git a/src/settings/viewmodes/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h index 6f1b8400e..ac7ef222a 100644 --- a/src/settings/viewmodes/dolphinfontrequester.h +++ b/src/settings/viewmodes/dolphinfontrequester.h @@ -23,7 +23,7 @@ #include #include -class KComboBox; +class QComboBox; class QPushButton; /** @@ -65,7 +65,7 @@ private slots: void changeMode(int index); private: - KComboBox* m_modeCombo; + QComboBox* m_modeCombo; QPushButton* m_chooseFontButton; Mode m_mode; diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 85af5b083..3971c8ed8 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -25,11 +25,11 @@ #include "dolphinfontrequester.h" #include "views/zoomlevelinfo.h" -#include #include #include #include +#include #include #include #include @@ -89,14 +89,14 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : switch (m_mode) { case IconsMode: { QLabel* widthLabel = new QLabel(i18nc("@label:listbox", "Width:"), textGroup); - m_widthBox = new KComboBox(textGroup); + m_widthBox = new QComboBox(textGroup); m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Small")); m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Medium")); m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Large")); m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Huge")); QLabel* maxLinesLabel = new QLabel(i18nc("@label:listbox", "Maximum lines:"), textGroup); - m_maxLinesBox = new KComboBox(textGroup); + m_maxLinesBox = new QComboBox(textGroup); m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "Unlimited")); m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "1")); m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "2")); @@ -112,7 +112,7 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : } case CompactMode: { QLabel* maxWidthLabel = new QLabel(i18nc("@label:listbox", "Maximum width:"), textGroup); - m_widthBox = new KComboBox(textGroup); + m_widthBox = new QComboBox(textGroup); m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Unlimited")); m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Small")); m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Medium")); @@ -144,11 +144,11 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : switch (m_mode) { case IconsMode: - connect(m_widthBox, static_cast(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); - connect(m_maxLinesBox, static_cast(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); + connect(m_widthBox, static_cast(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); + connect(m_maxLinesBox, static_cast(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); break; case CompactMode: - connect(m_widthBox, static_cast(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); + connect(m_widthBox, static_cast(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); break; case DetailsMode: connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed); diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h index 0c1b8a3b5..fff882e5e 100644 --- a/src/settings/viewmodes/viewsettingstab.h +++ b/src/settings/viewmodes/viewsettingstab.h @@ -25,7 +25,7 @@ #include class DolphinFontRequester; -class KComboBox; +class QComboBox; class QCheckBox; class QSlider; @@ -69,8 +69,8 @@ private: QSlider* m_previewSizeSlider; DolphinFontRequester* m_fontRequester; - KComboBox* m_widthBox; - KComboBox* m_maxLinesBox; + QComboBox* m_widthBox; + QComboBox* m_maxLinesBox; QCheckBox* m_expandableFolders; }; -- cgit v1.3