From 321f477902e107ec76e2ec72d177964ecb4ebc83 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 12 Aug 2026 19:11:10 +0000 Subject: [PATCH 1/2] Qt4: replace QComboBox::currentData() with itemData(currentIndex(), role) QComboBox::currentData() was added in Qt 5.2; Qt4 only has itemData(). itemData(currentIndex(), role) is equivalent and exists in Qt4/5/6 alike, so this needs no version gating. --- src/dialog/NewProfileDialog.cpp | 2 +- src/dialog/editdialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialog/NewProfileDialog.cpp b/src/dialog/NewProfileDialog.cpp index 0a0c461..4597b55 100644 --- a/src/dialog/NewProfileDialog.cpp +++ b/src/dialog/NewProfileDialog.cpp @@ -147,7 +147,7 @@ void NewProfileDialog::on_buttonBox_accepted() auto ss{ std::make_unique() }; ss->set_label(ui->lineEditName->text()); ss->set_server_gateway(ui->lineEditGateway->text()); - ss->set_protocol_name(ui->protocolComboBox->currentData(ROLE_PROTOCOL_NAME).toString()); + ss->set_protocol_name(ui->protocolComboBox->itemData(ui->protocolComboBox->currentIndex(), ROLE_PROTOCOL_NAME).toString()); ss->save(); accept(); diff --git a/src/dialog/editdialog.cpp b/src/dialog/editdialog.cpp index 4583494..c22d0a5 100644 --- a/src/dialog/editdialog.cpp +++ b/src/dialog/editdialog.cpp @@ -285,7 +285,7 @@ void EditDialog::on_buttonBox_accepted() ss->set_token_type(-1); } - ss->set_protocol_name(ui->protocolComboBox->currentData(ROLE_PROTOCOL_NAME).toString()); + ss->set_protocol_name(ui->protocolComboBox->itemData(ui->protocolComboBox->currentIndex(), ROLE_PROTOCOL_NAME).toString()); ss->set_interface_name(ui->interfaceNameEdit->text()); ss->set_vpnc_script_filename(ui->vpncScriptEdit->text()); -- 2.43.0