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

Qnx: Some style fixes

Browse Source 
Change-Id: I90e9bbd0bfb92f9804c38bb143b8d0690ddb8991
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-29 17:55:46 +02:00
parent c75c6f342e
commit 2014bf472d
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/qnx/qnxutils.cpp
View File

@@ -41,15 +41,15 @@
#include <QApplication> #include <QApplication>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qnx; using namespace Utils;
using namespace Qnx::Internal;
namespace Qnx {
namespace Internal {
namespace {
const char *EVAL_ENV_VARS[] = { const char *EVAL_ENV_VARS[] = {
"QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "QNX_CONFIGURATION_EXCLUSIVE", "QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "QNX_CONFIGURATION_EXCLUSIVE",
"MAKEFLAGS", "LD_LIBRARY_PATH", "PATH", "QDE", "CPUVARDIR", "PYTHONPATH" "MAKEFLAGS", "LD_LIBRARY_PATH", "PATH", "QDE", "CPUVARDIR", "PYTHONPATH"
}; };
}
QString QnxUtils::cpuDirFromAbi(const Abi &abi) QString QnxUtils::cpuDirFromAbi(const Abi &abi)
{ {
@@ -79,18 +79,17 @@ QString QnxUtils::cpuDirShortDescription(const QString &cpuDir)
return cpuDir; return cpuDir;
} }
Utils::EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName) EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName)
{ {
Utils::EnvironmentItems items; EnvironmentItems items;
if (!QFileInfo::exists(fileName)) if (!QFileInfo::exists(fileName))
return items; return items;
const bool isWindows = Utils::HostOsInfo::isWindowsHost(); const bool isWindows = HostOsInfo::isWindowsHost();
// locking creating sdp-env file wrapper script // locking creating sdp-env file wrapper script
Utils::TemporaryFile tmpFile(QString::fromLatin1("sdp-env-eval-XXXXXX") TemporaryFile tmpFile("sdp-env-eval-XXXXXX" + QString::fromLatin1(isWindows ? ".bat" : ".sh"));
+ QString::fromLatin1(isWindows ? ".bat" : ".sh"));
if (!tmpFile.open()) if (!tmpFile.open())
return items; return items;
tmpFile.setTextModeEnabled(true); tmpFile.setTextModeEnabled(true);
@@ -98,11 +97,11 @@ Utils::EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileN
// writing content to wrapper script // writing content to wrapper script
QTextStream fileContent(&tmpFile); QTextStream fileContent(&tmpFile);
if (isWindows) if (isWindows)
fileContent << QLatin1String("@echo off\n") fileContent << "@echo off\n"
<< QLatin1String("call ") << fileName << QLatin1Char('\n'); << "call " << fileName << '\n';
else else
fileContent << QLatin1String("#!/bin/bash\n") fileContent << "#!/bin/bash\n"
<< QLatin1String(". ") << fileName << QLatin1Char('\n'); << ". " << fileName << '\n';
QString linePattern = QString::fromLatin1(isWindows ? "echo %1=%%1%" : "echo %1=$%1"); QString linePattern = QString::fromLatin1(isWindows ? "echo %1=%%1%" : "echo %1=$%1");
for (int i = 0, len = sizeof(EVAL_ENV_VARS) / sizeof(const char *); i < len; ++i) for (int i = 0, len = sizeof(EVAL_ENV_VARS) / sizeof(const char *); i < len; ++i)
fileContent << linePattern.arg(QLatin1String(EVAL_ENV_VARS[i])) << QLatin1Char('\n'); fileContent << linePattern.arg(QLatin1String(EVAL_ENV_VARS[i])) << QLatin1Char('\n');
@@ -138,7 +137,7 @@ Utils::EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileN
continue; continue;
QString var = line.left(equalIndex); QString var = line.left(equalIndex);
QString value = line.mid(equalIndex + 1); QString value = line.mid(equalIndex + 1);
items.append(Utils::EnvironmentItem(var, value)); items.append(EnvironmentItem(var, value));
} }
return items; return items;
@@ -148,7 +147,7 @@ QString QnxUtils::envFilePath(const QString &sdpPath)
{ {
QDir sdp(sdpPath); QDir sdp(sdpPath);
QStringList entries; QStringList entries;
if (Utils::HostOsInfo::isWindowsHost()) if (HostOsInfo::isWindowsHost())
entries = sdp.entryList(QStringList(QLatin1String("*-env.bat"))); entries = sdp.entryList(QStringList(QLatin1String("*-env.bat")));
else else
entries = sdp.entryList(QStringList(QLatin1String("*-env.sh"))); entries = sdp.entryList(QStringList(QLatin1String("*-env.sh")));
@@ -162,7 +161,7 @@ QString QnxUtils::envFilePath(const QString &sdpPath)
QString QnxUtils::defaultTargetVersion(const QString &sdpPath) QString QnxUtils::defaultTargetVersion(const QString &sdpPath)
{ {
foreach (const ConfigInstallInformation &sdpInfo, installedConfigs()) { foreach (const ConfigInstallInformation &sdpInfo, installedConfigs()) {
if (!sdpInfo.path.compare(sdpPath, Utils::HostOsInfo::fileNameCaseSensitivity())) if (!sdpInfo.path.compare(sdpPath, HostOsInfo::fileNameCaseSensitivity()))
return sdpInfo.version; return sdpInfo.version;
} }
@@ -212,14 +211,13 @@ QList<ConfigInstallInformation> QnxUtils::installedConfigs(const QString &config
return sdpList; return sdpList;
} }
Utils::EnvironmentItems QnxUtils::qnxEnvironment(const QString &sdpPath) EnvironmentItems QnxUtils::qnxEnvironment(const QString &sdpPath)
{ {
return qnxEnvironmentFromEnvFile(envFilePath(sdpPath)); return qnxEnvironmentFromEnvFile(envFilePath(sdpPath));
} }
QList<QnxTarget> QnxUtils::findTargets(const Utils::FilePath &basePath) QList<QnxTarget> QnxUtils::findTargets(const FilePath &basePath)
{ {
using namespace Utils;
QList<QnxTarget> result; QList<QnxTarget> result;
QDirIterator iterator(basePath.toString()); QDirIterator iterator(basePath.toString());
@@ -261,3 +259,6 @@ Abis QnxUtils::convertAbis(const Abis &abis)
{ {
return Utils::transform(abis, &QnxUtils::convertAbi); return Utils::transform(abis, &QnxUtils::convertAbi);
} }
} // Internal
} // Qnx