From 7fb871944d1d710fdef5bd15dd5d53f14ec71d5d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 5 Jan 2022 13:30:44 +0100 Subject: [PATCH] Tracing: Give TimelineModel a name and make its properties FINAL You really should not shadow them. The name helps to use it from QML in a type safe manner. Change-Id: I3fbd03ad267e10f5003647cdfb916a6f90e30b8c Reviewed-by: Alessandro Portale Reviewed-by: Ulf Hermann --- src/libs/tracing/qml/CategoryLabel.qml | 2 +- src/libs/tracing/timelinemodel.h | 32 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml index 954e6e324d6..05e653229d4 100644 --- a/src/libs/tracing/qml/CategoryLabel.qml +++ b/src/libs/tracing/qml/CategoryLabel.qml @@ -31,7 +31,7 @@ import QtCreator.Tracing Item { id: labelContainer - property QtObject model + property TimelineModel model property QtObject notesModel property string text: model ? model.displayName : "" property bool expanded: model && model.expanded diff --git a/src/libs/tracing/timelinemodel.h b/src/libs/tracing/timelinemodel.h index 1778e8b768c..5fe31ac33e5 100644 --- a/src/libs/tracing/timelinemodel.h +++ b/src/libs/tracing/timelinemodel.h @@ -39,22 +39,22 @@ class TimelineModelAggregator; class TRACING_EXPORT TimelineModel : public QObject { Q_OBJECT - Q_PROPERTY(int modelId READ modelId CONSTANT) - Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName NOTIFY displayNameChanged) - Q_PROPERTY(QString tooltip READ tooltip NOTIFY tooltipChanged) - Q_PROPERTY(QColor categoryColor READ categoryColor NOTIFY categoryColorChanged) - Q_PROPERTY(bool hasMixedTypesInExpandedState READ hasMixedTypesInExpandedState NOTIFY hasMixedTypesInExpandedStateChanged) - Q_PROPERTY(bool empty READ isEmpty NOTIFY contentChanged) - Q_PROPERTY(bool hidden READ hidden WRITE setHidden NOTIFY hiddenChanged) - Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged) - Q_PROPERTY(int height READ height NOTIFY heightChanged) - Q_PROPERTY(int expandedRowCount READ expandedRowCount NOTIFY contentChanged) - Q_PROPERTY(int collapsedRowCount READ collapsedRowCount NOTIFY contentChanged) - Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged) - Q_PROPERTY(QVariantList labels READ labels NOTIFY labelsChanged) - Q_PROPERTY(int count READ count NOTIFY contentChanged) - Q_PROPERTY(int defaultRowHeight READ defaultRowHeight CONSTANT) - QML_ANONYMOUS + Q_PROPERTY(int modelId READ modelId CONSTANT FINAL) + Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName NOTIFY displayNameChanged FINAL) + Q_PROPERTY(QString tooltip READ tooltip NOTIFY tooltipChanged FINAL) + Q_PROPERTY(QColor categoryColor READ categoryColor NOTIFY categoryColorChanged FINAL) + Q_PROPERTY(bool hasMixedTypesInExpandedState READ hasMixedTypesInExpandedState NOTIFY hasMixedTypesInExpandedStateChanged FINAL) + Q_PROPERTY(bool empty READ isEmpty NOTIFY contentChanged FINAL) + Q_PROPERTY(bool hidden READ hidden WRITE setHidden NOTIFY hiddenChanged FINAL) + Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged FINAL) + Q_PROPERTY(int height READ height NOTIFY heightChanged FINAL) + Q_PROPERTY(int expandedRowCount READ expandedRowCount NOTIFY contentChanged FINAL) + Q_PROPERTY(int collapsedRowCount READ collapsedRowCount NOTIFY contentChanged FINAL) + Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged FINAL) + Q_PROPERTY(QVariantList labels READ labels NOTIFY labelsChanged FINAL) + Q_PROPERTY(int count READ count NOTIFY contentChanged FINAL) + Q_PROPERTY(int defaultRowHeight READ defaultRowHeight CONSTANT FINAL) + QML_ELEMENT public: class TimelineModelPrivate;