diff --git a/Source/GUI/MemWatcher/MemWatchModel.cpp b/Source/GUI/MemWatcher/MemWatchModel.cpp index b3289702..731be174 100644 --- a/Source/GUI/MemWatcher/MemWatchModel.cpp +++ b/Source/GUI/MemWatcher/MemWatchModel.cpp @@ -181,7 +181,7 @@ void MemWatchModel::editEntry(MemWatchEntry* entry, const QModelIndex& index) void MemWatchModel::clearRoot() { - m_rootNode->clearAllChild(); + m_rootNode->removeChildren(); emit layoutChanged(); } diff --git a/Source/GUI/MemWatcher/MemWatchWidget.cpp b/Source/GUI/MemWatcher/MemWatchWidget.cpp index 7a071d18..6bbd8c0d 100644 --- a/Source/GUI/MemWatcher/MemWatchWidget.cpp +++ b/Source/GUI/MemWatcher/MemWatchWidget.cpp @@ -328,8 +328,8 @@ void MemWatchWidget::copySelectedWatchesToClipBoard() } rootNodeCopy.writeToJson(jsonNode); - // Clear borrowed children before going out of scope. - rootNodeCopy.clearAllChild(); + // Remove borrowed children before going out of scope. + rootNodeCopy.removeChildren(); for (auto& [childNode, parentNode] : parentMap) { childNode->setParent(parentNode); @@ -353,7 +353,7 @@ void MemWatchWidget::pasteWatchFromClipBoard(const QModelIndex& referenceIndex) } const QVector children{copiedRootNode.getChildren()}; - copiedRootNode.clearAllChild(); + copiedRootNode.removeChildren(); std::vector childrenVec(children.constBegin(), children.constEnd()); m_watchModel->addNodes(childrenVec, referenceIndex); diff --git a/Source/MemoryWatch/MemWatchTreeNode.cpp b/Source/MemoryWatch/MemWatchTreeNode.cpp index 71519aa9..082a5496 100644 --- a/Source/MemoryWatch/MemWatchTreeNode.cpp +++ b/Source/MemoryWatch/MemWatchTreeNode.cpp @@ -112,7 +112,7 @@ void MemWatchTreeNode::removeChild(const int row) m_children.remove(row); } -void MemWatchTreeNode::clearAllChild() +void MemWatchTreeNode::removeChildren() { m_children.clear(); } diff --git a/Source/MemoryWatch/MemWatchTreeNode.h b/Source/MemoryWatch/MemWatchTreeNode.h index c66c7cd9..da764fe3 100644 --- a/Source/MemoryWatch/MemWatchTreeNode.h +++ b/Source/MemoryWatch/MemWatchTreeNode.h @@ -36,7 +36,7 @@ class MemWatchTreeNode void appendChild(MemWatchTreeNode* node); void insertChild(int row, MemWatchTreeNode* node); void removeChild(int row); - void clearAllChild(); + void removeChildren(); void readFromJson(const QJsonObject& json, MemWatchTreeNode* parent = nullptr); void writeToJson(QJsonObject& json) const;