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

Move some knowledge from KitAspectWidget to KitAspect

Browse Source 
The authoritative source of information about a KitAspect is the
KitAspect itself, not the associated widget.

Change-Id: I72d3d0425b845457846a940350bab59f1ff0cc2c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-06 16:16:07 +01:00
parent ce19540b77
commit 09a7d2bd45
13 changed files with 50 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -57,11 +57,8 @@ public:
AndroidGdbServerKitAspectWidget(Kit *kit, const KitAspect *ki);
~AndroidGdbServerKitAspectWidget() override;
QString displayName() const override;
QString toolTip() const override;
void makeReadOnly() override;
void refresh() override;
bool visibleInKit() override;
QWidget *mainWidget() const override;
QWidget *buttonWidget() const override;
@@ -78,6 +75,8 @@ private:
AndroidGdbServerKitAspect::AndroidGdbServerKitAspect()
{
setId(AndroidGdbServerKitAspect::id());
setDisplayName(tr("Android GDB server"));
setDescription(tr("The GDB server to use for this kit."));
setPriority(27999); // Just one less than Debugger!
}
@@ -91,6 +90,11 @@ QList<Task> AndroidGdbServerKitAspect::validate(const Kit *) const
return QList<Task>();
}
bool AndroidGdbServerKitAspect::isApplicableToKit(const Kit *k) const
{
return DeviceKitAspect::deviceId(k) == Constants::ANDROID_DEVICE_ID;
}
KitAspect::ItemList AndroidGdbServerKitAspect::toUserOutput(const Kit *kit) const
{
return KitAspect::ItemList()
@@ -169,16 +173,6 @@ AndroidGdbServerKitAspectWidget::~AndroidGdbServerKitAspectWidget()
delete m_label;
}
QString AndroidGdbServerKitAspectWidget::displayName() const
{
return tr("Android GDB server");
}
QString AndroidGdbServerKitAspectWidget::toolTip() const
{
return tr("The GDB server to use for this kit.");
}
void AndroidGdbServerKitAspectWidget::makeReadOnly()
{
m_button->setEnabled(false);
@@ -189,11 +183,6 @@ void AndroidGdbServerKitAspectWidget::refresh()
m_label->setText(AndroidGdbServerKitAspect::gdbServer(m_kit).toString());
}
bool AndroidGdbServerKitAspectWidget::visibleInKit()
{
return DeviceKitAspect::deviceId(m_kit) == Constants::ANDROID_DEVICE_ID;
}
QWidget *AndroidGdbServerKitAspectWidget::mainWidget() const
{
return m_label;

3
src/plugins/android/androidgdbserverkitinformation.h
View File

@@ -37,9 +37,8 @@ public:
AndroidGdbServerKitAspect();
QVariant defaultValue(const ProjectExplorer::Kit *) const override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *) const override;
bool isApplicableToKit(const ProjectExplorer::Kit *k) const override;
ItemList toUserOutput(const ProjectExplorer::Kit *) const override;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const override;