|
39 | 39 | UAVObjectTreeModel::UAVObjectTreeModel(QObject *parent) : QAbstractItemModel(parent) |
40 | 40 | { |
41 | 41 | m_highlightManager = new HighlightManager(); |
42 | | - connect(m_highlightManager, &HighlightManager::updateHighlight, this, &refreshHighlight); |
| 42 | + connect(m_highlightManager, &HighlightManager::updateHighlight, this, &UAVObjectTreeModel::refreshHighlight); |
43 | 43 |
|
44 | 44 | TreeItem::setHighlightTime(recentlyUpdatedTimeout()); |
45 | 45 |
|
@@ -162,8 +162,8 @@ void UAVObjectTreeModel::setupModelData() |
162 | 162 | UAVObjectManager *objManager = pm->getObject<UAVObjectManager>(); |
163 | 163 | Q_ASSERT(objManager); |
164 | 164 |
|
165 | | - connect(objManager, &UAVObjectManager::newObject, this, &newObject, Qt::UniqueConnection); |
166 | | - connect(objManager, &UAVObjectManager::newInstance, this, &newObject, Qt::UniqueConnection); |
| 165 | + connect(objManager, &UAVObjectManager::newObject, this, &UAVObjectTreeModel::newObject, Qt::UniqueConnection); |
| 166 | + connect(objManager, &UAVObjectManager::newInstance, this, &UAVObjectTreeModel::newObject, Qt::UniqueConnection); |
167 | 167 |
|
168 | 168 | QList< QList<UAVDataObject *> > objList = objManager->getDataObjects(); |
169 | 169 | foreach(QList<UAVDataObject *> list, objList) { |
@@ -197,11 +197,11 @@ void UAVObjectTreeModel::newObject(UAVObject *obj) |
197 | 197 |
|
198 | 198 | void UAVObjectTreeModel::addObject(UAVDataObject *obj) |
199 | 199 | { |
200 | | - connect(obj, &UAVDataObject::objectUpdated, this, &updateObject, Qt::UniqueConnection); |
201 | | - connect(obj, &UAVDataObject::isKnownChanged, this, &updateIsKnown, Qt::UniqueConnection); |
| 200 | + connect(obj, &UAVDataObject::objectUpdated, this, &UAVObjectTreeModel::updateObject, Qt::UniqueConnection); |
| 201 | + connect(obj, &UAVDataObject::isKnownChanged, this, &UAVObjectTreeModel::updateIsKnown, Qt::UniqueConnection); |
202 | 202 | if (obj->getInstID() == 0) { |
203 | 203 | UAVMetaObject *metaObj = obj->getMetaObject(); |
204 | | - connect(metaObj, &UAVDataObject::objectUpdated, this, &updateObject, Qt::UniqueConnection); |
| 204 | + connect(metaObj, &UAVDataObject::objectUpdated, this, &UAVObjectTreeModel::updateObject, Qt::UniqueConnection); |
205 | 205 | } |
206 | 206 | if (obj->isSingleInstance()) { |
207 | 207 | DataObjectTreeItem *dataObjectItem = createDataObject(obj); |
|
0 commit comments