OpenSource/floatpump-firmware
1
0
Fork 0
Code Pull Requests Releases 4 Wiki Activity

FIX: change to uniqe_ptr

Browse Source
This commit is contained in:
Robin Dietzel 2023-01-26 14:28:17 +01:00
parent e435291279
commit df4b34545e
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Inc/git_rev.h
View File

@ -7,6 +7,6 @@
// Auto generated header file containing the last git revision // Auto generated header file containing the last git revision
#define GIT_HASH "b7b396d" #define GIT_HASH "5f98ee9"
#endif //FLOATPUMP_GIT_REVISION_TEMPLATE_H #endif //FLOATPUMP_GIT_REVISION_TEMPLATE_H

4
Core/Src/main.cpp
View File

@ -173,8 +173,8 @@ int main(void) {
Menu mainmenu("Hauptmenu"); Menu mainmenu("Hauptmenu");
mainmenu.addSubmenu(&tankmenu); mainmenu.addSubmenu(tankmenu);
mainmenu.addSubmenu(&refillmenu); mainmenu.addSubmenu(refillmenu);

7
Middlewares/floatpump/Inc/Menu.h
View File

@ -143,9 +143,8 @@ namespace floatpump {
} }
auto addSubmenu(Menu *submenu) -> void { auto addSubmenu(Menu &menu) -> void {
submenu->m_parent = this; m_submenus.emplace_back(std::make_unique<Menu>(std::move(menu)))->m_parent = this;
m_submenus.push_back(submenu);
} }
auto printLine() -> const std::string { auto printLine() -> const std::string {
@ -168,7 +167,7 @@ namespace floatpump {
private: private:
std::vector<std::unique_ptr<IMenuEntry>> m_entries; std::vector<std::unique_ptr<IMenuEntry>> m_entries;
std::vector<Menu *> m_submenus; std::vector<std::unique_ptr<Menu>> m_submenus;
Menu *m_parent = nullptr; Menu *m_parent = nullptr;
std::string m_name; std::string m_name;
}; };

2
Middlewares/floatpump/Src/Menu.cpp
View File

@ -98,7 +98,7 @@ namespace floatpump::menu {
auto Menu::getSubmenu(int index) -> Menu * { auto Menu::getSubmenu(int index) -> Menu * {
if (index >= 0 && index < m_submenus.size()) { if (index >= 0 && index < m_submenus.size()) {
return m_submenus[index]; return m_submenus[index].get();
} else { } else {
return nullptr; return nullptr;
} }