Website Summary Files Commits Branches @commit @diff @stats
path: root / src / ConsoleInterface
diff options
context:
space:
mode:
5 files changed, 11 insertions, 4 deletions
-rw-r--r--src/ConsoleInterface/Command.cpp2
-rw-r--r--src/ConsoleInterface/Command.h2
-rw-r--r--src/ConsoleInterface/Menu.cpp3
-rw-r--r--src/ConsoleInterface/Toolbox.cpp6
-rw-r--r--src/ConsoleInterface/Toolbox.h2
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 <iostream>
+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