diff options
author | hjk <hjk@qt.io> | 2019-07-23 12:49:13 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-23 13:40:22 +0000 |
commit | 5efa84b91f009213a28d15d7e94c4ea896bd7347 (patch) | |
tree | 90b21d02d61e99f45297b48f58c42e6553d33975 /src | |
parent | 251287f0d35dd82e68dabed8214ef8af893aff91 (diff) | |
download | qt-creator-5efa84b91f009213a28d15d7e94c4ea896bd7347.tar.gz |
Replace remaining Utils::FileName occurrences by Utils::FilePath
Change-Id: Ic3120f18b4fbe90219de9128dba53d7453630b03
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/android/androidconfigurations.h | 2 | ||||
-rw-r--r-- | src/plugins/baremetal/stlinkutilgdbserverprovider.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerruncontrol.cpp | 6 | ||||
-rw-r--r-- | src/plugins/perfprofiler/perftracepointdialog.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qnx/qnxdevice.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qnx/qnxdeviceprocess.cpp | 2 | ||||
-rw-r--r-- | src/plugins/valgrind/valgrindrunner.cpp | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 9a7e73f418..749c4d3bbc 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/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); diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp index 552f890c80..8c49aa8c94 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp +++ b/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(); diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 1d1f10ccbd..0af8699c74 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/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) { diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 1faa6a4416..d959b9173a 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/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"); diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp index 49843ea48e..2dd6e35162 100644 --- a/src/plugins/perfprofiler/perftracepointdialog.cpp +++ b/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, diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 385259cfbe..337d26daeb 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/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()); diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp index 5a3c1c4e09..2e7186db0d 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp +++ b/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()); } diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp index b47bbf0223..55293f0ebd 100644 --- a/src/plugins/qnx/qnxdevice.cpp +++ b/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); diff --git a/src/plugins/qnx/qnxdeviceprocess.cpp b/src/plugins/qnx/qnxdeviceprocess.cpp index 9b8459b34e..0fff4b3585 100644 --- a/src/plugins/qnx/qnxdeviceprocess.cpp +++ b/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); } diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index 25069eadeb..cb4666f942 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/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 \"" |