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

src: Migrate QProcess::start() to QStringList (#1107)

Browse Source 
The non-QStringList variant of QProcess::start() was removed in Qt 5.15.
The adapted method handles escaping of the arguments, which simplifies
code in some locations.
This commit is contained in:
Frédéric Simonis
2020-11-18 15:45:38 +01:00
committed by GitHub
parent 4277bcc47d
commit 8b8c186697
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/indexer/TaskBuildIndex.cpp
+4 -4
View File
@@ -188,16 +188,16 @@ void TaskBuildIndex::runIndexerProcess(int processId, const std::wstring& logFil
return;
}
const std::wstring commandPath = L"\"" + indexerProcessPath.wstr() + L"\"";
const std::wstring commandPath = indexerProcessPath.wstr();
std::vector<std::wstring> commandArguments;
commandArguments.push_back(std::to_wstring(processId));
commandArguments.push_back(utility::decodeFromUtf8(m_appUUID));
commandArguments.push_back(L"\"" + AppPath::getSharedDataPath().getAbsolute().wstr() + L"\"");
commandArguments.push_back(L"\"" + UserPaths::getUserDataPath().getAbsolute().wstr() + L"\"");
commandArguments.push_back(AppPath::getSharedDataPath().getAbsolute().wstr());
commandArguments.push_back(UserPaths::getUserDataPath().getAbsolute().wstr());
if (!logFilePath.empty())
{
commandArguments.push_back(L"\"" + logFilePath + L"\"");
commandArguments.push_back(logFilePath);
}
int result = 1;
src/lib_gui/utility/utilityApp.cpp
+16 -15
View File
@@ -48,6 +48,16 @@ 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
@@ -71,10 +81,7 @@ std::pair<int, std::string> utility::executeProcess(
}
QString command = QString::fromStdWString(commandPath);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QStringList arguments = toQStringList(commandArguments);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
@@ -85,7 +92,7 @@ std::pair<int, std::string> utility::executeProcess(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command);
process.start(command, arguments);
s_runningProcesses.insert(&process);
}
@@ -119,10 +126,7 @@ std::string utility::executeProcessUntilNoOutput(
}
QString command = QString::fromStdWString(commandPath);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QStringList arguments = toQStringList(commandArguments);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
@@ -133,7 +137,7 @@ std::string utility::executeProcessUntilNoOutput(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command);
process.start(command, arguments);
s_runningProcesses.insert(&process);
}
@@ -219,10 +223,7 @@ int utility::executeProcessAndGetExitCode(
}
QString command = QString::fromStdWString(commandPath);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QStringList arguments = toQStringList(commandArguments);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
@@ -233,7 +234,7 @@ int utility::executeProcessAndGetExitCode(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command);
process.start(command, arguments);
s_runningProcesses.insert(&process);
}