UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/escher] Rename ToolboxMessageTree::children -> childAtIndex

Browse Source
This commit is contained in:
Léa Saviot
2020-04-30 14:14:08 +02:00
committed by Émilie Feral
parent bba5b237d2
commit 6d7b294bca
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/include/escher/message_tree.h
View File

@@ -10,7 +10,7 @@ public:
m_numberOfChildren(numberOfChildren)
{
};
virtual const MessageTree * children(int index) const = 0;
virtual const MessageTree * childAtIndex(int index) const = 0;
I18n::Message label() const { return m_label; }
int numberOfChildren() const { return m_numberOfChildren; }
bool isNull() const { return (m_label == (I18n::Message)0); }

2
escher/include/escher/toolbox_message_tree.h
View File

@@ -24,7 +24,7 @@ public:
N,
true);
}
const MessageTree * children(int index) const override { return &m_children[index]; }
const MessageTree * childAtIndex(int index) const override { return &m_children[index]; }
I18n::Message text() const { return m_text; }
I18n::Message insertedText() const { return m_insertedText; }
bool stripInsertedText() const { return m_stripInsertedText; }

8
escher/src/toolbox.cpp
View File

@@ -25,7 +25,7 @@ int Toolbox::reusableCellCount(int type) {
}
void Toolbox::willDisplayCellForIndex(HighlightCell * cell, int index) {
ToolboxMessageTree * messageTree = (ToolboxMessageTree *)m_messageTreeModel->children(index);
ToolboxMessageTree * messageTree = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(index);
if (messageTree->numberOfChildren() == 0) {
MessageTableCellWithMessage * myCell = (MessageTableCellWithMessage *)cell;
myCell->setMessage(messageTree->label());
@@ -39,7 +39,7 @@ void Toolbox::willDisplayCellForIndex(HighlightCell * cell, int index) {
}
int Toolbox::typeAtLocation(int i, int j) {
MessageTree * messageTree = (MessageTree *)m_messageTreeModel->children(j);
MessageTree * messageTree = (MessageTree *)m_messageTreeModel->childAtIndex(j);
if (messageTree->numberOfChildren() == 0) {
return LeafCellType;
}
@@ -48,7 +48,7 @@ int Toolbox::typeAtLocation(int i, int j) {
bool Toolbox::selectSubMenu(int selectedRow) {
m_selectableTableView.deselectTable();
m_messageTreeModel = (ToolboxMessageTree *)m_messageTreeModel->children(selectedRow);
m_messageTreeModel = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
return NestedMenuController::selectSubMenu(selectedRow);
}
@@ -63,7 +63,7 @@ bool Toolbox::returnToPreviousMenu() {
ToolboxMessageTree * parentMessageTree = (ToolboxMessageTree *)rootModel();
Stack::State * previousState = m_stack.stateAtIndex(index++);
while (currentDepth-- > 1) {
parentMessageTree = (ToolboxMessageTree *)parentMessageTree->children(previousState->selectedRow());
parentMessageTree = (ToolboxMessageTree *)parentMessageTree->childAtIndex(previousState->selectedRow());
previousState = m_stack.stateAtIndex(index++);
}
m_messageTreeModel = parentMessageTree;