From 7e09f7d4ff58fad24b4cecc2584d3e6c94ab8f6a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 13 Sep 2023 17:29:18 +0200 Subject: [PATCH] QmlDesigner: Clean up PropertyTree Model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove call to test * Remve qdebugs * Fix priorityListSignals Change-Id: I0828a9eb7b90c6d7a4903f2cbaf4382e1f3a413e Reviewed-by: Henning Gründl --- .../connectioneditor/propertytreemodel.cpp | 46 ++++--------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp index 862390986f0..ae0f8972c5d 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp @@ -152,7 +152,6 @@ void PropertyTreeModel::resetModel() } endResetModel(); - testModel(); } QString stripQualification(const QString &string) @@ -563,41 +562,16 @@ const std::vector PropertyTreeModel::sortedAndFilteredSignalNames( { Q_UNUSED(recursive); - const std::vector priorityListSignals = {"clicked", - "doubleClicked", - "pressed", - "released", - "toggled", - "valueModified", - "valueChanged", - "checkedChanged", - "moved", - "accepted", - "editingFinished", - "entered", - "exited", - "canceled", - "triggered", - "stateChanged", - "started", - "stopped", - "finished" - "enabledChanged", - "visibleChanged", - "opacityChanged", - "rotationChanged"}; + auto filtered = Utils::filtered(metaInfo.signalNames(), [](const PropertyName &name) { + if (std::find(priorityListSignals.cbegin(), priorityListSignals.cend(), name) + != priorityListSignals.cend()) + return true; - auto filtered - = Utils::filtered(metaInfo.signalNames(), [&priorityListSignals](const PropertyName &name) { - if (std::find(priorityListSignals.cbegin(), priorityListSignals.cend(), name) - != priorityListSignals.cend()) - return true; + if (name.endsWith("Changed")) //option? + return false; - if (name.endsWith("Changed")) //option? - return false; - - return true; - }); + return true; + }); auto sorted = Utils::sorted(filtered); @@ -796,7 +770,6 @@ void PropertyListProxyModel::resetModel() void PropertyListProxyModel::setRowAndInternalId(int row, quintptr internalId) { - qDebug() << Q_FUNC_INFO << row << internalId; QTC_ASSERT(m_treeModel, return ); if (internalId == internalRootIndex) @@ -830,7 +803,6 @@ QHash PropertyListProxyModel::roleNames() const void PropertyListProxyModel::goInto(int row) { - qDebug() << Q_FUNC_INFO << row << m_parentIndex.internalId(); setRowAndInternalId(row, 0); //m_parentIndex.internalId()); emit parentNameChanged(); @@ -838,8 +810,6 @@ void PropertyListProxyModel::goInto(int row) void PropertyListProxyModel::goUp() { - qDebug() << Q_FUNC_INFO; - if (m_parentIndex.internalId() == internalRootIndex) return;