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

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 0a9eb166c10c3e748fcd4c07b8f952e15814f45d..ff42e39aa324b63c2d4e8a6455a7f15c7861b095 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -19,9 +19,9 @@
 
 #include "dolphinfontrequester.h"
 
-#include <KComboBox>
 #include <KLocalizedString>
 
+#include <QComboBox>
 #include <QFontDatabase>
 #include <QFontDialog>
 #include <QHBoxLayout>
@@ -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<void(KComboBox::*)(int)>(&KComboBox::activated),
+    connect(m_modeCombo, static_cast<void(QComboBox::*)(int)>(&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 6f1b8400eaa5fcaf13a57675c87b7727c5bfa523..ac7ef222a7235329d52c400c003baaca2b72648d 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.h
+++ b/src/settings/viewmodes/dolphinfontrequester.h
@@ -23,7 +23,7 @@
 #include <QFont>
 #include <QWidget>
 
-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 85af5b083674e4023aa324ab78a714945390577a..3971c8ed804fa4ff90662940f82a098d0caa40a0 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -25,11 +25,11 @@
 #include "dolphinfontrequester.h"
 #include "views/zoomlevelinfo.h"
 
-#include <KComboBox>
 #include <KLocalizedString>
 
 #include <QApplication>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QGroupBox>
 #include <QHelpEvent>
 #include <QLabel>
@@ -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<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
-        connect(m_maxLinesBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        connect(m_widthBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        connect(m_maxLinesBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
         break;
     case CompactMode:
-        connect(m_widthBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        connect(m_widthBox, static_cast<void(QComboBox::*)(int)>(&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 0c1b8a3b541eb5d79d15a45994dc485df8a6be40..fff882e5e2794806f349ad16ff081d169c3b50f5 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -25,7 +25,7 @@
 #include <QWidget>
 
 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;
 };
 

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 88dea041a8c0004816c5f06e9b559a4b91803869..f222879128d55bef4e2040253271b58707bf20f5 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -27,7 +27,6 @@
 #include "views/dolphinview.h"
 
 #include <KCollapsibleGroupBox>
-#include <KComboBox>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KWindowConfig>
@@ -38,6 +37,7 @@
 
 #include <QButtonGroup>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
@@ -89,7 +89,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     }
 
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
-    m_viewMode = new KComboBox(propsGrid);
+    m_viewMode = new QComboBox(propsGrid);
     m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView);
     m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView);
     m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView);
@@ -97,11 +97,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid);
     QWidget* sortingBox = new QWidget(propsGrid);
 
-    m_sortOrder = new KComboBox(sortingBox);
+    m_sortOrder = new QComboBox(sortingBox);
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
 
-    m_sorting = new KComboBox(sortingBox);
+    m_sorting = new QComboBox(sortingBox);
     const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
     foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
         m_sorting->addItem(info.translation, info.role);
@@ -178,11 +178,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     propsBoxLayout->addWidget(m_showHiddenFiles);
     propsBoxLayout->addWidget(additionalInfoBox);
 
-    connect(m_viewMode, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+    connect(m_viewMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &ViewPropertiesDialog::slotViewModeChanged);
-    connect(m_sorting, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+    connect(m_sorting, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &ViewPropertiesDialog::slotSortingChanged);
-    connect(m_sortOrder, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+    connect(m_sortOrder, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &ViewPropertiesDialog::slotSortOrderChanged);
     connect(m_sortFoldersFirst, &QCheckBox::clicked,
             this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index 80cddbf4eeb148f175a0c1c90db7f1e07436dff6..aabf21c90c85eed2f3d27c2b6db7a2ab2b04c77e 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -28,7 +28,7 @@
 class QCheckBox;
 class QListWidget;
 class QListWidgetItem;
-class KComboBox;
+class QComboBox;
 class QPushButton;
 class QRadioButton;
 class ViewProperties;
@@ -76,9 +76,9 @@ private:
     DolphinView* m_dolphinView;
     ViewProperties* m_viewProps;
 
-    KComboBox* m_viewMode;
-    KComboBox* m_sortOrder;
-    KComboBox* m_sorting;
+    QComboBox* m_viewMode;
+    QComboBox* m_sortOrder;
+    QComboBox* m_sorting;
     QCheckBox* m_sortFoldersFirst;
     QCheckBox* m_previewsShown;
     QCheckBox* m_showInGroups;