ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: revert migration of QProcess::start() to QStringList (#1136)

Browse Source 
* Revert "src: Migrate QProcess::start() to QStringList (#1107)"

This reverts commit 8b8c186697.

* Revert "fix escaping in mvn path detector (necessary after 8b8c1866)"

This reverts commit fcd2f33304.
This commit is contained in:
Malte Langkabel
2021-02-08 11:20:02 +01:00
committed by GitHub
parent 220b8bad0b
commit a4e0296471
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/utility/utilityApp.cpp
+16 -17
View File
@@ -48,16 +48,6 @@ void logProcessStreams(QProcess& process, std::wstring& outputBuffer, std::wstri
errorBuffer = errorLines.back();
}
}
QStringList toQStringList(const std::vector<std::wstring>& strings)
{
QStringList result;
for (const std::wstring& next: strings)
{
result += QString::fromStdWString(next);
}
return result;
}
} // namespace
namespace utility
@@ -81,7 +71,10 @@ std::pair<int, std::string> utility::executeProcess(
}
QString command = QString::fromStdWString(commandPath);
QStringList arguments = toQStringList(commandArguments);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
@@ -92,7 +85,7 @@ std::pair<int, std::string> utility::executeProcess(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command, arguments);
process.start(command);
s_runningProcesses.insert(&process);
}
@@ -126,7 +119,10 @@ std::string utility::executeProcessUntilNoOutput(
}
QString command = QString::fromStdWString(commandPath);
QStringList arguments = toQStringList(commandArguments);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
@@ -137,7 +133,7 @@ std::string utility::executeProcessUntilNoOutput(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command, arguments);
process.start(command);
s_runningProcesses.insert(&process);
}
@@ -223,7 +219,10 @@ int utility::executeProcessAndGetExitCode(
}
QString command = QString::fromStdWString(commandPath);
QStringList arguments = toQStringList(commandArguments);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
@@ -234,7 +233,7 @@ int utility::executeProcessAndGetExitCode(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command, arguments);
process.start(command);
s_runningProcesses.insert(&process);
}
@@ -308,4 +307,4 @@ std::string utility::getOsTypeString()
break;
}
return "unknown";
}
}