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

Utils: Remove FileName::isNull

Browse Source 
... and its uses in order to shrink the FileName interface.

Change-Id: I4b9a229d98ad53c4f189e381c89241981ddbed2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-10 11:37:22 +02:00
parent c1488bbc25
commit dd304fc824
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/fileutils.h
View File

@@ -97,7 +97,6 @@ public:
using QString::clear; using QString::clear;
using QString::isEmpty; using QString::isEmpty;
using QString::isNull;
private: private:
FileName(const QString &string); FileName(const QString &string);

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

@@ -71,7 +71,7 @@ Abi NimToolChain::targetAbi() const
bool NimToolChain::isValid() const bool NimToolChain::isValid() const
{ {
if (m_compilerCommand.isNull()) if (m_compilerCommand.isEmpty())
return false; return false;
QFileInfo fi = compilerCommand().toFileInfo(); QFileInfo fi = compilerCommand().toFileInfo();
return fi.isExecutable(); return fi.isExecutable();

2
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -329,7 +329,7 @@ QList<Abi> GccToolChain::supportedAbis() const
bool GccToolChain::isValid() const bool GccToolChain::isValid() const
{ {
if (m_compilerCommand.isNull()) if (m_compilerCommand.isEmpty())
return false; return false;
QFileInfo fi = compilerCommand().toFileInfo(); QFileInfo fi = compilerCommand().toFileInfo();

12
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -259,16 +259,16 @@ bool QbsBuildStep::hasCustomInstallRoot() const
Utils::FileName QbsBuildStep::installRoot(VariableHandling variableHandling) const Utils::FileName QbsBuildStep::installRoot(VariableHandling variableHandling) const
{ {
Utils::FileName root = Utils::FileName::fromString(qbsConfiguration(variableHandling) const QString root =
.value(Constants::QBS_INSTALL_ROOT_KEY).toString()); qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString();
if (root.isNull()) { if (!root.isNull())
return Utils::FileName::fromString(root);
const QbsBuildConfiguration * const bc const QbsBuildConfiguration * const bc
= static_cast<QbsBuildConfiguration *>(buildConfiguration()); = static_cast<QbsBuildConfiguration *>(buildConfiguration());
root = bc->buildDirectory().appendPath(bc->configurationName()) return bc->buildDirectory().appendPath(bc->configurationName())
.appendPath(qbs::InstallOptions::defaultInstallRoot()); .appendPath(qbs::InstallOptions::defaultInstallRoot());
} }
return root;
}
int QbsBuildStep::maxJobs() const int QbsBuildStep::maxJobs() const
{ {

4
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -549,7 +549,7 @@ void QtOptionsPageWidget::addQtDir()
BuildableHelperLibrary::filterForQmakeFileDialog(), BuildableHelperLibrary::filterForQmakeFileDialog(),
0, 0,
QFileDialog::DontResolveSymlinks)); QFileDialog::DontResolveSymlinks));
if (qtVersion.isNull()) if (qtVersion.isEmpty())
return; return;
QFileInfo fi = qtVersion.toFileInfo(); QFileInfo fi = qtVersion.toFileInfo();
@@ -621,7 +621,7 @@ void QtOptionsPageWidget::editPath()
BuildableHelperLibrary::filterForQmakeFileDialog(), BuildableHelperLibrary::filterForQmakeFileDialog(),
0, 0,
QFileDialog::DontResolveSymlinks)); QFileDialog::DontResolveSymlinks));
if (qtVersion.isNull()) if (qtVersion.isEmpty())
return; return;
BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qtVersion); BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qtVersion);
if (!version) if (!version)