diff options
Diffstat (limited to 'src/ui/dialog/import_export/ExportKeyPackageDialog.cpp')
| -rw-r--r-- | src/ui/dialog/import_export/ExportKeyPackageDialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp index 762c79b7..5e6267da 100644 --- a/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp +++ b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp @@ -35,7 +35,7 @@ #include "ui_ExportKeyPackageDialog.h" GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog( - int channel, KeyIdArgsListPtr key_ids, QWidget* parent) + int channel, KeyIdArgsList key_ids, QWidget* parent) : GeneralDialog(typeid(ExportKeyPackageDialog).name(), parent), ui_(GpgFrontend::SecureCreateSharedObject<Ui_exportKeyPackageDialog>()), current_gpg_context_channel_(channel), @@ -98,16 +98,16 @@ GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog( // get suitable key ids auto keys = GpgKeyGetter::GetInstance(current_gpg_context_channel_) .GetKeys(key_ids_); - assert(std::all_of(keys->begin(), keys->end(), + assert(std::all_of(keys.begin(), keys.end(), [](const auto& key) { return key.IsGood(); })); auto keys_new_end = - std::remove_if(keys->begin(), keys->end(), [this](const auto& key) { + std::remove_if(keys.begin(), keys.end(), [this](const auto& key) { return ui_->noPublicKeyCheckBox->isChecked() && !key.IsPrivateKey(); }); - keys->erase(keys_new_end, keys->end()); + keys.erase(keys_new_end, keys.end()); - if (keys->empty()) { + if (keys.empty()) { QMessageBox::critical(this, tr("Error"), tr("No key is suitable to export.")); return; @@ -117,7 +117,7 @@ GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog( this, tr("Generating"), [this, keys](const OperaWaitingHd& op_hd) { KeyPackageOperator::GenerateKeyPackage( ui_->outputPathLabel->text(), ui_->nameValueLabel->text(), - current_gpg_context_channel_, *keys, passphrase_, + current_gpg_context_channel_, keys, passphrase_, ui_->includeSecretKeyCheckBox->isChecked(), [=](GFError err, const DataObjectPtr&) { // stop waiting |