Commit 92f16b06 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile with qt5.15

parent 2f9600e6
......@@ -59,7 +59,7 @@ UrlConfigurationDialog::UrlConfigurationDialog(QWidget *parent)
mRemoteProtocolGroup->addButton(mUi.caldav, KDAV::CalDav);
mRemoteProtocolGroup->addButton(mUi.carddav, KDAV::CardDav);
mRemoteProtocolGroup->addButton(mUi.groupdav, KDAV::GroupDav);
connect(mRemoteProtocolGroup, QOverload<int, bool>::of(&QButtonGroup::buttonToggled), this, &UrlConfigurationDialog::onConfigChanged);
connect(mRemoteProtocolGroup, QOverload<QAbstractButton *, bool>::of(&QButtonGroup::buttonToggled), this, &UrlConfigurationDialog::onConfigChanged);
connect(mUi.remoteUrl, &KLineEdit::textChanged, this, &UrlConfigurationDialog::onConfigChanged);
connect(mUi.useDefaultCreds, &QRadioButton::toggled, this, &UrlConfigurationDialog::onConfigChanged);
connect(mUi.username, &KLineEdit::textChanged, this, &UrlConfigurationDialog::onConfigChanged);
......
......@@ -186,8 +186,8 @@ SetupServer::SetupServer(ImapResourceBase *parentResource, WId parent)
connect(m_ui->useDefaultIdentityCheck, &QCheckBox::toggled, this, &SetupServer::slotIdentityCheckboxChanged);
connect(m_ui->enableMailCheckBox, &QCheckBox::toggled, this, &SetupServer::slotMailCheckboxChanged);
connect(m_ui->safeImapGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SetupServer::slotEncryptionRadioChanged);
connect(m_ui->customSieveGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SetupServer::slotCustomSieveChanged);
connect(m_ui->safeImapGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked), this, &SetupServer::slotEncryptionRadioChanged);
connect(m_ui->customSieveGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked), this, &SetupServer::slotCustomSieveChanged);
connect(m_ui->showServerInfo, &QPushButton::pressed, this, &SetupServer::slotShowServerInfo);
readSettings();
......
......@@ -124,7 +124,7 @@ void AccountWidget::setupWidgets()
encryptionButtonGroup->addButton(encryptionTLS,
Transport::EnumEncryption::TLS);
connect(encryptionButtonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &AccountWidget::slotPopEncryptionChanged);
connect(encryptionButtonGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked), this, &AccountWidget::slotPopEncryptionChanged);
connect(intervalCheck, &QCheckBox::toggled, this, &AccountWidget::slotEnablePopInterval);
populateDefaultAuthenticationOptions();
......@@ -345,16 +345,19 @@ void AccountWidget::slotPipeliningClicked()
}
}
void AccountWidget::slotPopEncryptionChanged(int id)
void AccountWidget::slotPopEncryptionChanged(QAbstractButton *button)
{
qCDebug(POP3RESOURCE_LOG) << "setting port";
// adjust port
if (id == Transport::EnumEncryption::SSL || portEdit->value() == 995) {
portEdit->setValue((id == Transport::EnumEncryption::SSL) ? 995 : 110);
}
if (button) {
const int id = encryptionButtonGroup->id(button);
qCDebug(POP3RESOURCE_LOG) << "setting port";
// adjust port
if (id == Transport::EnumEncryption::SSL || portEdit->value() == 995) {
portEdit->setValue((id == Transport::EnumEncryption::SSL) ? 995 : 110);
}
qCDebug(POP3RESOURCE_LOG) << "port set ";
enablePopFeatures(); // removes invalid auth options from the combobox
qCDebug(POP3RESOURCE_LOG) << "port set ";
enablePopFeatures(); // removes invalid auth options from the combobox
}
}
void AccountWidget::slotCheckPopCapabilities()
......
......@@ -57,7 +57,7 @@ private Q_SLOTS:
void slotEnableLeaveOnServerSize(bool state);
void slotFilterOnServerClicked();
void slotPipeliningClicked();
void slotPopEncryptionChanged(int);
void slotPopEncryptionChanged(QAbstractButton *button);
void slotCheckPopCapabilities();
void slotPopCapabilities(const QVector<int> &);
void slotLeaveOnServerDaysChanged(int value);
......
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