From 96cf07e77d594ffb0f9d6ff0211a18777127b7c8 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 26 Mar 2018 22:28:43 +0200 Subject: [PATCH] LP-567 added comments and const correctness --- .../gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp | 6 +++++- .../gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp b/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp index c91db8559..42374410e 100644 --- a/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp +++ b/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp @@ -238,6 +238,8 @@ DataObjectTreeItem *UAVObjectTreeModel::createDataObject(UAVDataObject *obj) addObjectTreeItem(obj->getObjID(), item); item->setHighlightManager(m_highlightManager); + // metadata items are created up front and are added/removed as needed + // see toggleMetaItems() MetaObjectTreeItem *metaItem = createMetaObject(obj->getMetaObject()); if (showMetadata()) { appendItem(item, metaItem); @@ -303,6 +305,8 @@ TreeItem *UAVObjectTreeModel::getParentItem(UAVDataObject *obj, bool categorize) QStringList categoryPath = category.split('/'); foreach(QString category, categoryPath) { + // metadata items are created and destroyed as needed + // see toggleCategoryItems() TreeItem *categoryItem = parentItem->childByName(category); if (!categoryItem) { @@ -486,7 +490,7 @@ QModelIndex UAVObjectTreeModel::index(int row, int column, const QModelIndex &pa return QModelIndex(); } -QModelIndex UAVObjectTreeModel::index(TreeItem *item, int column) +QModelIndex UAVObjectTreeModel::index(TreeItem *item, int column) const { if (item == m_rootItem) { return QModelIndex(); diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h b/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h index 80f2abc62..e6f641ae5 100644 --- a/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h +++ b/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h @@ -109,7 +109,7 @@ private: QHash m_objectTreeItems; - QModelIndex index(TreeItem *item, int column = 0); + QModelIndex index(TreeItem *item, int column = 0) const; void setupModelData(); void resetModelData();