diff options
| -rw-r--r-- | src/core/function/gpg/GpgKeyImportExporter.cpp | 4 | ||||
| -rw-r--r-- | src/ui/UserInterfaceUtils.cpp | 4 | ||||
| -rw-r--r-- | src/ui/UserInterfaceUtils.h | 4 | ||||
| -rw-r--r-- | src/ui/main_window/MainWindowSlotUI.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/function/gpg/GpgKeyImportExporter.cpp b/src/core/function/gpg/GpgKeyImportExporter.cpp index 55953cb5..2b4448de 100644 --- a/src/core/function/gpg/GpgKeyImportExporter.cpp +++ b/src/core/function/gpg/GpgKeyImportExporter.cpp @@ -49,11 +49,11 @@ auto GpgKeyImportExporter::ImportKey(const GFBuffer& in_buffer) if (in_buffer.Empty()) return {}; GpgData data_in(in_buffer); - auto err = CheckGpgError(gpgme_op_import(ctx_.DefaultContext(), data_in)); + auto err = CheckGpgError(gpgme_op_import(ctx_.BinaryContext(), data_in)); if (gpgme_err_code(err) != GPG_ERR_NO_ERROR) return {}; gpgme_import_result_t result; - result = gpgme_op_import_result(ctx_.DefaultContext()); + result = gpgme_op_import_result(ctx_.BinaryContext()); gpgme_import_status_t status = result->imports; auto import_info = SecureCreateSharedObject<GpgImportInformation>(result); while (status != nullptr) { diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp index 1d54c3cd..8f50636b 100644 --- a/src/ui/UserInterfaceUtils.cpp +++ b/src/ui/UserInterfaceUtils.cpp @@ -264,7 +264,7 @@ void CommonUtils::RaiseFailureMessageBox(QWidget *parent, GpgError err) { .arg(desc.second)); } -void CommonUtils::SlotImportKeys(QWidget *parent, const QString &in_buffer) { +void CommonUtils::SlotImportKeys(QWidget *parent, const QByteArray &in_buffer) { auto info = GpgKeyImportExporter::GetInstance().ImportKey(GFBuffer(in_buffer)); emit SignalKeyStatusUpdated(); @@ -310,7 +310,7 @@ void CommonUtils::SlotImportKeyFromKeyServer(QWidget *parent) { void CommonUtils::SlotImportKeyFromClipboard(QWidget *parent) { QClipboard *cb = QApplication::clipboard(); - SlotImportKeys(parent, cb->text(QClipboard::Clipboard)); + SlotImportKeys(parent, cb->text(QClipboard::Clipboard).toLatin1()); } void CommonUtils::SlotExecuteCommand( diff --git a/src/ui/UserInterfaceUtils.h b/src/ui/UserInterfaceUtils.h index ceb9fb5f..4f42db8c 100644 --- a/src/ui/UserInterfaceUtils.h +++ b/src/ui/UserInterfaceUtils.h @@ -215,7 +215,7 @@ class CommonUtils : public QWidget { void SignalRestartApplication(int); /** - * @brief + * @brief * */ void SignalFavoritesChanged(); @@ -228,7 +228,7 @@ class CommonUtils : public QWidget { * @param parent * @param in_buffer */ - void SlotImportKeys(QWidget* parent, const QString& in_buffer); + void SlotImportKeys(QWidget* parent, const QByteArray& in_buffer); /** * @brief diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp index 809a4af9..1fc4eb5c 100644 --- a/src/ui/main_window/MainWindowSlotUI.cpp +++ b/src/ui/main_window/MainWindowSlotUI.cpp @@ -52,7 +52,7 @@ void MainWindow::slot_start_wizard() { void MainWindow::slot_import_key_from_edit() { if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) return; CommonUtils::GetInstance()->SlotImportKeys( - this, edit_->CurTextPage()->GetTextPage()->toPlainText()); + this, edit_->CurTextPage()->GetTextPage()->toPlainText().toLatin1()); } void MainWindow::slot_open_key_management() { |