From 5351831bb35cd216ae3cd8145c6172ae8341e905 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 1 May 2022 10:06:09 +0300 Subject: Autocommit at 01.05.2022 @ 10:06 --- src/ConsoleInterface/Command.cpp | 2 +- src/ConsoleInterface/Command.h | 2 +- src/ConsoleInterface/Menu.cpp | 3 +++ src/ConsoleInterface/Toolbox.cpp | 6 +++++- src/ConsoleInterface/Toolbox.h | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/ConsoleInterface') diff --git a/src/ConsoleInterface/Command.cpp b/src/ConsoleInterface/Command.cpp index 98987b7..da8915f 100644 --- a/src/ConsoleInterface/Command.cpp +++ b/src/ConsoleInterface/Command.cpp @@ -10,6 +10,6 @@ void Command::run() const { exec(); } -const char* Command::get_nameInMenu() { +const char* Command::get_nameInMenu() const { return nameInMenu; } diff --git a/src/ConsoleInterface/Command.h b/src/ConsoleInterface/Command.h index 9e6228a..fba011b 100644 --- a/src/ConsoleInterface/Command.h +++ b/src/ConsoleInterface/Command.h @@ -9,7 +9,7 @@ public: Command(const char* nameInMenu, void (*exec)()); void run() const; - const char* get_nameInMenu(); + const char* get_nameInMenu() const; }; #endif diff --git a/src/ConsoleInterface/Menu.cpp b/src/ConsoleInterface/Menu.cpp index 5dd59bb..3f7c8e5 100644 --- a/src/ConsoleInterface/Menu.cpp +++ b/src/ConsoleInterface/Menu.cpp @@ -2,6 +2,9 @@ #include "Toolbox.h" void Menu::navigate() const { + resetOrderedList(); for (unsigned i = 0; i < menuOptions.get_count(); i++) printOrderedListElem(menuOptions[i].get_nameInMenu()); + + print(""); } diff --git a/src/ConsoleInterface/Toolbox.cpp b/src/ConsoleInterface/Toolbox.cpp index b3eb1bf..fd73bd2 100644 --- a/src/ConsoleInterface/Toolbox.cpp +++ b/src/ConsoleInterface/Toolbox.cpp @@ -1,6 +1,10 @@ #include "Toolbox.h" #include +void print(const char* message) { + std::cout << message; +} + void printLine(const char* message) { std::cout << message << std::endl; } @@ -12,6 +16,6 @@ void printOrderedListElem(const char* message) { printLine(message); } -void resetOrderedList(int starter = 1) { +void resetOrderedList(int starter) { orderedListIndex = starter; } diff --git a/src/ConsoleInterface/Toolbox.h b/src/ConsoleInterface/Toolbox.h index 9300d2d..55aa67c 100644 --- a/src/ConsoleInterface/Toolbox.h +++ b/src/ConsoleInterface/Toolbox.h @@ -4,6 +4,6 @@ void printLine(const char* message); void printOrderedListElem(const char* message); -void resetOrderedList(int starter); +void resetOrderedList(int starter = 1); #endif -- cgit v1.3.1-23-gd82d