feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PublicKeyDeploymentDialog: Reuse new StringUtils methods

Browse Source 
Change-Id: I7f207a158b8a22ab94327d6c43b4c898b31cf646
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-02-03 18:39:07 +01:00
parent 738819ec71
commit 10295fc0fa
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/remotelinux/publickeydeploymentdialog.cpp
View File

@@ -11,6 +11,7 @@
#include <utils/filepath.h> #include <utils/filepath.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/stringutils.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -59,14 +60,11 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const IDevice::ConstPtr &de
const bool succeeded = d->m_process.result() == ProcessResult::FinishedWithSuccess; const bool succeeded = d->m_process.result() == ProcessResult::FinishedWithSuccess;
QString finalMessage; QString finalMessage;
if (!succeeded) { if (!succeeded) {
QString errorMessage = d->m_process.errorString(); const QString errorString = d->m_process.errorString();
if (errorMessage.isEmpty()) const QString errorMessage = errorString.isEmpty() ? d->m_process.cleanedStdErr()
errorMessage = d->m_process.cleanedStdErr(); : errorString;
if (errorMessage.endsWith('\n')) finalMessage = Utils::joinStrings({Tr::tr("Key deployment failed."),
errorMessage.chop(1); Utils::trimBack(errorMessage, '\n')}, '\n');
finalMessage = Tr::tr("Key deployment failed.");
if (!errorMessage.isEmpty())
finalMessage += '\n' + errorMessage;
} }
handleDeploymentDone(succeeded, finalMessage); handleDeploymentDone(succeeded, finalMessage);
}); });