diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index fd0e05178..d6155056c 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -44,7 +44,7 @@ MainController::MainController(Responder * parentResponder) : #endif m_complexFormatCell(I18n::Message::Default, KDText::FontSize::Large), m_brightnessCell(I18n::Message::Default, KDText::FontSize::Large), - m_complexFormatLayout(nullptr), + m_complexFormatLayout(), m_selectableTableView(this), m_messageTreeModel((MessageTree *)&model), m_subController(this), @@ -55,13 +55,6 @@ MainController::MainController(Responder * parentResponder) : } } -MainController::~MainController() { - if (m_complexFormatLayout) { - delete m_complexFormatLayout; - m_complexFormatLayout = nullptr; - } -} - View * MainController::view() { return &m_selectableTableView; } @@ -173,17 +166,13 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) { myCell->setMessage(m_messageTreeModel->children(index)->label()); if (index == 3) { - if (m_complexFormatLayout) { - delete m_complexFormatLayout; - m_complexFormatLayout = nullptr; - } if (Preferences::sharedPreferences()->complexFormat() == Preferences::ComplexFormat::Cartesian) { m_complexFormatLayout = Helpers::CartesianComplexFormat(KDText::FontSize::Small); } else { m_complexFormatLayout = Helpers::PolarComplexFormat(KDText::FontSize::Small); } MessageTableCellWithChevronAndExpression * myExpCell = (MessageTableCellWithChevronAndExpression *)cell; - myExpCell->setExpressionLayout(m_complexFormatLayout); + myExpCell->setLayoutRef(m_complexFormatLayout); return; } if (index == 4) { diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 88e19c92b..c446e8a9f 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -11,11 +11,6 @@ namespace Settings { class MainController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource { public: MainController(Responder * parentResponder); - ~MainController(); - MainController(const MainController& other) = delete; - MainController(MainController&& other) = delete; - MainController& operator=(const MainController& other) = delete; - MainController& operator=(MainController&& other) = delete; View * view() override; bool handleEvent(Ion::Events::Event event) override; void didBecomeFirstResponder() override; @@ -40,7 +35,7 @@ private: MessageTableCellWithChevronAndMessage m_cells[k_numberOfSimpleChevronCells]; MessageTableCellWithChevronAndExpression m_complexFormatCell; MessageTableCellWithGauge m_brightnessCell; - Poincare::ExpressionLayout * m_complexFormatLayout; + Poincare::LayoutReference m_complexFormatLayout; SelectableTableView m_selectableTableView; MessageTree * m_messageTreeModel; SubController m_subController;