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

ProjectExplorer: Rename KitInformation to KitAspect

Browse Source 
The name "KitInformation" does not properly convey the fact that it
represents a certain *aspect* of a kit. The same goes for
"KitConfigWidget", which in addition was inconsistent with
"KitInformation".
We now use "KitAspect" and "KitAspectWidget".

Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-06 12:50:51 +01:00
parent 46c287fee5
commit 83dd031960
156 changed files with 1156 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -76,7 +76,7 @@ static QString extractToolchainPrefix(QString *compilerName)
static QString targetPlatform(const ProjectExplorer::Abi &abi, const ProjectExplorer::Kit *k)
{
const Core::Id device = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k);
const Core::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
switch (abi.os()) {
case ProjectExplorer::Abi::WindowsOS:
return QLatin1String("windows");
@@ -195,7 +195,7 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k,
{
QTC_ASSERT(k, return defaultData);
QVariantMap data = autoGeneratedProperties(k, defaultData);
const QVariantMap customProperties = QbsKitInformation::properties(k);
const QVariantMap customProperties = QbsKitAspect::properties(k);
for (QVariantMap::ConstIterator it = customProperties.constBegin();
it != customProperties.constEnd(); ++it) {
data.insert(it.key(), it.value());
@@ -222,14 +222,14 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
{
QVariantMap data = defaultData;
const QString sysroot = ProjectExplorer::SysRootKitInformation::sysRoot(k).toUserOutput();
const QString sysroot = ProjectExplorer::SysRootKitAspect::sysRoot(k).toUserOutput();
if (!sysroot.isEmpty())
data.insert(QLatin1String(QBS_SYSROOT), sysroot);
ProjectExplorer::ToolChain *tcC
= ProjectExplorer::ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID);
= ProjectExplorer::ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID);
ProjectExplorer::ToolChain *tcCxx
= ProjectExplorer::ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
= ProjectExplorer::ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
if (!tcC && !tcCxx)
return data;

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -399,7 +399,7 @@ QbsBuildConfigurationFactory::QbsBuildConfigurationFactory()
setSupportedProjectType(Constants::PROJECT_ID);
setSupportedProjectMimeTypeName(Constants::MIME_TYPE);
setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) -> QList<Task> {
const QtSupport::BaseQtVersion * const version = QtSupport::QtKitInformation::qtVersion(k);
const QtSupport::BaseQtVersion * const version = QtSupport::QtKitAspect::qtVersion(k);
return version ? version->reportIssues(projectPath, buildDir)
: QList<ProjectExplorer::Task>();
});

42
src/plugins/qbsprojectmanager/qbskitinformation.cpp
View File

@@ -42,49 +42,49 @@ using namespace ProjectExplorer;
namespace QbsProjectManager {
namespace Internal {
class ConfigWidget final : public KitConfigWidget
class AspectWidget final : public KitAspectWidget
{
Q_OBJECT
public:
ConfigWidget(Kit *kit, const KitInformation *kitInfo)
: KitConfigWidget(kit, kitInfo),
AspectWidget(Kit *kit, const KitAspect *kitInfo)
: KitAspectWidget(kit, kitInfo),
m_contentLabel(new Utils::ElidingLabel),
m_changeButton(new QPushButton(tr("Change...")))
{
connect(m_changeButton, &QPushButton::clicked, this, &ConfigWidget::changeProperties);
connect(m_changeButton, &QPushButton::clicked, this, &AspectWidget::changeProperties);
}
private:
QString displayName() const override { return QbsKitInformation::displayName(); }
QString displayName() const override { return QbsKitAspect::displayName(); }
void makeReadOnly() override { m_changeButton->setEnabled(false); }
void refresh() override { m_contentLabel->setText(QbsKitInformation::representation(kit())); }
void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); }
QWidget *mainWidget() const override { return m_contentLabel; }
QWidget *buttonWidget() const override { return m_changeButton; }
void changeProperties()
{
CustomQbsPropertiesDialog dlg(QbsKitInformation::properties(kit()));
CustomQbsPropertiesDialog dlg(QbsKitAspect::properties(kit()));
if (dlg.exec() == QDialog::Accepted)
QbsKitInformation::setProperties(kit(), dlg.properties());
QbsKitAspect::setProperties(kit(), dlg.properties());
}
QLabel * const m_contentLabel;
QPushButton * const m_changeButton;
};
QbsKitInformation::QbsKitInformation()
QbsKitAspect::QbsKitAspect()
{
setObjectName(QLatin1String("QbsKitInformation"));
setId(QbsKitInformation::id());
setObjectName(QLatin1String("QbsKitAspect"));
setId(QbsKitAspect::id());
setPriority(22000);
}
QString QbsKitInformation::displayName()
QString QbsKitAspect::displayName()
{
return tr("Additional Qbs Profile Settings");
}
QString QbsKitInformation::representation(const Kit *kit)
QString QbsKitAspect::representation(const Kit *kit)
{
const QVariantMap props = properties(kit);
QString repr;
@@ -96,34 +96,34 @@ QString QbsKitInformation::representation(const Kit *kit)
return repr;
}
QVariantMap QbsKitInformation::properties(const Kit *kit)
QVariantMap QbsKitAspect::properties(const Kit *kit)
{
QTC_ASSERT(kit, return QVariantMap());
return kit->value(id()).toMap();
}
void QbsKitInformation::setProperties(Kit *kit, const QVariantMap &properties)
void QbsKitAspect::setProperties(Kit *kit, const QVariantMap &properties)
{
QTC_ASSERT(kit, return);
kit->setValue(id(), properties);
}
Core::Id QbsKitInformation::id()
Core::Id QbsKitAspect::id()
{
return "Qbs.KitInformation";
}
QVariant QbsKitInformation::defaultValue(const Kit *) const { return QString(); }
QList<Task> QbsKitInformation::validate(const Kit *) const { return QList<Task>(); }
QVariant QbsKitAspect::defaultValue(const Kit *) const { return QString(); }
QList<Task> QbsKitAspect::validate(const Kit *) const { return QList<Task>(); }
KitInformation::ItemList QbsKitInformation::toUserOutput(const Kit *k) const
KitAspect::ItemList QbsKitAspect::toUserOutput(const Kit *k) const
{
return ItemList({qMakePair(displayName(), representation(k))});
}
KitConfigWidget *QbsKitInformation::createConfigWidget(Kit *k) const
KitAspectWidget *QbsKitAspect::createConfigWidget(Kit *k) const
{
return new ConfigWidget(k, this);
return new AspectWidget(k, this);
}
} // namespace Internal

