diff --git a/escher/include/escher.h b/escher/include/escher.h index c7356438f..ac5efde2c 100644 --- a/escher/include/escher.h +++ b/escher/include/escher.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/escher/include/escher/expression_view_with_cursor.h b/escher/include/escher/expression_view_with_cursor.h deleted file mode 100644 index cecd62ec0..000000000 --- a/escher/include/escher/expression_view_with_cursor.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ESCHER_EXPRESSION_VIEW_WITH_CURSOR_H -#define ESCHER_EXPRESSION_VIEW_WITH_CURSOR_H - -#include -#include -#include -#include -#include - -class ExpressionViewWithCursor : public View { -public: - ExpressionViewWithCursor(Poincare::ExpressionLayout * expressionLayout); - bool isEditing() const { return m_isEditing; } - void setEditing(bool isEditing); - void setCursor(Poincare::ExpressionLayoutCursor cursor) { m_cursor = cursor; } - void cursorPositionChanged(); - KDRect cursorRect(); - Poincare::ExpressionLayoutCursor * cursor() { return &m_cursor; } - ExpressionView * expressionView() { return &m_expressionView; } - /* View */ - KDSize minimalSizeForOptimalDisplay() const override; -private: - enum class Position { - Top, - Bottom - }; - int numberOfSubviews() const override { return 2; } - View * subviewAtIndex(int index) override; - void layoutSubviews() override; - void layoutCursorSubview(); - Poincare::ExpressionLayoutCursor m_cursor; - ExpressionView m_expressionView; - TextCursorView m_cursorView; - bool m_isEditing; -}; - -#endif