[EGD-3375] Changed Models pointers to shared_ptr. (#505)

This commit is contained in:
PrzeBrudny
2020-07-08 12:18:16 +02:00
committed by GitHub
parent b4ec5eafb0
commit 53f47439d8
19 changed files with 68 additions and 74 deletions

View File

@@ -25,7 +25,7 @@ namespace gui
{
NotesMainWindow::NotesMainWindow(app::Application *app)
: AppWindow(app, gui::name::window::main_window), notesModel{new NotesModel(app)}
: AppWindow(app, gui::name::window::main_window), notesModel{std::make_shared<NotesModel>(app)}
{
buildInterface();
}
@@ -35,14 +35,14 @@ namespace gui
destroyInterface();
buildInterface();
}
void NotesMainWindow::buildInterface()
{
AppWindow::buildInterface();
list = new gui::ListView(this, 16, 105, 480 - 32, 440);
list = new gui::ListView(this, 16, 105, 480 - 32, 440, notesModel);
list->setPenFocusWidth(0);
list->setPenWidth(0);
list->setProvider(notesModel);
setFocusItem(list);
@@ -55,15 +55,10 @@ namespace gui
topBar->setActive(TopBar::Elements::TIME, true);
}
void NotesMainWindow::destroyInterface()
{
erase();
delete notesModel;
}
NotesMainWindow::~NotesMainWindow()
{
destroyInterface();
}
void NotesMainWindow::onBeforeShow(ShowMode mode, SwitchData *data)