From 470ce8a856287666f27abf62ac078a6c7a24d36e Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 11 Feb 2019 17:10:03 +0100 Subject: [PATCH] ProjectExplorer: Move use of some knowledge from KitAspectWidget to KitAspect Essentially a follow-up to 09a7d2bd45ad5cd710c93550fb9dafa5cff925bc. Change-Id: I4dd9d64eec77ddf9cdccbac808e9a0978b9986bf Reviewed-by: Christian Kandeler --- src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | 4 ++-- src/plugins/debugger/debuggerkitinformation.cpp | 2 +- src/plugins/projectexplorer/kitinformation.cpp | 6 +++--- src/plugins/projectexplorer/kitmanager.h | 2 -- src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | 4 ++-- src/plugins/projectexplorer/miniprojecttargetselector.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 2 +- src/plugins/qtsupport/qtkitinformation.cpp | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index da3902ffd88..e56cf7c4bfb 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -80,7 +80,7 @@ public: { m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setEnabled(false); - m_comboBox->setToolTip(toolTip()); + m_comboBox->setToolTip(ki->description()); foreach (CMakeTool *tool, CMakeToolManager::cmakeTools()) cmakeToolAdded(tool->id()); @@ -328,7 +328,7 @@ public: m_label(new QLabel), m_changeButton(new QPushButton) { - m_label->setToolTip(toolTip()); + m_label->setToolTip(ki->description()); m_changeButton->setText(tr("Change...")); refresh(); connect(m_changeButton, &QPushButton::clicked, diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index b75dea2ab69..9b38456c982 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -67,6 +67,7 @@ public: m_comboBox->setEnabled(true); refresh(); + m_comboBox->setToolTip(ki->description()); connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), this, &DebuggerKitAspectWidget::currentDebuggerChanged); @@ -96,7 +97,6 @@ private: { m_ignoreChanges = true; m_comboBox->clear(); - m_comboBox->setToolTip(toolTip()); m_comboBox->addItem(tr("None"), QString()); for (const DebuggerItem &item : DebuggerItemManager::debuggers()) m_comboBox->addItem(item.displayName(), item.id()); diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index eb4a13a6019..fbc2078364a 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -243,7 +243,7 @@ public: layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); auto cb = new QComboBox; cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); - cb->setToolTip(toolTip()); + cb->setToolTip(ki->description()); m_languageComboboxMap.insert(l, cb); layout->addWidget(cb, row, 1); @@ -768,7 +768,7 @@ public: { for (IDeviceFactory *factory : IDeviceFactory::allDeviceFactories()) m_comboBox->addItem(factory->displayName(), factory->deviceType().toSetting()); - m_comboBox->setToolTip(toolTip()); + m_comboBox->setToolTip(ki->description()); refresh(); connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), this, &DeviceTypeKitAspectWidget::currentTypeChanged); @@ -893,7 +893,7 @@ public: m_comboBox->setModel(m_model); m_manageButton = new QPushButton(KitAspectWidget::msgManage()); refresh(); - m_comboBox->setToolTip(toolTip()); + m_comboBox->setToolTip(ki->description()); connect(m_model, &QAbstractItemModel::modelAboutToBeReset, this, &DeviceKitAspectWidget::modelAboutToReset); diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index e8d60b11f18..6992284c311 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -127,8 +127,6 @@ public: KitAspectWidget(Kit *kit, const KitAspect *ki); Core::Id kitInformationId() const; - QString displayName() const { return m_kitInformation->displayName(); } - QString toolTip() const { return m_kitInformation->description(); } virtual void makeReadOnly() = 0; virtual void refresh() = 0; diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 05aea733aee..20c006bc21d 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -218,8 +218,8 @@ void KitManagerConfigWidget::addAspectToWorkingCopy(KitAspect *aspect) QTC_ASSERT(widget, return); QTC_ASSERT(!m_widgets.contains(widget), return); - const QString name = widget->displayName() + ':'; - QString toolTip = widget->toolTip(); + const QString name = aspect->displayName() + ':'; + QString toolTip = aspect->description(); auto action = new QAction(tr("Mark as Mutable"), nullptr); action->setCheckable(true); diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 4484ccb215e..7a070cc6286 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -593,7 +593,7 @@ void KitAreaWidget::setKit(Kit *k) if (k && k->isMutable(ki->id())) { KitAspectWidget *widget = ki->createConfigWidget(k); m_widgets << widget; - QLabel *label = new QLabel(widget->displayName()); + QLabel *label = new QLabel(ki->displayName()); m_labels << label; widget->setStyle(QStyleFactory::create(QLatin1String("fusion"))); diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index bcaac1f7f25..00b2bccb643 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -53,7 +53,7 @@ public: : KitAspectWidget(k, ki), m_lineEdit(new QLineEdit) { refresh(); // set up everything according to kit - m_lineEdit->setToolTip(toolTip()); + m_lineEdit->setToolTip(ki->description()); connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectWidget::mkspecWasChanged); } diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 7635c797181..64eb3b5ca0b 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -64,7 +64,7 @@ public: m_manageButton = new QPushButton(KitAspectWidget::msgManage()); refresh(); - m_combo->setToolTip(toolTip()); + m_combo->setToolTip(ki->description()); connect(m_combo, static_cast(&QComboBox::currentIndexChanged), this, &QtKitAspectWidget::currentWasChanged);