Replace remaining Utils::FileName occurrences by Utils::FilePath

Change-Id: Ic3120f18b4fbe90219de9128dba53d7453630b03
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/android/androidconfigurations.h

@@ -161,7 +161,7 @@ private:
 
     Utils::FilePath openJDKBinPath() const;
     int getSDKVersion(const QString &device) const;
-    static int getSDKVersion(const Utils::FileName &adbToolPath, const QString &device);
+    static int getSDKVersion(const Utils::FilePath &adbToolPath, const QString &device);
     QStringList getAbis(const QString &device) const;
     static QStringList getAbis(const Utils::FilePath &adbToolPath, const QString &device);
     static bool isBootToQt(const Utils::FilePath &adbToolPath, const QString &device);

src/plugins/baremetal/stlinkutilgdbserverprovider.cpp

@@ -175,7 +175,7 @@ bool StLinkUtilGdbServerProvider::fromMap(const QVariantMap &data)
 
     m_host = data.value(QLatin1String(hostKeyC)).toString();
     m_port = data.value(QLatin1String(portKeyC)).toInt();
-    m_executableFile = FileName::fromVariant(data.value(QLatin1String(executableFileKeyC)));
+    m_executableFile = FilePath::fromVariant(data.value(QLatin1String(executableFileKeyC)));
     m_verboseLevel = data.value(QLatin1String(verboseLevelKeyC)).toInt();
     m_extendedMode = data.value(QLatin1String(extendedModeKeyC)).toBool();
     m_resetBoard = data.value(QLatin1String(resetBoardKeyC)).toBool();

src/plugins/cmakeprojectmanager/fileapidataextractor.cpp

@@ -354,7 +354,7 @@ void addBacktraceInformation(FolderNode *node,
 
 QVector<FolderNode *> addSourceGroups(ProjectNode *targetRoot,
                                       const TargetDetails &td,
-                                      const Utils::FileName &sourceDirectory)
+                                      const FilePath &sourceDirectory)
 {
     QVector<FolderNode *> sourceGroupNodes;
     if (td.sourceGroups.size() == 1) {

src/plugins/debugger/debuggerruncontrol.cpp

@@ -942,7 +942,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
 
     const QByteArray envBinary = qgetenv("QTC_DEBUGGER_PATH");
     if (!envBinary.isEmpty())
-        m_runParameters.debugger.executable = FileName::fromString(QString::fromLocal8Bit(envBinary));
+        m_runParameters.debugger.executable = FilePath::fromString(QString::fromLocal8Bit(envBinary));
 
     if (Project *project = runControl->project()) {
         m_runParameters.projectSourceDirectory = project->projectDirectory();
@@ -1117,9 +1117,9 @@ void GdbServerRunner::start()
     if (isQmlDebugging && !isCppDebugging) {
         gdbserver.executable = m_runnable.executable; // FIXME: Case should not happen?
     } else {
-        gdbserver.executable = FileName::fromString(device()->debugServerPath());
+        gdbserver.executable = FilePath::fromString(device()->debugServerPath());
         if (gdbserver.executable.isEmpty())
-            gdbserver.executable = FileName::fromString("gdbserver");
+            gdbserver.executable = FilePath::fromString("gdbserver");
         args.clear();
         if (m_useMulti)
             args.append("--multi");

src/plugins/perfprofiler/perftracepointdialog.cpp

@@ -106,10 +106,10 @@ void PerfTracePointDialog::runScript()
     Runnable runnable;
     const QString elevate = m_ui->privilegesChooser->currentText();
     if (elevate != QLatin1String("n.a.")) {
-        runnable.executable = Utils::FileName::fromString(elevate);
+        runnable.executable = Utils::FilePath::fromString(elevate);
         runnable.commandLineArguments = "sh";
     } else {
-        runnable.executable = Utils::FileName::fromString("sh");
+        runnable.executable = Utils::FilePath::fromString("sh");
     }
 
     connect(m_process.get(), &DeviceProcess::started,

src/plugins/qmakeprojectmanager/qmakemakestep.cpp

@@ -69,7 +69,7 @@ bool QmakeMakeStep::init()
         emit addTask(Task::buildConfigurationMissingTask());
 
     const Utils::CommandLine unmodifiedMake = effectiveMakeCommand();
-    const Utils::FileName makeExecutable = unmodifiedMake.executable();
+    const Utils::FilePath makeExecutable = unmodifiedMake.executable();
     if (makeExecutable.isEmpty())
         emit addTask(makeCommandMissingTask());
 

src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp

@@ -130,7 +130,7 @@ QString QmlPreviewPlugin::metaInfo() const
 void QmlPreviewPlugin::setQmlFile()
 {
     if (s_previewPlugin) {
-        const Utils::FileName qmlFileName =
+        const Utils::FilePath qmlFileName =
                 QmlDesignerPlugin::instance()->currentDesignDocument()->fileName();
         s_previewPlugin->setProperty("previewedFile", qmlFileName.toString());
     }

src/plugins/qnx/qnxdevice.cpp

@@ -62,7 +62,7 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod
     {
         Q_UNUSED(protocol)
         Runnable runnable;
-        runnable.executable = FileName::fromString("netstat");
+        runnable.executable = FilePath::fromString("netstat");
         runnable.commandLineArguments = "-na";
         return runnable;
     }
@@ -110,7 +110,7 @@ void QnxDevice::updateVersionNumber() const
     QObject::connect(&versionNumberProcess, &DeviceProcess::error, &eventLoop, &QEventLoop::quit);
 
     Runnable r;
-    r.executable = FileName::fromString("uname");
+    r.executable = FilePath::fromString("uname");
     r.commandLineArguments = QLatin1String("-r");
     versionNumberProcess.start(r);
 

src/plugins/qnx/qnxdeviceprocess.cpp

@@ -71,7 +71,7 @@ void QnxDeviceProcess::doSignal(int sig)
 {
     auto signaler = new SshDeviceProcess(device(), this);
     Runnable r;
-    r.executable = FileName::fromString(QString("kill -%2 `cat %1`").arg(m_pidFile).arg(sig));
+    r.executable = FilePath::fromString(QString("kill -%2 `cat %1`").arg(m_pidFile).arg(sig));
     connect(signaler, &SshDeviceProcess::finished, signaler, &QObject::deleteLater);
     signaler->start(r);
 }

src/plugins/valgrind/valgrindrunner.cpp

@@ -190,7 +190,7 @@ void ValgrindRunner::Private::remoteProcessStarted()
     const QString proc = m_valgrindExecutable.split(' ').last();
 
     Runnable findPid;
-    findPid.executable = FileName::fromString("/bin/sh");
+    findPid.executable = FilePath::fromString("/bin/sh");
     // sleep required since otherwise we might only match "bash -c..."
     //  and not the actual valgrind run
     findPid.commandLineArguments = QString("-c \""