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

Do not create a QFileInfo via Utils::FileName::toString()

Browse Source 
Use Utils::FileName::toFileInfo() instead.

Change-Id: I63615b0e4ce1dd2e32d5f2b488710a55b8507d34
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-29 18:03:28 +01:00
parent 5d7f5a2a32
commit 406d231f1b
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidqtversionfactory.cpp
View File

@@ -66,7 +66,7 @@ int AndroidQtVersionFactory::priority() const
QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
{ {
QFileInfo fi(qmakePath.toString()); QFileInfo fi = qmakePath.toFileInfo();
if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0; return 0;
if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android")) if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))

2
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -296,7 +296,7 @@ void UpdateIncludeDependenciesVisitor::collectElementPaths(const ProjectExplorer
{ {
foreach (const ProjectExplorer::FileNode *fileNode, folderNode->fileNodes()) { foreach (const ProjectExplorer::FileNode *fileNode, folderNode->fileNodes()) {
QString elementName = qmt::NameController::convertFileNameToElementName(fileNode->filePath().toString()); QString elementName = qmt::NameController::convertFileNameToElementName(fileNode->filePath().toString());
QFileInfo fileInfo(fileNode->filePath().toString()); QFileInfo fileInfo = fileNode->filePath().toFileInfo();
QString nodePath = fileInfo.path(); QString nodePath = fileInfo.path();
QStringList elementsPath = qmt::NameController::buildElementsPath(nodePath, false); QStringList elementsPath = qmt::NameController::buildElementsPath(nodePath, false);
filePathsMap->insertMulti(elementName, Node(fileNode->filePath().toString(), elementsPath)); filePathsMap->insertMulti(elementName, Node(fileNode->filePath().toString(), elementsPath));

2
src/plugins/modeleditor/pxnodeutilities.cpp
View File

@@ -76,7 +76,7 @@ QString PxNodeUtilities::calcRelativePath(const ProjectExplorer::Node *node,
switch (node->nodeType()) { switch (node->nodeType()) {
case ProjectExplorer::FileNodeType: case ProjectExplorer::FileNodeType:
{ {
QFileInfo fileInfo(node->filePath().toString()); QFileInfo fileInfo = node->filePath().toFileInfo();
nodePath = fileInfo.path(); nodePath = fileInfo.path();
break; break;
} }

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

@@ -381,7 +381,7 @@ QIcon Kit::icon(const FileName &path)
if (path == FileName::fromLatin1(":///DESKTOP///")) if (path == FileName::fromLatin1(":///DESKTOP///"))
return qApp->style()->standardIcon(QStyle::SP_ComputerIcon); return qApp->style()->standardIcon(QStyle::SP_ComputerIcon);
QFileInfo fi(path.toString()); QFileInfo fi = path.toFileInfo();
if (fi.isFile() && fi.isReadable()) if (fi.isFile() && fi.isReadable())
return QIcon(path.toString()); return QIcon(path.toString());
return QIcon(); return QIcon();

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

@@ -730,7 +730,7 @@ void QtOptionsPageWidget::addQtDir()
if (qtVersion.isNull()) if (qtVersion.isNull())
return; return;
QFileInfo fi(qtVersion.toString()); QFileInfo fi = qtVersion.toFileInfo();
// should add all qt versions here ? // should add all qt versions here ?
if (BuildableHelperLibrary::isQtChooser(fi)) if (BuildableHelperLibrary::isQtChooser(fi))
qtVersion = FileName::fromString(BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget())); qtVersion = FileName::fromString(BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget()));