summaryrefslogtreecommitdiff
path: root/src/plugins/qnx
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-27 11:04:18 +0200
committerhjk <hjk@qt.io>2019-05-27 09:35:53 +0000
commit2ac89cba92ce067ea05697ed743afe7a8b709669 (patch)
tree897af63e757f2430e53f296134b86eaa49c52e72 /src/plugins/qnx
parent98c4994c38adcf501dbff26f41776594991b6f58 (diff)
downloadqt-creator-2ac89cba92ce067ea05697ed743afe7a8b709669.tar.gz
ProjectExplorer: Use an alias for QList<Abi>
Change-Id: I69231c5974620ae30296bfc4e0ab41c900d95a3c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qnx')
-rw-r--r--src/plugins/qnx/qnxqtversion.cpp2
-rw-r--r--src/plugins/qnx/qnxqtversion.h2
-rw-r--r--src/plugins/qnx/qnxtoolchain.cpp12
-rw-r--r--src/plugins/qnx/qnxutils.cpp2
-rw-r--r--src/plugins/qnx/qnxutils.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 330a154015..354c8f0b38 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -118,7 +118,7 @@ void QnxQtVersion::fromMap(const QVariantMap &map)
setSdpPath(QDir::fromNativeSeparators(map.value(QLatin1String(SDP_PATH_KEY)).toString()));
}
-QList<ProjectExplorer::Abi> QnxQtVersion::detectQtAbis() const
+ProjectExplorer::Abis QnxQtVersion::detectQtAbis() const
{
ensureMkSpecParsed();
return QnxUtils::convertAbis(BaseQtVersion::detectQtAbis());
diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h
index e72f78d8fe..87ca17d9e0 100644
--- a/src/plugins/qnx/qnxqtversion.h
+++ b/src/plugins/qnx/qnxqtversion.h
@@ -54,7 +54,7 @@ public:
QVariantMap toMap() const override;
void fromMap(const QVariantMap &map) override;
- QList<ProjectExplorer::Abi> detectQtAbis() const override;
+ ProjectExplorer::Abis detectQtAbis() const override;
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
Utils::Environment qmakeRunEnvironment() const override;
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index d1880da40f..4ce08da1ea 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -44,9 +44,9 @@ namespace Internal {
static const char CompilerSdpPath[] = "Qnx.QnxToolChain.NDKPath";
static const char CpuDirKey[] = "Qnx.QnxToolChain.CpuDir";
-static QList<Abi> detectTargetAbis(const FileName &sdpPath)
+static Abis detectTargetAbis(const FileName &sdpPath)
{
- QList<Abi> result;
+ Abis result;
FileName qnxTarget;
if (!sdpPath.fileName().isEmpty()) {
@@ -243,7 +243,7 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
m_sdpPath->setPath(tc->sdpPath());
m_sdpPath->setEnabled(!tc->isAutoDetected());
- QList<Abi> abiList = detectTargetAbis(m_sdpPath->fileName());
+ const Abis abiList = detectTargetAbis(m_sdpPath->fileName());
m_abiWidget->setAbis(abiList, tc->targetAbi());
m_abiWidget->setEnabled(!tc->isAutoDetected() && !abiList.isEmpty());
@@ -295,9 +295,9 @@ bool QnxToolChainConfigWidget::isDirtyImpl() const
void QnxToolChainConfigWidget::handleSdpPathChange()
{
- Abi currentAbi = m_abiWidget->currentAbi();
- bool customAbi = m_abiWidget->isCustomAbi();
- QList<Abi> abiList = detectTargetAbis(m_sdpPath->fileName());
+ const Abi currentAbi = m_abiWidget->currentAbi();
+ const bool customAbi = m_abiWidget->isCustomAbi();
+ const Abis abiList = detectTargetAbis(m_sdpPath->fileName());
m_abiWidget->setEnabled(!abiList.isEmpty());
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 0bfb4dedd8..3be4d4de4d 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -251,7 +251,7 @@ Abi QnxUtils::convertAbi(const Abi &abi)
return abi;
}
-QList<Abi> QnxUtils::convertAbis(const QList<Abi> &abis)
+Abis QnxUtils::convertAbis(const Abis &abis)
{
return Utils::transform(abis, &QnxUtils::convertAbi);
}
diff --git a/src/plugins/qnx/qnxutils.h b/src/plugins/qnx/qnxutils.h
index 505a1a5bff..cc3c5e0f90 100644
--- a/src/plugins/qnx/qnxutils.h
+++ b/src/plugins/qnx/qnxutils.h
@@ -77,7 +77,7 @@ public:
static QList<Utils::EnvironmentItem> qnxEnvironment(const QString &sdpPath);
static QList<QnxTarget> findTargets(const Utils::FileName &basePath);
static ProjectExplorer::Abi convertAbi(const ProjectExplorer::Abi &abi);
- static QList<ProjectExplorer::Abi> convertAbis(const QList<ProjectExplorer::Abi> &abis);
+ static ProjectExplorer::Abis convertAbis(const ProjectExplorer::Abis &abis);
};
} // namespace Internal