6
src/plugins/qbsprojectmanager/qbskitinformation.h
View File

@@ -30,12 +30,12 @@
namespace QbsProjectManager {
namespace Internal {
class QbsKitInformation final : public ProjectExplorer::KitInformation
class QbsKitAspect final : public ProjectExplorer::KitAspect
{
Q_OBJECT
public:
QbsKitInformation();
QbsKitAspect();
static QString displayName();
static QString representation(const ProjectExplorer::Kit *kit);
@@ -48,7 +48,7 @@ private:
QVariant defaultValue(const ProjectExplorer::Kit *) const override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *) const override;
ItemList toUserOutput(const ProjectExplorer::Kit *) const override;
ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *) const override;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const override;
};
} // namespace Internal

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -693,7 +693,7 @@ void QbsProject::configureAsExampleProject(const QSet<Id> &platforms)
};
foreach (Kit *k, kits) {
const QtSupport::BaseQtVersion * const qtVersion
= QtSupport::QtKitInformation::qtVersion(k);
= QtSupport::QtKitAspect::qtVersion(k);
if (!qtVersion || !qtVersionMatchesPlatform(qtVersion))
continue;
if (auto factory = BuildConfigurationFactory::find(k, projectFilePath().toString()))

14
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -163,14 +163,14 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const
const auto * const bgData = static_cast<BuildGraphData *>(directoryData);
qCDebug(qbsPmLog) << "matching kit" << k->displayName() << "against imported build"
<< bgData->bgFilePath.toUserOutput();
if (ToolChainKitInformation::toolChains(k).isEmpty() && bgData->cCompilerPath.isEmpty()
if (ToolChainKitAspect::toolChains(k).isEmpty() && bgData->cCompilerPath.isEmpty()
&& bgData->cxxCompilerPath.isEmpty()) {
return true;
}
const ToolChain * const cToolchain
= ToolChainKitInformation::toolChain(k, Constants::C_LANGUAGE_ID);
= ToolChainKitAspect::toolChain(k, Constants::C_LANGUAGE_ID);
const ToolChain * const cxxToolchain
= ToolChainKitInformation::toolChain(k, Constants::CXX_LANGUAGE_ID);
= ToolChainKitAspect::toolChain(k, Constants::CXX_LANGUAGE_ID);
if (!bgData->cCompilerPath.isEmpty()) {
if (!cToolchain)
return false;
@@ -183,14 +183,14 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const
if (bgData->cxxCompilerPath != cxxToolchain->compilerCommand())
return false;
}
const QtSupport::BaseQtVersion * const qtVersion = QtSupport::QtKitInformation::qtVersion(k);
const QtSupport::BaseQtVersion * const qtVersion = QtSupport::QtKitAspect::qtVersion(k);
if (!bgData->qtBinPath.isEmpty()) {
if (!qtVersion)
return false;
if (bgData->qtBinPath != qtVersion->binPath())
return false;
}
if (bgData->sysroot != SysRootKitInformation::sysRoot(k))
if (bgData->sysroot != SysRootKitAspect::sysRoot(k))
return false;
qCDebug(qbsPmLog) << "Kit matches";
@@ -215,9 +215,9 @@ Kit *QbsProjectImporter::createKit(void *directoryData) const
tcData << findOrCreateToolChains(bgData->cCompilerPath, Constants::C_LANGUAGE_ID);
foreach (const ToolChainData &tc, tcData) {
if (!tc.tcs.isEmpty())
ToolChainKitInformation::setToolChain(k, tc.tcs.first());
ToolChainKitAspect::setToolChain(k, tc.tcs.first());
}
SysRootKitInformation::setSysRoot(k, bgData->sysroot);
SysRootKitAspect::setSysRoot(k, bgData->sysroot);
});
}

2
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -166,7 +166,7 @@ void QbsManager::addProfile(const QString &name, const QVariantMap &data)
void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k)
{
const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k);
const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(k);
if (!qt)
return;

2
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -112,7 +112,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
Core::HelpManager::registerDocumentation({Core::HelpManager::documentationPath() + "/qbs.qch"});
ProjectManager::registerProjectType<QbsProject>(QmlJSTools::Constants::QBS_MIMETYPE);
KitManager::registerKitInformation<QbsKitInformation>();
KitManager::registerKitAspect<QbsKitAspect>();
//menus
// Build Menu: