From 5a35089aa52f09de00ee47fb1de7a102372ce6c9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 8 Sep 2020 18:55:42 -0700 Subject: [PATCH] NUVIE: Rename clashing ScrollEventType enum --- engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp | 6 +++--- engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp index 6ca22ba2ad2..a7fdb76de0d 100644 --- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp +++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp @@ -240,7 +240,7 @@ void MsgScrollNewUI::Display(bool full_redraw) { } GUI_status MsgScrollNewUI::KeyDown(const Common::KeyState &key) { - ScrollEventType event = SCROLL_ESCAPE; + MsgScrollEventType event = SCROLL_ESCAPE; /* switch(key.keycode) { @@ -256,12 +256,12 @@ GUI_status MsgScrollNewUI::KeyDown(const Common::KeyState &key) { } GUI_status MsgScrollNewUI::MouseDown(int x, int y, Shared::MouseButton button) { - ScrollEventType event = SCROLL_ESCAPE; + MsgScrollEventType event = SCROLL_ESCAPE; return scroll_movement_event(event); } -GUI_status MsgScrollNewUI::scroll_movement_event(ScrollEventType event) { +GUI_status MsgScrollNewUI::scroll_movement_event(MsgScrollEventType event) { switch (event) { case SCROLL_UP : if (position > 0) { diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h index 8df0b88ef88..f949f702618 100644 --- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h +++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h @@ -43,7 +43,7 @@ typedef enum { SCROLL_UP, SCROLL_DOWN, SCROLL_ESCAPE -} ScrollEventType; +} MsgScrollEventType; class MsgScrollNewUI: public MsgScroll { @@ -99,7 +99,7 @@ protected: MsgLine *add_new_line() override; private: - GUI_status scroll_movement_event(ScrollEventType event); + GUI_status scroll_movement_event(MsgScrollEventType event); uint16 count_empty_lines(Std::string s); };