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

8
apps/code/python_toolbox.cpp
View File

@@ -445,7 +445,7 @@ const ToolboxMessageTree * PythonToolbox::moduleChildren(const char * name, int
*numberOfNodes = childrenCount;
}
assert(childrenCount > 0);
return static_cast<const ToolboxMessageTree *>(t.children(0));
return static_cast<const ToolboxMessageTree *>(t.childAtIndex(0));
}
}
return nullptr;
@@ -476,7 +476,7 @@ KDCoordinate PythonToolbox::rowHeight(int j) {
* We thus decided to compute the real height only for the ifStatement
* children of the toolbox, which is the only menu that has special height
* rows. */
const ToolboxMessageTree * messageTree = static_cast<const ToolboxMessageTree *>(m_messageTreeModel->children(j));
const ToolboxMessageTree * messageTree = static_cast<const ToolboxMessageTree *>(m_messageTreeModel->childAtIndex(j));
return k_font->stringSize(I18n::translate(messageTree->label())).height() + 2*Metric::TableCellVerticalMargin + (messageTree->text() == I18n::Message::Default ? 0 : Toolbox::rowHeight(j));
}
return Toolbox::rowHeight(j);
@@ -484,7 +484,7 @@ KDCoordinate PythonToolbox::rowHeight(int j) {
bool PythonToolbox::selectLeaf(int selectedRow) {
m_selectableTableView.deselectTable();
ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->children(selectedRow);
ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
const char * editedText = I18n::translate(node->insertedText());
// strippedEditedText array needs to be in the same scope as editedText
char strippedEditedText[k_maxMessageSize];
@@ -525,7 +525,7 @@ void PythonToolbox::scrollToLetter(char letter) {
char lowerLetter = tolower(letter);
int index = -1;
for (int i = 0; i < m_messageTreeModel->numberOfChildren(); i++) {
char l = tolower(I18n::translate(m_messageTreeModel->children(i)->label())[0]);
char l = tolower(I18n::translate(m_messageTreeModel->childAtIndex(i)->label())[0]);
if (l == lowerLetter) {
index = i;
break;

2
apps/math_toolbox.cpp
View File

@@ -300,7 +300,7 @@ MathToolbox::MathToolbox() :
}
bool MathToolbox::selectLeaf(int selectedRow) {
ToolboxMessageTree * messageTree = (ToolboxMessageTree *)m_messageTreeModel->children(selectedRow);
ToolboxMessageTree * messageTree = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
m_selectableTableView.deselectTable();
// Translate the message

14
apps/settings/main_controller.cpp
View File

@@ -44,8 +44,8 @@ void MainController::didBecomeFirstResponder() {
bool MainController::handleEvent(Ion::Events::Event event) {
GlobalPreferences * globalPreferences = GlobalPreferences::sharedGlobalPreferences();
if (model()->children(selectedRow())->numberOfChildren() == 0) {
if (model()->children(selectedRow())->label() == promptMessage()) {
if (model()->childAtIndex(selectedRow())->numberOfChildren() == 0) {
if (model()->childAtIndex(selectedRow())->label() == promptMessage()) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
globalPreferences->setShowPopUp(!globalPreferences->showPopUp());
m_selectableTableView.reloadCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow());
@@ -53,7 +53,7 @@ bool MainController::handleEvent(Ion::Events::Event event) {
}
return false;
}
if (model()->children(selectedRow())->label() == I18n::Message::Brightness) {
if (model()->childAtIndex(selectedRow())->label() == I18n::Message::Brightness) {
if (event == Ion::Events::Right || event == Ion::Events::Left || event == Ion::Events::Plus || event == Ion::Events::Minus) {
int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates;
int direction = (event == Ion::Events::Right || event == Ion::Events::Plus) ? delta : -delta;
@@ -63,7 +63,7 @@ bool MainController::handleEvent(Ion::Events::Event event) {
}
return false;
}
if (model()->children(selectedRow())->label() == I18n::Message::Language) {
if (model()->childAtIndex(selectedRow())->label() == I18n::Message::Language) {
if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
stackController()->push(&m_languageController);
return true;
@@ -85,7 +85,7 @@ bool MainController::handleEvent(Ion::Events::Event event) {
} else {
subController = &m_preferencesController;
}
subController->setMessageTreeModel(model()->children(selectedRow()));
subController->setMessageTreeModel(model()->childAtIndex(selectedRow()));
StackViewController * stack = stackController();
stack->push(subController);
return true;
@@ -153,7 +153,7 @@ int MainController::typeAtLocation(int i, int j) {
void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) {
GlobalPreferences * globalPreferences = GlobalPreferences::sharedGlobalPreferences();
Preferences * preferences = Preferences::sharedPreferences();
I18n::Message title = model()->children(index)->label();
I18n::Message title = model()->childAtIndex(index)->label();
if (index == k_indexOfBrightnessCell) {
MessageTableCellWithGaugeWithSeparator * myGaugeCell = (MessageTableCellWithGaugeWithSeparator *)cell;
myGaugeCell->setMessage(title);
@@ -193,7 +193,7 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) {
childIndex = GlobalPreferences::sharedGlobalPreferences()->font() == KDFont::LargeFont ? 0 : 1;
break;
}
I18n::Message message = childIndex >= 0 ? model()->children(index)->children(childIndex)->label() : I18n::Message::Default;
I18n::Message message = childIndex >= 0 ? model()->childAtIndex(index)->childAtIndex(childIndex)->label() : I18n::Message::Default;
myTextCell->setSubtitle(message);
}

2
apps/settings/sub_menu/generic_sub_controller.cpp
View File

@@ -76,7 +76,7 @@ int GenericSubController::typeAtLocation(int i, int j) {
void GenericSubController::willDisplayCellForIndex(HighlightCell * cell, int index) {
MessageTableCell * myCell = (MessageTableCell *)cell;
myCell->setMessage(m_messageTreeModel->children(index)->label());
myCell->setMessage(m_messageTreeModel->childAtIndex(index)->label());
}
void GenericSubController::setMessageTreeModel(const MessageTree * messageTreeModel) {

2
apps/settings/sub_menu/preferences_controller.cpp
View File

@@ -124,7 +124,7 @@ Layout PreferencesController::layoutForPreferences(I18n::Message message) {
void PreferencesController::willDisplayCellForIndex(HighlightCell * cell, int index) {
GenericSubController::willDisplayCellForIndex(cell, index);
MessageTableCellWithExpression * myCell = (MessageTableCellWithExpression *)cell;
myCell->setLayout(layoutForPreferences(m_messageTreeModel->children(index)->label()));
myCell->setLayout(layoutForPreferences(m_messageTreeModel->childAtIndex(index)->label()));
}
KDCoordinate PreferencesController::rowHeight(int j) {

2
apps/shared/settings_message_tree.h
View File

@@ -19,7 +19,7 @@ public:
m_children(children)
{}
const MessageTree * children(int index) const override { return &m_children[index]; }
const MessageTree * childAtIndex(int index) const override { return &m_children[index]; }
private:
const SettingsMessageTree * m_children;

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;