Commit c2657842 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧 Committed by Laurent Montel
Browse files

Revert premature port of QComboBox::currentIndexChanged

CCMAIL: montel@kde.org
(cherry picked from commit 94df4238)
parent 433986d0
......@@ -89,11 +89,7 @@ FollowUpReminderSelectDateDialog::FollowUpReminderSelectDateDialog(QWidget *pare
formLayout->addRow(i18n("Store ToDo in:"), d->mCollectionCombobox);
connect(d->mDateComboBox->lineEdit(), &QLineEdit::textChanged, this, &FollowUpReminderSelectDateDialog::slotDateChanged);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->mCollectionCombobox, qOverload<int>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &FollowUpReminderSelectDateDialog::updateOkButton);
#else
connect(d->mCollectionCombobox, qOverload<int, const QString &>(&Akonadi::CollectionComboBox::currentIndexChanged), this, &FollowUpReminderSelectDateDialog::updateOkButton);
#endif
updateOkButton();
}
......
......@@ -73,26 +73,10 @@ ImageScalingWidget::ImageScalingWidget(QWidget *parent)
connect(d->ui->skipImageSizeLower, &QCheckBox::clicked, this, &ImageScalingWidget::changed);
connect(d->ui->imageSize, qOverload<int>(&QSpinBox::valueChanged), this, &ImageScalingWidget::changed);
connect(d->ui->pattern, &KLineEdit::textChanged, this, &ImageScalingWidget::changed);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->ui->CBMaximumWidth, qOverload<int>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#else
connect(d->ui->CBMaximumWidth, qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->ui->CBMaximumHeight, qOverload<int>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#else
connect(d->ui->CBMaximumHeight, qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->ui->CBMinimumWidth, qOverload<int>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#else
connect(d->ui->CBMinimumWidth, qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->ui->CBMinimumHeight, qOverload<int>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#else
connect(d->ui->CBMinimumHeight, qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this, &ImageScalingWidget::slotComboboxChanged);
#endif
connect(d->ui->WriteToImageFormat, qOverload<int>(&QComboBox::activated), this, &ImageScalingWidget::changed);
connect(d->ui->renameResizedImage, &QCheckBox::clicked, this, &ImageScalingWidget::changed);
connect(d->ui->renameResizedImage, &QCheckBox::clicked, d->ui->renameResizedImagePattern, &KLineEdit::setEnabled);
......
......@@ -208,11 +208,7 @@ void Widget::populateStatusFilterCombo()
d->mStatusFilterComboPopulationInProgress = true;
QComboBox *tagFilterComboBox = d->quickSearchLine->tagFilterComboBox();
d->mCurrentStatusFilterIndex = (tagFilterComboBox->currentIndex() != -1) ? tagFilterComboBox->currentIndex() : 0;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
disconnect(tagFilterComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &Widget::statusSelected);
#else
disconnect(tagFilterComboBox, qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this, &Widget::statusSelected);
#endif
tagFilterComboBox->clear();
......@@ -227,11 +223,7 @@ void Widget::addMessageTagItem(const QPixmap &icon, const QString &text, const Q
void Widget::setCurrentStatusFilterItem()
{
d->quickSearchLine->updateComboboxVisibility();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->quickSearchLine->tagFilterComboBox(), qOverload<int>(&QComboBox::currentIndexChanged), this, &Widget::statusSelected);
#else
connect(d->quickSearchLine->tagFilterComboBox(), qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this, &Widget::statusSelected);
#endif
d->quickSearchLine->tagFilterComboBox()->setCurrentIndex(d->mCurrentStatusFilterIndex >= d->quickSearchLine->tagFilterComboBox()->count() ? 0 : d->mCurrentStatusFilterIndex);
d->mStatusFilterComboPopulationInProgress = false;
}
......
......@@ -65,13 +65,8 @@ ConfigureWidget::ConfigureWidget(QWidget *parent)
MessageViewer::MessageViewerSettings::self()->shrinkQuotesItem()->whatsThis());
d->mSettingsUi->kcfg_ShowExpandQuotesMark->setWhatsThis(
MessageViewer::MessageViewerSettings::self()->showExpandQuotesMarkItem()->whatsThis());
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->mSettingsUi->overrideCharacterEncoding, qOverload<int>(&QComboBox::currentIndexChanged), this,
&ConfigureWidget::settingsChanged);
#else
connect(d->mSettingsUi->overrideCharacterEncoding, qOverload<int, const QString &>(&QComboBox::currentIndexChanged), this,
&ConfigureWidget::settingsChanged);
#endif
}
ConfigureWidget::~ConfigureWidget()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment