Utils: Rename FileName to FilePath

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>

14 files changed, 61 insertions, 61 deletions

diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 18616684ad5..0fbcb443052 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -91,7 +91,7 @@ bool IosBuildStep::init()
     Utils::Environment env = bc->environment();
     Utils::Environment::setupEnglishOutput(&env);
     pp->setEnvironment(env);
-    pp->setCommand(Utils::FileName::fromString(buildCommand()));
+    pp->setCommand(Utils::FilePath::fromString(buildCommand()));
     pp->setArguments(Utils::QtcProcess::joinArgs(allArguments()));
     pp->resolveAll();
 
@@ -253,7 +253,7 @@ void IosBuildStepConfigWidget::updateDetails()
     param.setMacroExpander(bc->macroExpander());
     param.setWorkingDirectory(bc->buildDirectory());
     param.setEnvironment(bc->environment());
-    param.setCommand(Utils::FileName::fromString(m_buildStep->buildCommand()));
+    param.setCommand(Utils::FilePath::fromString(m_buildStep->buildCommand()));
     param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments()));
 
     setSummaryText(param.summary(displayName()));
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 2354df2e87d..6b4c244386f 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -136,7 +136,7 @@ static ToolChainPair findToolChainForPlatform(const XcodePlatform &platform,
                                               const QList<ClangToolChain *> &toolChains)
 {
     ToolChainPair platformToolChains;
-    auto toolchainMatch = [](ClangToolChain *toolChain, const Utils::FileName &compilerPath, const QStringList &flags) {
+    auto toolchainMatch = [](ClangToolChain *toolChain, const Utils::FilePath &compilerPath, const QStringList &flags) {
         return compilerPath == toolChain->compilerCommand()
                 && flags == toolChain->platformCodeGenFlags()
                 && flags == toolChain->platformLinkerFlags();
@@ -181,7 +181,7 @@ static void printKits(const QSet<Kit *> &kits)
 }
 
 static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolChains,
-                     const QVariant &debuggerId, const Utils::FileName &sdkPath, BaseQtVersion *qtVersion)
+                     const QVariant &debuggerId, const Utils::FilePath &sdkPath, BaseQtVersion *qtVersion)
 {
     DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
     if (toolChains.first)
@@ -212,9 +212,9 @@ static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolCh
     SysRootKitAspect::setSysRoot(kit, sdkPath);
 }
 
-static QVersionNumber findXcodeVersion(const Utils::FileName &developerPath)
+static QVersionNumber findXcodeVersion(const Utils::FilePath &developerPath)
 {
-    const FileName xcodeInfo = developerPath.parentDir().pathAppended("Info.plist");
+    const FilePath xcodeInfo = developerPath.parentDir().pathAppended("Info.plist");
     if (xcodeInfo.exists()) {
         QSettings settings(xcodeInfo.toString(), QSettings::NativeFormat);
         return QVersionNumber::fromString(settings.value("CFBundleShortVersionString").toString());
@@ -357,7 +357,7 @@ void IosConfigurations::setIgnoreAllDevices(bool ignoreDevices)
     }
 }
 
-void IosConfigurations::setScreenshotDir(const FileName &path)
+void IosConfigurations::setScreenshotDir(const FilePath &path)
 {
     if (m_instance->m_screenshotDir != path) {
         m_instance->m_screenshotDir = path;
@@ -365,12 +365,12 @@ void IosConfigurations::setScreenshotDir(const FileName &path)
     }
 }
 
-FileName IosConfigurations::screenshotDir()
+FilePath IosConfigurations::screenshotDir()
 {
     return m_instance->m_screenshotDir;
 }
 
-FileName IosConfigurations::developerPath()
+FilePath IosConfigurations::developerPath()
 {
     return m_instance->m_developerPath;
 }
@@ -402,11 +402,11 @@ void IosConfigurations::load()
     QSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_ignoreAllDevices = settings->value(ignoreAllDevicesKey, false).toBool();
-    m_screenshotDir = FileName::fromString(settings->value(screenshotDirPathKey).toString());
+    m_screenshotDir = FilePath::fromString(settings->value(screenshotDirPathKey).toString());
     if (!m_screenshotDir.exists()) {
         QString defaultDir =
                 QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).constFirst();
-        m_screenshotDir = FileName::fromString(defaultDir);
+        m_screenshotDir = FilePath::fromString(defaultDir);
     }
 
     settings->endGroup();
@@ -425,7 +425,7 @@ void IosConfigurations::updateSimulators()
     SimulatorControl::updateAvailableSimulators();
 }
 
-void IosConfigurations::setDeveloperPath(const FileName &devPath)
+void IosConfigurations::setDeveloperPath(const FilePath &devPath)
 {
     static bool hasDevPath = false;
     if (devPath != m_instance->m_developerPath) {
diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h
index eaafc9eb08b..cddf0a58062 100644
--- a/src/plugins/ios/iosconfigurations.h
+++ b/src/plugins/ios/iosconfigurations.h
@@ -112,11 +112,11 @@ public:
     static void initialize();
     static bool ignoreAllDevices();
     static void setIgnoreAllDevices(bool ignoreDevices);
-    static void setScreenshotDir(const Utils::FileName &path);
-    static Utils::FileName screenshotDir();
-    static Utils::FileName developerPath();
+    static void setScreenshotDir(const Utils::FilePath &path);
+    static Utils::FilePath screenshotDir();
+    static Utils::FilePath developerPath();
     static QVersionNumber xcodeVersion();
-    static Utils::FileName lldbPath();
+    static Utils::FilePath lldbPath();
     static void updateAutomaticKitList();
     static const DevelopmentTeams &developmentTeams();
     static DevelopmentTeamPtr developmentTeam(const QString &teamID);
@@ -132,12 +132,12 @@ private:
     void save();
     void kitsRestored();
     void updateSimulators();
-    static void setDeveloperPath(const Utils::FileName &devPath);
+    static void setDeveloperPath(const Utils::FilePath &devPath);
     void initializeProvisioningData();
     void loadProvisioningData(bool notify = true);
 
-    Utils::FileName m_developerPath;
-    Utils::FileName m_screenshotDir;
+    Utils::FilePath m_developerPath;
+    Utils::FilePath m_screenshotDir;
     QVersionNumber m_xcodeVersion;
     bool m_ignoreAllDevices;
     QFileSystemWatcher *m_provisioningDataWatcher = nullptr;
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index e43eabb260e..2a0da618afe 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -230,7 +230,7 @@ QString IosDeployStep::deviceId() const
 
 void IosDeployStep::raiseError(const QString &errorString)
 {
-    emit addTask(Task(Task::Error, errorString, Utils::FileName::fromString(QString()), -1,
+    emit addTask(Task(Task::Error, errorString, Utils::FilePath::fromString(QString()), -1,
         ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT));
 }
 
@@ -245,7 +245,7 @@ void IosDeployStep::checkProvisioningProfile()
     if (device.isNull())
         return;
 
-    const FileName provisioningFilePath = m_bundlePath.pathAppended("embedded.mobileprovision");
+    const FilePath provisioningFilePath = m_bundlePath.pathAppended("embedded.mobileprovision");
 
     // 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
@@ -285,7 +285,7 @@ void IosDeployStep::checkProvisioningProfile()
                  "does not cover the device %3 (%4). Deployment to it will fail.")
               .arg(provisioningProfile, provisioningUid, device->displayName(),
                    targetId),
-              Utils::FileName(), /* filename */
+              Utils::FilePath(), /* filename */
               -1, /* line */
               ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
     emit addTask(task);
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index ca2b64fbc58..77b386583ea 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -83,7 +83,7 @@ private:
     TransferStatus m_transferStatus = NoTransfer;
     IosToolHandler *m_toolHandler = nullptr;
     ProjectExplorer::IDevice::ConstPtr m_device;
-    Utils::FileName m_bundlePath;
+    Utils::FilePath m_bundlePath;
     IosDeviceType m_deviceType;
     static const Core::Id Id;
     bool m_expectFail = false;
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index 16a396c545e..d238bcfb952 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -72,7 +72,7 @@ bool IosDsymBuildStep::init()
     Utils::Environment env = bc->environment();
     Utils::Environment::setupEnglishOutput(&env);
     pp->setEnvironment(env);
-    pp->setCommand(Utils::FileName::fromString(command()));
+    pp->setCommand(Utils::FilePath::fromString(command()));
     pp->setArguments(Utils::QtcProcess::joinArgs(arguments()));
     pp->resolveAll();
 
@@ -146,7 +146,7 @@ QStringList IosDsymBuildStep::defaultCleanCmdList() const
 QStringList IosDsymBuildStep::defaultCmdList() const
 {
     QString dsymutilCmd = "dsymutil";
-    const Utils::FileName dsymUtilPath = IosConfigurations::developerPath()
+    const Utils::FilePath dsymUtilPath = IosConfigurations::developerPath()
             .pathAppended("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil");
     if (dsymUtilPath.exists())
         dsymutilCmd = dsymUtilPath.toUserOutput();
@@ -270,7 +270,7 @@ void IosDsymBuildStepConfigWidget::updateDetails()
     param.setMacroExpander(bc->macroExpander());
     param.setWorkingDirectory(bc->buildDirectory());
     param.setEnvironment(bc->environment());
-    param.setCommand(Utils::FileName::fromString(m_buildStep->command()));
+    param.setCommand(Utils::FilePath::fromString(m_buildStep->command()));
     param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments()));
 
     setSummaryText(param.summary(displayName()));
diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp
index b67bfd4f78b..8e19eecc4f1 100644
--- a/src/plugins/ios/iosprobe.cpp
+++ b/src/plugins/ios/iosprobe.cpp
@@ -87,15 +87,15 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath)
     };
 
     XcodePlatform clangProfile;
-    clangProfile.developerPath = Utils::FileName::fromString(devPath);
+    clangProfile.developerPath = Utils::FilePath::fromString(devPath);
 
     const QFileInfo clangCInfo = getClangInfo("clang");
     if (clangCInfo.exists())
-        clangProfile.cCompilerPath = Utils::FileName::fromFileInfo(clangCInfo);
+        clangProfile.cCompilerPath = Utils::FilePath::fromFileInfo(clangCInfo);
 
     const QFileInfo clangCppInfo = getClangInfo("clang++");
     if (clangCppInfo.exists())
-        clangProfile.cxxCompilerPath = Utils::FileName::fromFileInfo(clangCppInfo);
+        clangProfile.cxxCompilerPath = Utils::FilePath::fromFileInfo(clangCppInfo);
 
     QSet<QString> allArchitectures;
     static const std::map<QString, QStringList> sdkConfigs {
@@ -111,7 +111,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath)
     for (const auto &sdkConfig : sdkConfigs) {
         XcodePlatform::SDK sdk;
         sdk.directoryName = sdkConfig.first;
-        sdk.path = Utils::FileName::fromString(devPath
+        sdk.path = Utils::FilePath::fromString(devPath
                 + QString(QLatin1String("/Platforms/%1.platform/Developer/SDKs/%1.sdk")).arg(
                     sdk.directoryName));
         sdk.architectures = sdkConfig.second;
diff --git a/src/plugins/ios/iosprobe.h b/src/plugins/ios/iosprobe.h
index ccaddcc5ccd..52cf3015c53 100644
--- a/src/plugins/ios/iosprobe.h
+++ b/src/plugins/ios/iosprobe.h
@@ -39,7 +39,7 @@ public:
     {
     public:
         QString directoryName;
-        Utils::FileName path;
+        Utils::FilePath path;
         QStringList architectures;
     };
     class ToolchainTarget
@@ -51,9 +51,9 @@ public:
 
         bool operator==(const ToolchainTarget &other) const;
     };
-    Utils::FileName developerPath;
-    Utils::FileName cxxCompilerPath;
-    Utils::FileName cCompilerPath;
+    Utils::FilePath developerPath;
+    Utils::FilePath cxxCompilerPath;
+    Utils::FilePath cCompilerPath;
     std::vector<ToolchainTarget> targets;
     std::vector<SDK> sdks;
 
@@ -67,7 +67,7 @@ uint qHash(const XcodePlatform::ToolchainTarget &target);
 class XcodeProbe
 {
 public:
-    static Utils::FileName sdkPath(const QString &devPath, const QString &platformName);
+    static Utils::FilePath sdkPath(const QString &devPath, const QString &platformName);
     static QMap<QString, XcodePlatform> detectPlatforms(const QString &devPath = QString());
 
 private:
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 233abbd26fc..e0c5b629a69 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -163,7 +163,7 @@ QString IosRunConfiguration::applicationName() const
     return QString();
 }
 
-FileName IosRunConfiguration::bundleDirectory() const
+FilePath IosRunConfiguration::bundleDirectory() const
 {
     Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
     bool isDevice = (devType == Constants::IOS_DEVICE_TYPE);
@@ -171,11 +171,11 @@ FileName IosRunConfiguration::bundleDirectory() const
         qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString();
         return {};
     }
-    FileName res;
+    FilePath res;
     if (BuildConfiguration *bc = target()->activeBuildConfiguration()) {
         Project *project = target()->project();
         if (ProjectNode *node = project->findNodeForBuildKey(buildKey()))
-            res = FileName::fromString(node->data(Constants::IosBuildDir).toString());
+            res = FilePath::fromString(node->data(Constants::IosBuildDir).toString());
         if (res.isEmpty())
             res = bc->buildDirectory();
         switch (bc->buildType()) {
@@ -201,7 +201,7 @@ FileName IosRunConfiguration::bundleDirectory() const
     return res.pathAppended(applicationName() + ".app");
 }
 
-FileName IosRunConfiguration::localExecutable() const
+FilePath IosRunConfiguration::localExecutable() const
 {
     return bundleDirectory().pathAppended(applicationName());
 }
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index 3265f242672..a5072abddfd 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -44,10 +44,10 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
 public:
     IosRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
-    Utils::FileName profilePath() const;
+    Utils::FilePath profilePath() const;
     QString applicationName() const;
-    Utils::FileName bundleDirectory() const;
-    Utils::FileName localExecutable() const;
+    Utils::FilePath bundleDirectory() const;
+    Utils::FilePath localExecutable() const;
     QString disabledReason() const override;
     IosDeviceType deviceType() const;
 
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index e66ce35e2ea..5c343099219 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -442,14 +442,14 @@ void IosDebugSupport::start()
         setStartMode(AttachToRemoteProcess);
         setIosPlatform("remote-ios");
         QString osVersion = dev->osVersion();
-        FileName deviceSdk1 = FileName::fromString(QDir::homePath()
+        FilePath deviceSdk1 = FilePath::fromString(QDir::homePath()
                                              + "/Library/Developer/Xcode/iOS DeviceSupport/"
                                              + osVersion + "/Symbols");
         QString deviceSdk;
         if (deviceSdk1.toFileInfo().isDir()) {
             deviceSdk = deviceSdk1.toString();
         } else {
-            const FileName deviceSdk2 = IosConfigurations::developerPath()
+            const FilePath deviceSdk2 = IosConfigurations::developerPath()
                     .pathAppended("Platforms/iPhoneOS.platform/DeviceSupport/"
                                   + osVersion + "/Symbols");
             if (deviceSdk2.toFileInfo().isDir()) {
@@ -485,7 +485,7 @@ void IosDebugSupport::start()
 
         QString bundlePath = iosRunConfig->bundleDirectory().toString();
         bundlePath.chop(4);
-        FileName dsymPath = FileName::fromString(bundlePath.append(".dSYM"));
+        FilePath dsymPath = FilePath::fromString(bundlePath.append(".dSYM"));
         if (dsymPath.exists() && dsymPath.toFileInfo().lastModified()
                 < QFileInfo(iosRunConfig->localExecutable().toUserOutput()).lastModified()) {
             TaskHub::addTask(Task::Warning,
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index f3ed0667b0f..646183db051 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -657,7 +657,7 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de
         if (k.startsWith(QLatin1String("DYLD_")))
             env.remove(k);
     QStringList frameworkPaths;
-    const Utils::FileName libPath = IosConfigurations::developerPath().pathAppended("Platforms/iPhoneSimulator.platform/Developer/Library");
+    const Utils::FilePath libPath = IosConfigurations::developerPath().pathAppended("Platforms/iPhoneSimulator.platform/Developer/Library");
     for (const auto framework : {"PrivateFrameworks", "OtherFrameworks", "SharedFrameworks"}) {
         const QString frameworkPath =
                 libPath.pathAppended(QLatin1String(framework)).toFileInfo().canonicalFilePath();
@@ -853,7 +853,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
     m_deviceId = m_devType.identifier;
     m_runKind = runType;
 
-    Utils::FileName appBundle = Utils::FileName::fromString(m_bundlePath);
+    Utils::FilePath appBundle = Utils::FilePath::fromString(m_bundlePath);
     if (!appBundle.exists()) {
         errorMsg(IosToolHandler::tr("Application launch on simulator failed. Invalid bundle path %1")
                  .arg(m_bundlePath));
@@ -927,13 +927,13 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
     };
 
     isTransferringApp(m_bundlePath, m_deviceId, 20, 100, "");
-    auto installFuture = simCtl->installApp(m_deviceId, Utils::FileName::fromString(m_bundlePath));
+    auto installFuture = simCtl->installApp(m_deviceId, Utils::FilePath::fromString(m_bundlePath));
     futureList << Utils::onResultReady(installFuture, onResponseAppInstall);
 }
 
 void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &extraArgs)
 {
-    const Utils::FileName appBundle = Utils::FileName::fromString(m_bundlePath);
+    const Utils::FilePath appBundle = Utils::FilePath::fromString(m_bundlePath);
     const QString bundleId = SimulatorControl::bundleIdentifier(appBundle);
     const bool debugRun = m_runKind == IosToolHandler::DebugRun;
     bool captureConsole = IosConfigurations::xcodeVersion() >= QVersionNumber(8);
diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp
index 354c7ed2309..baecf63a9ca 100644
--- a/src/plugins/ios/simulatorcontrol.cpp
+++ b/src/plugins/ios/simulatorcontrol.cpp
@@ -172,12 +172,12 @@ private:
     ~SimulatorControlPrivate();
 
     static SimulatorInfo deviceInfo(const QString &simUdid);
-    static QString bundleIdentifier(const Utils::FileName &bundlePath);
-    static QString bundleExecutable(const Utils::FileName &bundlePath);
+    static QString bundleIdentifier(const Utils::FilePath &bundlePath);
+    static QString bundleExecutable(const Utils::FilePath &bundlePath);
 
     void startSimulator(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid);
     void installApp(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
-                    const Utils::FileName &bundlePath);
+                    const Utils::FilePath &bundlePath);
     void launchApp(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
                    const QString &bundleIdentifier, bool waitForDebugger,
                    const QStringList &extraArgs, const QString &stdoutPath,
@@ -291,12 +291,12 @@ bool SimulatorControl::isSimulatorRunning(const QString &simUdid)
     return SimulatorControlPrivate::deviceInfo(simUdid).isBooted();
 }
 
-QString SimulatorControl::bundleIdentifier(const Utils::FileName &bundlePath)
+QString SimulatorControl::bundleIdentifier(const Utils::FilePath &bundlePath)
 {
     return SimulatorControlPrivate::bundleIdentifier(bundlePath);
 }
 
-QString SimulatorControl::bundleExecutable(const Utils::FileName &bundlePath)
+QString SimulatorControl::bundleExecutable(const Utils::FilePath &bundlePath)
 {
     return SimulatorControlPrivate::bundleExecutable(bundlePath);
 }
@@ -307,7 +307,7 @@ QFuture<SimulatorControl::ResponseData> SimulatorControl::startSimulator(const Q
 }
 
 QFuture<SimulatorControl::ResponseData>
-SimulatorControl::installApp(const QString &simUdid, const Utils::FileName &bundlePath) const
+SimulatorControl::installApp(const QString &simUdid, const Utils::FilePath &bundlePath) const
 {
     return Utils::runAsync(&SimulatorControlPrivate::installApp, d, simUdid, bundlePath);
 }
@@ -372,7 +372,7 @@ SimulatorInfo SimulatorControlPrivate::deviceInfo(const QString &simUdid)
     return device;
 }
 
-QString SimulatorControlPrivate::bundleIdentifier(const Utils::FileName &bundlePath)
+QString SimulatorControlPrivate::bundleIdentifier(const Utils::FilePath &bundlePath)
 {
     QString bundleID;
 #ifdef Q_OS_MAC
@@ -392,7 +392,7 @@ QString SimulatorControlPrivate::bundleIdentifier(const Utils::FileName &bundleP
     return bundleID;
 }
 
-QString SimulatorControlPrivate::bundleExecutable(const Utils::FileName &bundlePath)
+QString SimulatorControlPrivate::bundleExecutable(const Utils::FilePath &bundlePath)
 {
     QString executable;
 #ifdef Q_OS_MAC
@@ -470,7 +470,7 @@ void SimulatorControlPrivate::startSimulator(QFutureInterface<SimulatorControl::
 }
 
 void SimulatorControlPrivate::installApp(QFutureInterface<SimulatorControl::ResponseData> &fi,
-                                         const QString &simUdid, const Utils::FileName &bundlePath)
+                                         const QString &simUdid, const Utils::FilePath &bundlePath)
 {
     QTC_CHECK(bundlePath.exists());
 
diff --git a/src/plugins/ios/simulatorcontrol.h b/src/plugins/ios/simulatorcontrol.h
index c21469cd17f..5d4351ae50d 100644
--- a/src/plugins/ios/simulatorcontrol.h
+++ b/src/plugins/ios/simulatorcontrol.h
@@ -100,12 +100,12 @@ public:
     static QList<SimulatorInfo> availableSimulators();
     static QFuture<QList<SimulatorInfo> > updateAvailableSimulators();
     static bool isSimulatorRunning(const QString &simUdid);
-    static QString bundleIdentifier(const Utils::FileName &bundlePath);
-    static QString bundleExecutable(const Utils::FileName &bundlePath);
+    static QString bundleIdentifier(const Utils::FilePath &bundlePath);
+    static QString bundleExecutable(const Utils::FilePath &bundlePath);
 
 public:
     QFuture<ResponseData> startSimulator(const QString &simUdid) const;
-    QFuture<ResponseData> installApp(const QString &simUdid, const Utils::FileName &bundlePath) const;
+    QFuture<ResponseData> installApp(const QString &simUdid, const Utils::FilePath &bundlePath) const;
     QFuture<ResponseData> launchApp(const QString &simUdid, const QString &bundleIdentifier,
                                     bool waitForDebugger, const QStringList &extraArgs,
                                     const QString& stdoutPath = QString(),