diff --git a/kate/kateconfigdialog.h b/kate/kateconfigdialog.h --- a/kate/kateconfigdialog.h +++ b/kate/kateconfigdialog.h @@ -31,10 +31,10 @@ #include class QCheckBox; +class QComboBox; class QSpinBox; class KateMainWindow; class KPluralHandlingSpinBox; -class KComboBox; namespace Ui { class SessionConfigWidget; @@ -84,7 +84,7 @@ QCheckBox *m_modCloseAfterLast; QCheckBox *m_saveMetaInfos; KPluralHandlingSpinBox *m_daysMetaInfos; - KComboBox * m_cmbQuickOpenMatchMode; + QComboBox * m_cmbQuickOpenMatchMode; // Sessions Page Ui::SessionConfigWidget *sessionConfigUi; diff --git a/kate/kateconfigdialog.cpp b/kate/kateconfigdialog.cpp --- a/kate/kateconfigdialog.cpp +++ b/kate/kateconfigdialog.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include KateConfigDialog::KateConfigDialog(KateMainWindow *parent, KTextEditor::View *view) : KPageDialog(parent) @@ -153,14 +153,14 @@ hlayout = new QHBoxLayout(buttonGroup); label = new QLabel(i18n("&Match Mode:"), buttonGroup); hlayout->addWidget(label); - m_cmbQuickOpenMatchMode = new KComboBox(buttonGroup); + m_cmbQuickOpenMatchMode = new QComboBox(buttonGroup); hlayout->addWidget(m_cmbQuickOpenMatchMode); label->setBuddy(m_cmbQuickOpenMatchMode); m_cmbQuickOpenMatchMode->addItem(i18n("Filename"), QVariant(KateQuickOpenModel::Columns::FileName)); m_cmbQuickOpenMatchMode->addItem(i18n("Filepath"), QVariant(KateQuickOpenModel::Columns::FilePath)); m_cmbQuickOpenMatchMode->setCurrentIndex(m_cmbQuickOpenMatchMode->findData(m_mainWindow->quickOpenMatchMode())); m_mainWindow->setQuickOpenMatchMode(m_cmbQuickOpenMatchMode->currentData().toInt()); - connect(m_cmbQuickOpenMatchMode, static_cast(&KComboBox::currentIndexChanged), this, &KateConfigDialog::slotChanged); + connect(m_cmbQuickOpenMatchMode, static_cast(&QComboBox::currentIndexChanged), this, &KateConfigDialog::slotChanged); layout->addWidget(buttonGroup); layout->addStretch(1); // :-] works correct without autoadd