feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()

Browse Source 
It's returning a FilePath, so it's a better fit.

Keep the old versions as inline function now to ease downstream migration.

Change-Id: I535887928018f42b92895c8b0c82527f0d55e5ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
hjk
2020-04-09 11:05:50 +02:00
parent 45ba9fcd53
commit 79b680e7f0
44 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -235,7 +235,7 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
{
m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand);
m_compilerCommand->setHistoryCompleter(QLatin1String("Qnx.ToolChain.History"));
m_compilerCommand->setFileName(tc->compilerCommand());
m_compilerCommand->setFilePath(tc->compilerCommand());
m_compilerCommand->setEnabled(!tc->isAutoDetected());
m_sdpPath->setExpectedKind(PathChooser::ExistingDirectory);
@@ -243,7 +243,7 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
m_sdpPath->setPath(tc->sdpPath());
m_sdpPath->setEnabled(!tc->isAutoDetected());
const Abis abiList = detectTargetAbis(m_sdpPath->fileName());
const Abis abiList = detectTargetAbis(m_sdpPath->filePath());
m_abiWidget->setAbis(abiList, tc->targetAbi());
m_abiWidget->setEnabled(!tc->isAutoDetected() && !abiList.isEmpty());
@@ -267,9 +267,9 @@ void QnxToolChainConfigWidget::applyImpl()
Q_ASSERT(tc);
QString displayName = tc->displayName();
tc->setDisplayName(displayName); // reset display name
tc->setSdpPath(m_sdpPath->fileName().toString());
tc->setSdpPath(m_sdpPath->filePath().toString());
tc->setTargetAbi(m_abiWidget->currentAbi());
tc->resetToolChain(m_compilerCommand->fileName());
tc->resetToolChain(m_compilerCommand->filePath());
}
void QnxToolChainConfigWidget::discardImpl()
@@ -277,7 +277,7 @@ void QnxToolChainConfigWidget::discardImpl()
// subwidgets are not yet connected!
QSignalBlocker blocker(this);
auto tc = static_cast<const QnxToolChain *>(toolChain());
m_compilerCommand->setFileName(tc->compilerCommand());
m_compilerCommand->setFilePath(tc->compilerCommand());
m_sdpPath->setPath(tc->sdpPath());
m_abiWidget->setAbis(tc->supportedAbis(), tc->targetAbi());
if (!m_compilerCommand->path().isEmpty())
@@ -288,7 +288,7 @@ bool QnxToolChainConfigWidget::isDirtyImpl() const
{
auto tc = static_cast<const QnxToolChain *>(toolChain());
Q_ASSERT(tc);
return m_compilerCommand->fileName() != tc->compilerCommand()
return m_compilerCommand->filePath() != tc->compilerCommand()
|| m_sdpPath->path() != tc->sdpPath()
|| m_abiWidget->currentAbi() != tc->targetAbi();
}
@@ -297,7 +297,7 @@ void QnxToolChainConfigWidget::handleSdpPathChange()
{
const Abi currentAbi = m_abiWidget->currentAbi();
const bool customAbi = m_abiWidget->isCustomAbi();
const Abis abiList = detectTargetAbis(m_sdpPath->fileName());
const Abis abiList = detectTargetAbis(m_sdpPath->filePath());
m_abiWidget->setEnabled(!abiList.isEmpty());