From b2ea3caefae5a0b42fa825bc47049915bcd5b7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 11 Jul 2018 17:25:53 +0200 Subject: [PATCH] [tree] Rename collapseSiblingsAndMoveCursor -> collapseSiblings --- poincare/include/poincare/layout_node.h | 2 +- poincare/include/poincare/layout_reference.h | 2 +- poincare/src/layout_cursor.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poincare/include/poincare/layout_node.h b/poincare/include/poincare/layout_node.h index 0719a8a71..ef302ecee 100644 --- a/poincare/include/poincare/layout_node.h +++ b/poincare/include/poincare/layout_node.h @@ -62,7 +62,7 @@ public: // Tree modification // Collapse - virtual void collapseSiblingsAndMoveCursor(LayoutCursor * cursor) {} + virtual void collapseSiblings(LayoutCursor * cursor) {} // User input virtual void deleteBeforeCursor(LayoutCursor * cursor); diff --git a/poincare/include/poincare/layout_reference.h b/poincare/include/poincare/layout_reference.h index 95006c09e..42bd86784 100644 --- a/poincare/include/poincare/layout_reference.h +++ b/poincare/include/poincare/layout_reference.h @@ -87,7 +87,7 @@ public: return removeChild(childAtIndex(index), cursor, force); } // Collapse - void collapseSiblingsAndMoveCursor(LayoutCursor * cursor) { return this->typedNode()->collapseSiblingsAndMoveCursor(cursor); } + void collapseSiblings(LayoutCursor * cursor) { return this->typedNode()->collapseSiblings(cursor); } // Allocation failure static TreeNode * FailedAllocationStaticNode(); diff --git a/poincare/src/layout_cursor.cpp b/poincare/src/layout_cursor.cpp index 865136ba5..c88a01723 100644 --- a/poincare/src/layout_cursor.cpp +++ b/poincare/src/layout_cursor.cpp @@ -123,7 +123,7 @@ void LayoutCursor::addLayoutAndMoveCursor(LayoutRef l) { bool layoutWillBeMerged = l.isHorizontal(); m_layoutRef.addSibling(this, l, true); if (!layoutWillBeMerged) { - l.collapseSiblingsAndMoveCursor(this); + l.collapseSiblings(this); } }