From 28542b14c4df40c7a54bfcf65d7c725bd99fb3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Thu, 4 Jul 2024 18:03:17 +0200 Subject: cpp: Deprecate Error::asString and update users * lang/cpp/src/error.h (Error::asString): Mark as deprecated. * lang/cpp/src/context.cpp (operator<<), lang/cpp/src/editinteractor.cpp (edit_interactor_callback_impl), lang/cpp/tests/run-getkey.cpp (main), lang/cpp/tests/run-keylist.cpp (main), lang/cpp/tests/run-wkdlookup.cpp (main): Use Error::asStdString instead of Error::asString. -- GnuPG-bug-id: 7188 --- lang/cpp/tests/run-wkdlookup.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lang/cpp/tests/run-wkdlookup.cpp') diff --git a/lang/cpp/tests/run-wkdlookup.cpp b/lang/cpp/tests/run-wkdlookup.cpp index 4a3966b0..1e18c9a8 100644 --- a/lang/cpp/tests/run-wkdlookup.cpp +++ b/lang/cpp/tests/run-wkdlookup.cpp @@ -75,31 +75,31 @@ main (int argc, char **argv) Error err; auto ctx = std::unique_ptr{Context::createForEngine(AssuanEngine, &err)}; if (!ctx) { - std::cerr << "Failed to get context (Error: " << err.asString() << ")\n"; + std::cerr << "Failed to get context (Error: " << err.asStdString() << ")\n"; return -1; } const std::string dirmngrSocket = GpgME::dirInfo("dirmngr-socket"); if ((err = ctx->setEngineFileName(dirmngrSocket.c_str()))) { - std::cerr << "Failed to set engine file name (Error: " << err.asString() << ")\n"; + std::cerr << "Failed to set engine file name (Error: " << err.asStdString() << ")\n"; return -1; } if ((err = ctx->setEngineHomeDirectory(""))) { - std::cerr << "Failed to set engine home directory (Error: " << err.asString() << ")\n"; + std::cerr << "Failed to set engine home directory (Error: " << err.asStdString() << ")\n"; return -1; } // try to connect to dirmngr err = ctx->assuanTransact("GETINFO version"); if (err && err.code() != GPG_ERR_ASS_CONNECT_FAILED) { - std::cerr << "Failed to start assuan transaction (Error: " << err.asString() << ")\n"; + std::cerr << "Failed to start assuan transaction (Error: " << err.asStdString() << ")\n"; return -1; } if (err.code() == GPG_ERR_ASS_CONNECT_FAILED) { std::cerr << "Starting dirmngr ...\n"; auto spawnCtx = std::unique_ptr{Context::createForEngine(SpawnEngine, &err)}; if (!spawnCtx) { - std::cerr << "Failed to get context for spawn engine (Error: " << err.asString() << ")\n"; + std::cerr << "Failed to get context for spawn engine (Error: " << err.asStdString() << ")\n"; return -1; } @@ -120,7 +120,7 @@ main (int argc, char **argv) ignoreIO, ignoreIO, ignoreIO, Context::SpawnDetached); if (err) { - std::cerr << "Failed to start dirmngr (Error: " << err.asString() << ")\n"; + std::cerr << "Failed to start dirmngr (Error: " << err.asStdString() << ")\n"; return -1; } @@ -137,7 +137,7 @@ main (int argc, char **argv) const auto cmd = std::string{"WKD_GET "} + email; err = ctx->assuanTransact(cmd.c_str()); if (err && err.code() != GPG_ERR_NO_NAME && err.code() != GPG_ERR_NO_DATA) { - std::cerr << "Error: WKD_GET returned " << err.asString() << "\n"; + std::cerr << "Error: WKD_GET returned " << err.asStdString() << "\n"; return -1; } -- cgit v1.2.3