diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 73832c173a1..bde2b85fc7d 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1401,16 +1401,6 @@ void SelectionAspect::setVolatileValue(const QVariant &val) } } -void SelectionAspect::setVisibleDynamic(bool visible) -{ - if (QLabel *l = label()) - l->setVisible(visible); - if (d->m_comboBox) - d->m_comboBox->setVisible(visible); - for (QRadioButton * const button : qAsConst(d->m_buttons)) - button->setVisible(visible); -} - void SelectionAspect::setDisplayStyle(SelectionAspect::DisplayStyle style) { d->m_displayStyle = style; @@ -1521,14 +1511,6 @@ void MultiSelectionAspect::setAllValues(const QStringList &val) d->m_allValues = val; } -void MultiSelectionAspect::setVisibleDynamic(bool visible) -{ - if (QLabel *l = label()) - l->setVisible(visible); - if (d->m_listView) - d->m_listView->setVisible(visible); -} - void MultiSelectionAspect::setDisplayStyle(MultiSelectionAspect::DisplayStyle style) { d->m_displayStyle = style; diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index 541f872af6a..0f50eed75e9 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -142,7 +142,6 @@ protected: } void registerSubWidget(QWidget *widget); - virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow? void saveToMap(QVariantMap &data, const QVariant &value, const QVariant &defaultValue, const QString &keyExtension = {}) const; @@ -252,9 +251,6 @@ public: void addOption(const QString &displayName, const QString &toolTip = {}); -protected: - void setVisibleDynamic(bool visible) override; - private: std::unique_ptr d; }; @@ -278,9 +274,6 @@ public: QStringList allValues() const; void setAllValues(const QStringList &val); -protected: - void setVisibleDynamic(bool visible) override; - private: std::unique_ptr d; }; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 7c803993549..8ca7055dd2d 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -88,7 +88,7 @@ public: bool isManagedByTarget() const { return m_isManagedByTarget; } private: - void setVisibleDynamic(bool visible) final; + void setVisibleDynamic(bool visible); const ProjectExplorer::Kit *m_kit = nullptr; QMap m_abisToArchMap; @@ -146,7 +146,7 @@ QStringList ArchitecturesAspect::selectedArchitectures() const void ArchitecturesAspect::setVisibleDynamic(bool visible) { - MultiSelectionAspect::setVisibleDynamic(visible); + MultiSelectionAspect::setVisible(visible); m_isManagedByTarget = visible; } diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp index d1dab4c943c..26130027f5b 100644 --- a/src/plugins/qtsupport/qtbuildaspects.cpp +++ b/src/plugins/qtsupport/qtbuildaspects.cpp @@ -65,7 +65,7 @@ void QmlDebuggingAspect::addToLayout(LayoutBuilder &builder) "Only use in a safe environment."); } warningLabel->setText(warningText); - setVisibleDynamic(supported); + setVisible(supported); const bool warningLabelsVisible = supported && !warningText.isEmpty(); warningLabel->setVisible(warningLabelsVisible); }; @@ -98,7 +98,7 @@ void QtQuickCompilerAspect::addToLayout(LayoutBuilder &builder) warningText = tr("Disables QML debugging. QML profiling will still work."); } warningLabel->setText(warningText); - setVisibleDynamic(supported); + setVisible(supported); const bool warningLabelsVisible = supported && !warningText.isEmpty(); warningLabel->setVisible(warningLabelsVisible); };