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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/nim/project/nimtoolchain.cpp
View File

@@ -45,7 +45,7 @@ NimToolChain::NimToolChain()
NimToolChain::NimToolChain(Core::Id typeId)
: ToolChain(typeId)
, m_compilerCommand(FileName())
, m_compilerCommand(FilePath())
, m_version(std::make_tuple(-1,-1,-1))
{
setLanguage(Constants::C_NIMLANGUAGE_ID);
@@ -102,7 +102,7 @@ ToolChain::BuiltInHeaderPathsRunner NimToolChain::createBuiltInHeaderPathsRunner
return ToolChain::BuiltInHeaderPathsRunner();
}
HeaderPaths NimToolChain::builtInHeaderPaths(const QStringList &, const FileName &) const
HeaderPaths NimToolChain::builtInHeaderPaths(const QStringList &, const FilePath &) const
{
return {};
}
@@ -113,18 +113,18 @@ void NimToolChain::addToEnvironment(Environment &env) const
env.prependOrSetPath(compilerCommand().parentDir().toString());
}
FileName NimToolChain::makeCommand(const Environment &env) const
FilePath NimToolChain::makeCommand(const Environment &env) const
{
const FileName tmp = env.searchInPath("make");
return tmp.isEmpty() ? FileName::fromString("make") : tmp;
const FilePath tmp = env.searchInPath("make");
return tmp.isEmpty() ? FilePath::fromString("make") : tmp;
}
FileName NimToolChain::compilerCommand() const
FilePath NimToolChain::compilerCommand() const
{
return m_compilerCommand;
}
void NimToolChain::setCompilerCommand(const FileName &compilerCommand)
void NimToolChain::setCompilerCommand(const FilePath &compilerCommand)
{
m_compilerCommand = compilerCommand;
parseVersion(compilerCommand, m_version);
@@ -161,11 +161,11 @@ bool NimToolChain::fromMap(const QVariantMap &data)
{
if (!ToolChain::fromMap(data))
return false;
setCompilerCommand(FileName::fromString(data.value(Constants::C_NIMTOOLCHAIN_COMPILER_COMMAND_KEY).toString()));
setCompilerCommand(FilePath::fromString(data.value(Constants::C_NIMTOOLCHAIN_COMPILER_COMMAND_KEY).toString()));
return true;
}
bool NimToolChain::parseVersion(const FileName &path, std::tuple<int, int, int> &result)
bool NimToolChain::parseVersion(const FilePath &path, std::tuple<int, int, int> &result)
{
QProcess process;
process.start(path.toString(), {"--version"});