diff options
author | David Crocker <dcrocker@eschertech.com> | 2020-01-04 21:15:22 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2020-01-04 21:15:22 +0300 |
commit | 5bd28a1aea25e83e6e1d7a0ca50cd000e7baf1a7 (patch) | |
tree | 059d11bfc384d80c7ff07d3457e994ac50a0c07e /src/Display/Menu.h | |
parent | 8ded9143fa9d07dcddd525683403980c42881f1a (diff) |
Conditional GCode fixes and exception specifiers
Loops are now working
Added noexcept specifiers to omst of the remaining C++ source files
Diffstat (limited to 'src/Display/Menu.h')
-rw-r--r-- | src/Display/Menu.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/Display/Menu.h b/src/Display/Menu.h index e60657f8..1efc874c 100644 --- a/src/Display/Menu.h +++ b/src/Display/Menu.h @@ -21,36 +21,36 @@ class MessageBox; class Menu { public: - Menu(Lcd7920& refLcd); - void Load(const char* filename); // load a menu file - void Pop(); - void EncoderAction(int action); - void Refresh(); - void ClearHighlighting(); - void DisplayMessageBox(const MessageBox& mbox); - void ClearMessageBox(); + Menu(Lcd7920& refLcd) noexcept; + void Load(const char* filename) noexcept; // load a menu file + void Pop() noexcept; + void EncoderAction(int action) noexcept; + void Refresh() noexcept; + void ClearHighlighting() noexcept; + void DisplayMessageBox(const MessageBox& mbox) noexcept; + void ClearMessageBox() noexcept; private: - void LoadFixedMenu(); - void ResetCache(); - void Reload(); - void DrawAll(); - const char *ParseMenuLine(char * s); - void LoadError(const char *msg, unsigned int line); - void AddItem(MenuItem *item, bool isSelectable); - const char *AppendString(const char *s); - - void EncoderActionEnterItemHelper(); - void EncoderActionScrollItemHelper(int action); - void EncoderAction_ExecuteHelper(const char *const cmd); - - void AdvanceHighlightedItem(int n); - MenuItem *FindNextSelectableItem(MenuItem *p) const; - MenuItem *FindPrevSelectableItem(MenuItem *p) const; - - static const char *SkipWhitespace(const char *s); - static char *SkipWhitespace(char *s); - static bool CheckVisibility(MenuItem::Visibility vis); + void LoadFixedMenu() noexcept; + void ResetCache() noexcept; + void Reload() noexcept; + void DrawAll() noexcept; + const char *ParseMenuLine(char * s) noexcept; + void LoadError(const char *msg, unsigned int line) noexcept; + void AddItem(MenuItem *item, bool isSelectable) noexcept; + const char *AppendString(const char *s) noexcept; + + void EncoderActionEnterItemHelper() noexcept; + void EncoderActionScrollItemHelper(int action) noexcept; + void EncoderAction_ExecuteHelper(const char *const cmd) noexcept; + + void AdvanceHighlightedItem(int n) noexcept; + MenuItem *FindNextSelectableItem(MenuItem *p) const noexcept; + MenuItem *FindPrevSelectableItem(MenuItem *p) const noexcept; + + static const char *SkipWhitespace(const char *s) noexcept; + static char *SkipWhitespace(char *s) noexcept; + static bool CheckVisibility(MenuItem::Visibility vis) noexcept; static const size_t CommandBufferSize = 2500; static const size_t MaxMenuLineLength = 120; // adjusts behaviour in Reload() |