diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index d06f8542fc5..c911a98860d 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -144,7 +144,7 @@ bool FileUtils::copyRecursively(const FileName &srcFilePath, const FileName &tgt { QFileInfo srcFileInfo = srcFilePath.toFileInfo(); if (srcFileInfo.isDir()) { - if (!tgtFilePath.toFileInfo().exists()) { + if (!tgtFilePath.exists()) { QDir targetDir(tgtFilePath.toString()); targetDir.cdUp(); if (!targetDir.mkdir(tgtFilePath.toFileInfo().fileName())) { @@ -551,6 +551,13 @@ QString FileName::toUserOutput() const return QDir::toNativeSeparators(toString()); } +/// \returns a bool indicating whether a file with this +/// FileName exists. +bool FileName::exists() const +{ + return QFileInfo::exists(*this); +} + /// Find the parent directory of a given directory. /// Returns an empty FileName if the current directory is already diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 6240700c24c..4e2403322ba 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -72,6 +72,7 @@ public: static FileName fromUserInput(const QString &filename); QString toString() const; QString toUserOutput() const; + bool exists() const; FileName parentDir() const; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index cf9cd65fd94..508f943e8e3 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -384,7 +384,7 @@ FileName AndroidConfig::androidToolPath() const // Java and I've made some progress on it. So if android.exe exists, return that instead. FileName path = m_sdkLocation; path.appendPath(QLatin1String("tools/android" QTC_HOST_EXE_SUFFIX)); - if (path.toFileInfo().exists()) + if (path.exists()) return path; path = m_sdkLocation; return path.appendPath(QLatin1String("tools/android" ANDROID_BAT_SUFFIX)); @@ -1299,7 +1299,7 @@ void AndroidConfigurations::load() void AndroidConfigurations::updateAndroidDevice() { DeviceManager * const devMgr = DeviceManager::instance(); - if (m_instance->m_config.adbToolPath().toFileInfo().exists()) + if (m_instance->m_config.adbToolPath().exists()) devMgr->addDevice(IDevice::Ptr(new Internal::AndroidDevice)); else if (devMgr->find(Constants::ANDROID_DEVICE_ID)) devMgr->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID)); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 84f1b612f58..c0ecde44843 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -587,7 +587,7 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const bool AndroidManager::checkForQt51Files(Utils::FileName fileName) { fileName.appendPath(QLatin1String("android")).appendPath(QLatin1String("version.xml")); - if (!fileName.toFileInfo().exists()) + if (!fileName.exists()) return false; QDomDocument dstVersionDoc; if (!openXmlFile(dstVersionDoc, fileName)) @@ -684,7 +684,7 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target) AndroidBuildApkStep *buildApkStep = AndroidGlobal::buildStep(target->activeBuildConfiguration()); - if (!buildApkStep || !buildApkStep->androidPackageSourceDir().appendPath(QLatin1String("gradlew")).toFileInfo().exists()) + if (!buildApkStep || !buildApkStep->androidPackageSourceDir().appendPath(QLatin1String("gradlew")).exists()) return false; GradleProperties localProperties; diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 54eba1ca906..c741286f1d8 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -256,9 +256,9 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode) m_ui->gdbWarningLabel->setVisible(false); if (m_androidConfig.ndkLocation().isEmpty()) { m_ndkState = NotSet; - } else if (!platformPath.appendPath(QLatin1String("platforms")).toFileInfo().exists() - || !toolChainPath.appendPath(QLatin1String("toolchains")).toFileInfo().exists() - || !sourcesPath.appendPath(QLatin1String("sources/cxx-stl")).toFileInfo().exists()) { + } else if (!platformPath.appendPath(QLatin1String("platforms")).exists() + || !toolChainPath.appendPath(QLatin1String("toolchains")).exists() + || !sourcesPath.appendPath(QLatin1String("sources/cxx-stl")).exists()) { m_ndkState = Error; m_ndkErrorMessage = tr("\"%1\" does not seem to be an Android NDK top folder.") .arg(m_androidConfig.ndkLocation().toUserOutput()); @@ -277,7 +277,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode) if (ati.architecture != ProjectExplorer::Abi::ArmArchitecture) continue; Utils::FileName gdbPath = m_androidConfig.gdbPath(ati.architecture, ati.version); - if (gdbPath.toFileInfo().exists()) + if (gdbPath.exists()) gdbPaths << gdbPath.toString(); } @@ -325,8 +325,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode) } else { Utils::FileName bin = m_androidConfig.openJDKLocation(); bin.appendPath(QLatin1String("bin/javac" QTC_HOST_EXE_SUFFIX)); - if (!m_androidConfig.openJDKLocation().toFileInfo().exists() - || !bin.toFileInfo().exists()) + if (!m_androidConfig.openJDKLocation().exists() || !bin.exists()) m_javaState = Error; } } @@ -407,15 +406,15 @@ bool AndroidSettingsWidget::sdkLocationIsValid() const Utils::FileName androidExe = m_androidConfig.sdkLocation(); Utils::FileName androidBat = m_androidConfig.sdkLocation(); Utils::FileName emulator = m_androidConfig.sdkLocation(); - return (androidExe.appendPath(QLatin1String("/tools/android" QTC_HOST_EXE_SUFFIX)).toFileInfo().exists() - || androidBat.appendPath(QLatin1String("/tools/android" ANDROID_BAT_SUFFIX)).toFileInfo().exists()) - && emulator.appendPath(QLatin1String("/tools/emulator" QTC_HOST_EXE_SUFFIX)).toFileInfo().exists(); + return (androidExe.appendPath(QLatin1String("/tools/android" QTC_HOST_EXE_SUFFIX)).exists() + || androidBat.appendPath(QLatin1String("/tools/android" ANDROID_BAT_SUFFIX)).exists()) + && emulator.appendPath(QLatin1String("/tools/emulator" QTC_HOST_EXE_SUFFIX)).exists(); } bool AndroidSettingsWidget::sdkPlatformToolsInstalled() const { Utils::FileName adb = m_androidConfig.sdkLocation(); - return adb.appendPath(QLatin1String("platform-tools/adb" QTC_HOST_EXE_SUFFIX)).toFileInfo().exists(); + return adb.appendPath(QLatin1String("platform-tools/adb" QTC_HOST_EXE_SUFFIX)).exists(); } void AndroidSettingsWidget::saveSettings() @@ -477,7 +476,7 @@ void AndroidSettingsWidget::searchForAnt(const Utils::FileName &location) ant.appendPath(QLatin1String("ant.bat")); else ant.appendPath(QLatin1String("ant")); - if (ant.toFileInfo().exists()) { + if (ant.exists()) { m_androidConfig.setAntLocation(ant); m_ui->AntLocationPathChooser->setFileName(ant); } diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 22f0da7fa5c..b2176437a70 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -151,13 +151,13 @@ FileName AndroidToolChain::suggestedGdbServer() const Utils::FileName path = AndroidConfigurations::currentConfig().ndkLocation(); path.appendPath(QString::fromLatin1("prebuilt/android-%1/gdbserver/gdbserver") .arg(Abi::toString(targetAbi().architecture()))); - if (path.toFileInfo().exists()) + if (path.exists()) return path; path = AndroidConfigurations::currentConfig().ndkLocation(); path.appendPath(QString::fromLatin1("toolchains/%1-%2/prebuilt/gdbserver") .arg(AndroidConfig::toolchainPrefix(targetAbi().architecture())) .arg(m_ndkToolChainVersion)); - if (path.toFileInfo().exists()) + if (path.exists()) return path; return Utils::FileName(); diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index f260b6a24c0..28b73b3616d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -586,7 +586,7 @@ QString CMakeProject::uiHeaderFile(const QString &uiFile) while (baseDirectory.isChildOf(project)) { Utils::FileName cmakeListsTxt = baseDirectory; cmakeListsTxt.appendPath(QLatin1String("CMakeLists.txt")); - if (cmakeListsTxt.toFileInfo().exists()) + if (cmakeListsTxt.exists()) break; QDir dir(baseDirectory.toString()); dir.cdUp(); diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 55916a397e2..52f75868c5b 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -298,7 +298,7 @@ void DebuggerItemManager::readLegacyDebuggers(const FileName &file) if (fn == QLatin1String("auto")) continue; FileName command = FileName::fromUserInput(fn); - if (!command.toFileInfo().exists()) + if (!command.exists()) continue; if (findByCommand(command)) continue; diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp index 37e1a735622..98fbdeeca57 100644 --- a/src/plugins/ios/iosdebugsupport.cpp +++ b/src/plugins/ios/iosdebugsupport.cpp @@ -136,7 +136,7 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi Utils::FileName xcodeInfo = IosConfigurations::developerPath().parentDir() .appendPath(QLatin1String("Info.plist")); bool buggyLldb = false; - if (xcodeInfo.toFileInfo().exists()) { + if (xcodeInfo.exists()) { QSettings settings(xcodeInfo.toString(), QSettings::NativeFormat); QStringList version = settings.value(QLatin1String("CFBundleShortVersionString")).toString() .split(QLatin1Char('.')); @@ -147,7 +147,7 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi bundlePath.chop(4); Utils::FileName dsymPath = Utils::FileName::fromString( bundlePath.append(QLatin1String(".dSYM"))); - if (!dsymPath.toFileInfo().exists()) { + if (!dsymPath.exists()) { if (buggyLldb) TaskHub::addTask(Task::Warning, tr("Debugging with Xcode 5.0.x can be unreliable without a dSYM. " diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 7afe5dafcd9..78861b08627 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -272,7 +272,7 @@ void IosDeployStep::checkProvisioningProfile() // the file is a signed plist stored in DER format // we simply search for start and end of the plist instead of decoding the DER payload - if (!provisioningFilePath.toFileInfo().exists()) + if (!provisioningFilePath.exists()) return; QFile provisionFile(provisioningFilePath.toString()); if (!provisionFile.open(QIODevice::ReadOnly)) diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index 718a9f4a1c6..393076540ab 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -450,7 +450,7 @@ QStringList IosDsymBuildStep::defaultCmdList() const QString dsymutilCmd = QLatin1String("dsymutil"); Utils::FileName dsymUtilPath = IosConfigurations::developerPath() .appendPath(QLatin1String("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil")); - if (dsymUtilPath.toFileInfo().exists()) + if (dsymUtilPath.exists()) dsymutilCmd = dsymUtilPath.toUserOutput(); IosRunConfiguration *runConf = qobject_cast(target()->activeRunConfiguration()); diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index e64181079d3..61617bc5a85 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -738,7 +738,7 @@ QString IosToolHandler::iosSimulatorToolPath() Utils::FileName devPath = Internal::IosConfigurations::developerPath(); bool version182 = devPath.appendPath(QLatin1String( "Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/iPhoneSimulatorRemoteClient.framework")) - .toFileInfo().exists(); + .exists(); QString res = Core::ICore::libexecPath() + QLatin1String("/ios/iossim"); if (version182) res = res.append(QLatin1String("_1_8_2")); diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 6c280312601..34732b0c12c 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -159,7 +159,7 @@ void KitManager::restoreKits() // read all kits from user file KitList userKits; FileName userSettingsFile(settingsFileName()); - if (userSettingsFile.toFileInfo().exists()) + if (userSettingsFile.exists()) userKits = restoreKits(userSettingsFile); foreach (Kit *k, userKits.kits) { if (k->isSdkProvided()) diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 3fdcd075623..83aea757bce 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -883,7 +883,7 @@ bool SessionManager::loadSession(const QString &session) // Try loading the file FileName fileName = sessionNameToFileName(session); PersistentSettingsReader reader; - if (fileName.toFileInfo().exists()) { + if (fileName.exists()) { if (!reader.load(fileName)) { QMessageBox::warning(ICore::dialogParent(), tr("Error while restoring session"), tr("Could not restore session %1").arg(fileName.toUserOutput())); @@ -919,7 +919,7 @@ bool SessionManager::loadSession(const QString &session) d->m_sessionName = session; EditorManager::updateWindowTitles(); - if (fileName.toFileInfo().exists()) { + if (fileName.exists()) { d->m_virginSession = false; ProgressManager::addTask(d->m_future.future(), tr("Loading Session"), @@ -1021,7 +1021,7 @@ QStringList SessionManager::projectsForSessionName(const QString &session) { const FileName fileName = sessionNameToFileName(session); PersistentSettingsReader reader; - if (fileName.toFileInfo().exists()) { + if (fileName.exists()) { if (!reader.load(fileName)) { qWarning() << "Could not restore session" << fileName.toUserOutput(); return QStringList(); diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index c638ab47c73..5ef3435ee8b 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -752,7 +752,7 @@ SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data defaultSettingsPath.appendString(m_userSuffix); int version = versionFromMap(data); - if (!path.toFileInfo().exists()) { + if (!path.exists()) { return result; } else if (data.isEmpty() || version < firstSupportedVersion() || version > currentVersion()) { result.title = QApplication::translate("Utils::SettingsAccessor", "No Valid Settings Found"); diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 74191c5f1d3..d95066a4cb8 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -475,7 +475,7 @@ void TaskWindow::triggerDefaultHandler(const QModelIndex &index) if (d->m_defaultHandler->canHandle(task)) { d->m_defaultHandler->handle(task); } else { - if (!task.file.toFileInfo().exists()) + if (!task.file.exists()) d->m_model->setFileNotFound(index, true); } } diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 29c432dea3e..a1abcdbb2b3 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -192,7 +192,7 @@ void ToolChainManager::restoreToolChains() // read all tool chains from user file. // Read legacy settings once and keep them around... FileName fileName = settingsFileName(QLatin1String(TOOLCHAIN_FILENAME)); - if (!fileName.toFileInfo().exists()) + if (!fileName.exists()) fileName = settingsFileName(QLatin1String(LEGACY_TOOLCHAIN_FILENAME)); readTcs = restoreFromFile(fileName); diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp index 6a462da9f55..b4c24c7f9d9 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp @@ -104,7 +104,7 @@ void AndroidPackageInstallationStep::run(QFutureInterface &fi) QString error; foreach (const QString &dir, m_androidDirsToClean) { Utils::FileName androidDir = Utils::FileName::fromString(dir); - if (!dir.isEmpty() && androidDir.toFileInfo().exists()) { + if (!dir.isEmpty() && androidDir.exists()) { emit addOutput(tr("Removing directory %1").arg(dir), MessageOutput); if (!Utils::FileUtils::removeRecursively(androidDir, &error)) { emit addOutput(error, ErrorOutput); diff --git a/src/plugins/qnx/bardescriptorfilenodemanager.cpp b/src/plugins/qnx/bardescriptorfilenodemanager.cpp index cf1abcc7612..5d3f815ef69 100644 --- a/src/plugins/qnx/bardescriptorfilenodemanager.cpp +++ b/src/plugins/qnx/bardescriptorfilenodemanager.cpp @@ -241,7 +241,7 @@ bool BarDescriptorFileNodeManager::createBarDescriptor(ProjectExplorer::Project content.replace(QLatin1String("TARGETNAME"), targetName); content.replace(QLatin1String("ID"), QLatin1String("com.example.") + projectName); - if (project->projectDirectory().appendPath(QLatin1String("qml")).toFileInfo().exists()) + if (project->projectDirectory().appendPath(QLatin1String("qml")).exists()) content.replace(QLatin1String(""), QLatin1String(" qml\n")); diff --git a/src/plugins/qnx/blackberryapilevelconfiguration.cpp b/src/plugins/qnx/blackberryapilevelconfiguration.cpp index cf4e05c436b..0aa3b538346 100644 --- a/src/plugins/qnx/blackberryapilevelconfiguration.cpp +++ b/src/plugins/qnx/blackberryapilevelconfiguration.cpp @@ -130,10 +130,10 @@ void BlackBerryApiLevelConfiguration::ctor() QString host = qnxHost().toString(); FileName qmake4Path = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qmake"))); FileName qmake5Path = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qt5/qmake"))); - if (qmake4Path.toFileInfo().exists()) + if (qmake4Path.exists()) m_qmake4BinaryFile = qmake4Path; - if (qmake5Path.toFileInfo().exists()) + if (qmake5Path.exists()) m_qmake5BinaryFile = qmake5Path; } @@ -183,8 +183,8 @@ bool BlackBerryApiLevelConfiguration::isValid() const return QnxBaseConfiguration::isValid() && ((!m_qmake4BinaryFile.isEmpty() || !m_qmake5BinaryFile.isEmpty()) && (m_autoDetectionSource.isEmpty() || - m_autoDetectionSource.toFileInfo().exists()) - && (!m_sysRoot.isEmpty() && m_sysRoot.toFileInfo().exists())); + m_autoDetectionSource.exists()) + && (!m_sysRoot.isEmpty() && m_sysRoot.exists())); } @@ -276,10 +276,10 @@ QStringList BlackBerryApiLevelConfiguration::validationErrors() const if (m_qmake4BinaryFile.isEmpty() && m_qmake5BinaryFile.isEmpty()) errorStrings << tr("- No Qt version found."); - if (!m_autoDetectionSource.isEmpty() && !m_autoDetectionSource.toFileInfo().exists()) + if (!m_autoDetectionSource.isEmpty() && !m_autoDetectionSource.exists()) errorStrings << tr("- No auto detection source found."); - if (m_sysRoot.isEmpty() && m_sysRoot.toFileInfo().exists()) + if (m_sysRoot.isEmpty() && m_sysRoot.exists()) errorStrings << tr("- No sysroot found."); diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp index 6f0e3f0a1c6..c4a6a4a3f31 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp @@ -391,7 +391,7 @@ bool BlackBerryDeviceConfigurationWizardConfigPage::isComplete() const bool configurationNameComplete = !m_ui->configurationNameField->text().isEmpty(); Utils::FileName fileName = Utils::FileName::fromString(m_ui->debugTokenCombo->currentText()); bool debugTokenComplete = m_holder.isSimulator || !m_holder.isProductionDevice - || (!fileName.isEmpty() && fileName.toFileInfo().exists()); + || (!fileName.isEmpty() && fileName.exists()); return configurationNameComplete && debugTokenComplete; } diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp index 5aba127f1df..d8ab5b2dab4 100644 --- a/src/plugins/qnx/blackberryndksettingswidget.cpp +++ b/src/plugins/qnx/blackberryndksettingswidget.cpp @@ -188,10 +188,10 @@ void BlackBerryNDKSettingsWidget::updateConfigurationList() // TODO: Do the same if qmake, qcc, debugger are no longer detected... if (!config->isValid()) { QString toolTip = tr("Invalid target %1:").arg(config->targetName()); - if (config->isAutoDetected() && !config->autoDetectionSource().toFileInfo().exists()) + if (config->isAutoDetected() && !config->autoDetectionSource().exists()) toolTip += QLatin1Char('\n') + tr("- Target no longer installed."); - if (!config->envFile().toFileInfo().exists()) + if (!config->envFile().exists()) toolTip += QLatin1Char('\n') + tr("- No NDK environment file found."); if (config->qmake4BinaryFile().isEmpty() diff --git a/src/plugins/qnx/qnxbaseconfiguration.cpp b/src/plugins/qnx/qnxbaseconfiguration.cpp index 9bbfc055914..2cd9c75f208 100644 --- a/src/plugins/qnx/qnxbaseconfiguration.cpp +++ b/src/plugins/qnx/qnxbaseconfiguration.cpp @@ -136,7 +136,7 @@ bool QnxBaseConfiguration::isValid() const void QnxBaseConfiguration::ctor(const FileName &envScript) { - QTC_ASSERT(!envScript.isEmpty() && envScript.toFileInfo().exists(), return); + QTC_ASSERT(!envScript.isEmpty() && envScript.exists(), return); m_envFile = envScript; m_qnxEnv = QnxUtils::qnxEnvironmentFromEnvFile(m_envFile.toString()); foreach (const Utils::EnvironmentItem &item, m_qnxEnv) { @@ -151,7 +151,7 @@ void QnxBaseConfiguration::ctor(const FileName &envScript) m_qnxHost.toString() + QLatin1String("/usr/bin/qcc"))); FileName armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarm-gdb"))); - if (!armlev7GdbPath.toFileInfo().exists()) { + if (!armlev7GdbPath.exists()) { armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarmv7-gdb"))); } @@ -159,13 +159,13 @@ void QnxBaseConfiguration::ctor(const FileName &envScript) FileName x86GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( m_qnxHost.toString() + QLatin1String("/usr/bin/ntox86-gdb"))); - if (qccPath.toFileInfo().exists()) + if (qccPath.exists()) m_qccCompiler = qccPath; - if (armlev7GdbPath.toFileInfo().exists()) + if (armlev7GdbPath.exists()) m_armlev7Debugger = armlev7GdbPath; - if (x86GdbPath.toFileInfo().exists()) + if (x86GdbPath.exists()) m_x86Debugger = x86GdbPath; } diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 0cf8052b4af..ff405cd5183 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -181,7 +181,7 @@ void QtVersionManager::triggerQtVersionRestore() saveQtVersions(); const FileName configFileName = globalSettingsFileName(); - if (configFileName.toFileInfo().exists()) { + if (configFileName.exists()) { m_configFileWatcher = new FileSystemWatcher(m_instance); connect(m_configFileWatcher, SIGNAL(fileChanged(QString)), m_fileWatcherTimer, SLOT(start())); @@ -231,7 +231,7 @@ static bool restoreQtVersions() FileName filename = settingsFileName(QLatin1String(QTVERSION_FILENAME)); // Read Qt Creator 2.5 qtversions.xml once: - if (!filename.toFileInfo().exists()) + if (!filename.exists()) filename = settingsFileName(QLatin1String(QTVERSION_LEGACY_FILENAME)); if (!reader.load(filename)) return false; diff --git a/src/tools/sdktool/operation.cpp b/src/tools/sdktool/operation.cpp index 1f0bfb1888c..384f329da8e 100644 --- a/src/tools/sdktool/operation.cpp +++ b/src/tools/sdktool/operation.cpp @@ -102,7 +102,7 @@ QVariantMap Operation::load(const QString &file) // Read values from original file: Utils::FileName path = Settings::instance()->getPath(file); - if (path.toFileInfo().exists()) { + if (path.exists()) { Utils::PersistentSettingsReader reader; if (!reader.load(path)) return QVariantMap();