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

Qt 5.12 deprecation fixes (#1003)

Browse Source
This commit is contained in:
Malte Langkabel
2020-08-04 18:13:18 +02:00
committed by GitHub
parent ca890978ab
commit e946c475c4
43 changed files with 190 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/utility/utilityApp.cpp
+25 -37
View File
@@ -57,7 +57,10 @@ std::set<QProcess*> s_runningProcesses;
} // namespace utility
std::pair<int, std::string> utility::executeProcess(
const std::string& command, const FilePath& workingDirectory, const int timeout)
const std::wstring& commandPath,
const std::vector<std::wstring>& commandArguments,
const FilePath& workingDirectory,
const int timeout)
{
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
@@ -67,6 +70,12 @@ std::pair<int, std::string> utility::executeProcess(
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
QString command = QString::fromStdWString(commandPath);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
envlist.replaceInStrings(
@@ -76,7 +85,7 @@ std::pair<int, std::string> utility::executeProcess(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command.c_str());
process.start(command);
s_runningProcesses.insert(&process);
}
@@ -96,7 +105,10 @@ std::pair<int, std::string> utility::executeProcess(
}
std::string utility::executeProcessUntilNoOutput(
const std::string& command, const FilePath& workingDirectory, const int waitTime)
const std::wstring& commandPath,
const std::vector<std::wstring>& commandArguments,
const FilePath& workingDirectory,
const int waitTime)
{
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
@@ -106,6 +118,12 @@ std::string utility::executeProcessUntilNoOutput(
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
QString command = QString::fromStdWString(commandPath);
for (const std::wstring& commandArgument: commandArguments)
{
command += QString::fromStdWString(L" " + commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
envlist.replaceInStrings(
@@ -115,7 +133,7 @@ std::string utility::executeProcessUntilNoOutput(
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command.c_str());
process.start(command);
s_runningProcesses.insert(&process);
}
@@ -161,9 +179,7 @@ int utility::executeProcessAndGetExitCode(
QProcess process;
QObject::connect(
&process,
&QProcess::errorOccurred,
[&finished, errorMessage, commandPath](QProcess::ProcessError error) {
&process, &QProcess::errorOccurred, [&finished, errorMessage](QProcess::ProcessError error) {
finished = true;
if (errorMessage != nullptr)
{
@@ -205,7 +221,7 @@ int utility::executeProcessAndGetExitCode(
QString command = QString::fromStdWString(commandPath);
for (const std::wstring& commandArgument: commandArguments)
{
command += " " + QString::fromStdWString(commandArgument);
command += QString::fromStdWString(L" " + commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
@@ -276,23 +292,6 @@ int utility::getIdealThreadCount()
return std::max(1, threadCount);
}
OsType utility::getOsType()
{
if (QSysInfo::windowsVersion() != QSysInfo::WV_None)
{
return OS_WINDOWS;
}
else if (QSysInfo::macVersion() != QSysInfo::MV_None)
{
return OS_MAC;
}
else
{
return OS_LINUX;
}
return OS_UNKNOWN;
}
std::string utility::getOsTypeString()
{
// WARNING: Don't change these string. The server API relies on them.
@@ -308,15 +307,4 @@ std::string utility::getOsTypeString()
break;
}
return "unknown";
}
ApplicationArchitectureType utility::getApplicationArchitectureType()
{
#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64) || \
defined(WIN64)
return APPLICATION_ARCHITECTURE_X86_64;
#else
return APPLICATION_ARCHITECTURE_X86_32;
#endif
return APPLICATION_ARCHITECTURE_UNKNOWN;
}
}