diff options
author | hjk <hjk121@nokiamail.com> | 2014-10-24 10:28:28 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-11-03 09:31:28 +0100 |
commit | a439483d704113286370e7e93e0e6bc16199d8ab (patch) | |
tree | 783c9d122917a01025e80fb9a6b8e558f33f00a3 /src/plugins/qtsupport | |
parent | 1e9b561cae81cb5d90922a094135930529ae0446 (diff) | |
download | qt-creator-a439483d704113286370e7e93e0e6bc16199d8ab.tar.gz |
Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible
Faster.
Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/qtsupport')
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 17 | ||||
-rw-r--r-- | src/plugins/qtsupport/exampleslistmodel.cpp | 2 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 423f79da1c..0acdc2adfb 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1016,35 +1016,30 @@ void BaseQtVersion::updateVersionInfo() const // Now check for a qt that is configured with a prefix but not installed QString installDir = qmakeProperty(m_versionInfo, "QT_HOST_BINS"); if (!installDir.isNull()) { - QFileInfo fi(installDir); - if (!fi.exists()) + if (!QFileInfo::exists(installDir)) m_installed = false; } // Framework builds for Qt 4.8 don't use QT_INSTALL_HEADERS // so we don't check on mac if (!HostOsInfo::isMacHost()) { if (!qtHeaderData.isNull()) { - const QFileInfo fi(qtHeaderData); - if (!fi.exists()) + if (!QFileInfo::exists(qtHeaderData)) m_installed = false; } } const QString qtInstallDocs = qmakeProperty(m_versionInfo, "QT_INSTALL_DOCS"); if (!qtInstallDocs.isNull()) { - const QFileInfo fi(qtInstallDocs); - if (fi.exists()) + if (QFileInfo::exists(qtInstallDocs)) m_hasDocumentation = true; } const QString qtInstallExamples = qmakeProperty(m_versionInfo, "QT_INSTALL_EXAMPLES"); if (!qtInstallExamples.isNull()) { - const QFileInfo fi(qtInstallExamples); - if (fi.exists()) + if (QFileInfo::exists(qtInstallExamples)) m_hasExamples = true; } const QString qtInstallDemos = qmakeProperty(m_versionInfo, "QT_INSTALL_DEMOS"); if (!qtInstallDemos.isNull()) { - const QFileInfo fi(qtInstallDemos); - if (fi.exists()) + if (QFileInfo::exists(qtInstallDemos)) m_hasDemos = true; } m_qtVersionString = qmakeProperty(m_versionInfo, "QT_VERSION"); @@ -1406,7 +1401,7 @@ FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<QString, QString> &ver QString possibleFullPath = QString::fromLocal8Bit(temp.at(1).trimmed().constData()); // We sometimes get a mix of different slash styles here... possibleFullPath = possibleFullPath.replace(QLatin1Char('\\'), QLatin1Char('/')); - if (QFileInfo(possibleFullPath).exists()) // Only if the path exists + if (QFileInfo::exists(possibleFullPath)) // Only if the path exists mkspecFullPath = FileName::fromUserInput(possibleFullPath); } break; diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 653780a299..45b46ff01f 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -272,7 +272,7 @@ static bool isValidExampleOrDemo(ExampleItem &item) doesn't have any namespace */ QString reason; bool ok = true; - if (!item.hasSourceCode || !QFileInfo(item.projectPath).exists()) { + if (!item.hasSourceCode || !QFileInfo::exists(item.projectPath)) { ok = false; reason = QString::fromLatin1("projectPath \"%1\" empty or does not exist").arg(item.projectPath); } else if (item.imageUrl.startsWith(invalidPrefix) || !QUrl(item.imageUrl).isValid()) { |