From 72f6946b14220a5287b7ffa48c19237141ccfb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 19 Apr 2018 16:13:32 +0200 Subject: [PATCH] [poincare] Rename BracketRight/LeftLayout -> Right/LeftBracketLayout. Change-Id: I382ac960aeca861d1003cd2373709a6759ded685 --- poincare/Makefile | 4 ++-- poincare/include/poincare_layouts.h | 4 ++-- poincare/src/expression_layout_cursor.cpp | 4 ++-- ...acket_left_layout.cpp => left_bracket_layout.cpp} | 12 ++++++------ .../{bracket_left_layout.h => left_bracket_layout.h} | 2 +- ...ket_right_layout.cpp => right_bracket_layout.cpp} | 12 ++++++------ ...bracket_right_layout.h => right_bracket_layout.h} | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) rename poincare/src/layout/{bracket_left_layout.cpp => left_bracket_layout.cpp} (86%) rename poincare/src/layout/{bracket_left_layout.h => left_bracket_layout.h} (93%) rename poincare/src/layout/{bracket_right_layout.cpp => right_bracket_layout.cpp} (85%) rename poincare/src/layout/{bracket_right_layout.h => right_bracket_layout.h} (93%) diff --git a/poincare/Makefile b/poincare/Makefile index 0aa804a7e..bb5d2acd4 100644 --- a/poincare/Makefile +++ b/poincare/Makefile @@ -92,9 +92,9 @@ objs += $(addprefix poincare/src/layout/,\ binomial_coefficient_layout.o\ bounded_static_layout_hierarchy.o\ bracket_pair_layout.o\ - bracket_left_layout.o\ + left_bracket_layout.o\ bracket_left_right_layout.o\ - bracket_right_layout.o\ + right_bracket_layout.o\ ceiling_layout.o\ char_layout.o\ condensed_sum_layout.o\ diff --git a/poincare/include/poincare_layouts.h b/poincare/include/poincare_layouts.h index 2342016ac..5f2dc7096 100644 --- a/poincare/include/poincare_layouts.h +++ b/poincare/include/poincare_layouts.h @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/poincare/src/expression_layout_cursor.cpp b/poincare/src/expression_layout_cursor.cpp index e208535e9..e5a1711c7 100644 --- a/poincare/src/expression_layout_cursor.cpp +++ b/poincare/src/expression_layout_cursor.cpp @@ -183,9 +183,9 @@ void ExpressionLayoutCursor::insertText(const char * text) { * binary file 2K. */ #if 0 else if (text[i] == '[') { - newChild = new BracketLeftLayout(); + newChild = new LeftBracketLayout(); } else if (text[i] == ']') { - newChild = new BracketRightLayout(); + newChild = new RightBracketLayout(); } #endif else { diff --git a/poincare/src/layout/bracket_left_layout.cpp b/poincare/src/layout/left_bracket_layout.cpp similarity index 86% rename from poincare/src/layout/bracket_left_layout.cpp rename to poincare/src/layout/left_bracket_layout.cpp index c2028ee66..27e99e0ff 100644 --- a/poincare/src/layout/bracket_left_layout.cpp +++ b/poincare/src/layout/left_bracket_layout.cpp @@ -1,4 +1,4 @@ -#include "bracket_left_layout.h" +#include "left_bracket_layout.h" #include extern "C" { #include @@ -6,18 +6,18 @@ extern "C" { namespace Poincare { -ExpressionLayout * BracketLeftLayout::clone() const { - BracketLeftLayout * layout = new BracketLeftLayout(); +ExpressionLayout * LeftBracketLayout::clone() const { + LeftBracketLayout * layout = new LeftBracketLayout(); return layout; } -void BracketLeftLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) { +void LeftBracketLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) { ctx->fillRect(KDRect(p.x()+k_externWidthMargin, p.y(), k_lineThickness, operandHeight()), expressionColor); ctx->fillRect(KDRect(p.x()+k_externWidthMargin, p.y(), k_bracketWidth, k_lineThickness), expressionColor); ctx->fillRect(KDRect(p.x()+k_externWidthMargin, p.y() + operandHeight(), k_bracketWidth, k_lineThickness), expressionColor); } -void BracketLeftLayout::computeOperandHeight() { +void LeftBracketLayout::computeOperandHeight() { assert(m_parent != nullptr); m_operandHeight = Metric::MinimalBracketAndParenthesisHeight; int currentNumberOfOpenBrackets = 1; @@ -39,7 +39,7 @@ void BracketLeftLayout::computeOperandHeight() { } } -void BracketLeftLayout::computeBaseline() { +void LeftBracketLayout::computeBaseline() { assert(m_parent != nullptr); m_baseline = operandHeight()/2; int currentNumberOfOpenBrackets = 1; diff --git a/poincare/src/layout/bracket_left_layout.h b/poincare/src/layout/left_bracket_layout.h similarity index 93% rename from poincare/src/layout/bracket_left_layout.h rename to poincare/src/layout/left_bracket_layout.h index 9325d48fa..0b5d94cd4 100644 --- a/poincare/src/layout/bracket_left_layout.h +++ b/poincare/src/layout/left_bracket_layout.h @@ -6,7 +6,7 @@ namespace Poincare { -class BracketLeftLayout : public BracketLeftRightLayout { +class LeftBracketLayout : public BracketLeftRightLayout { public: using BracketLeftRightLayout::BracketLeftRightLayout; ExpressionLayout * clone() const override; diff --git a/poincare/src/layout/bracket_right_layout.cpp b/poincare/src/layout/right_bracket_layout.cpp similarity index 85% rename from poincare/src/layout/bracket_right_layout.cpp rename to poincare/src/layout/right_bracket_layout.cpp index cfeea9e03..f3743b1d8 100644 --- a/poincare/src/layout/bracket_right_layout.cpp +++ b/poincare/src/layout/right_bracket_layout.cpp @@ -1,4 +1,4 @@ -#include "bracket_right_layout.h" +#include "right_bracket_layout.h" #include extern "C" { #include @@ -6,18 +6,18 @@ extern "C" { namespace Poincare { -ExpressionLayout * BracketRightLayout::clone() const { - BracketRightLayout * layout = new BracketRightLayout(); +ExpressionLayout * RightBracketLayout::clone() const { + RightBracketLayout * layout = new RightBracketLayout(); return layout; } -void BracketRightLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) { +void RightBracketLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) { ctx->fillRect(KDRect(p.x()+k_widthMargin, p.y(), k_lineThickness, operandHeight()), expressionColor); ctx->fillRect(KDRect(p.x()+k_widthMargin-k_bracketWidth+1, p.y(), k_bracketWidth, k_lineThickness), expressionColor); ctx->fillRect(KDRect(p.x()+k_widthMargin-k_bracketWidth+1, p.y() + operandHeight(), k_bracketWidth, k_lineThickness), expressionColor); } -void BracketRightLayout::computeOperandHeight() { +void RightBracketLayout::computeOperandHeight() { assert(m_parent != nullptr); m_operandHeight = Metric::MinimalBracketAndParenthesisHeight; int currentNumberOfOpenBrackets = 1; @@ -38,7 +38,7 @@ void BracketRightLayout::computeOperandHeight() { } } -void BracketRightLayout::computeBaseline() { +void RightBracketLayout::computeBaseline() { assert(m_parent != nullptr); m_baseline = operandHeight()/2; int currentNumberOfOpenBrackets = 1; diff --git a/poincare/src/layout/bracket_right_layout.h b/poincare/src/layout/right_bracket_layout.h similarity index 93% rename from poincare/src/layout/bracket_right_layout.h rename to poincare/src/layout/right_bracket_layout.h index 239dc268f..c2bfede34 100644 --- a/poincare/src/layout/bracket_right_layout.h +++ b/poincare/src/layout/right_bracket_layout.h @@ -6,7 +6,7 @@ namespace Poincare { -class BracketRightLayout : public BracketLeftRightLayout { +class RightBracketLayout : public BracketLeftRightLayout { public: using BracketLeftRightLayout::BracketLeftRightLayout; ExpressionLayout * clone() const override;