From fc0596d5293ba6678979e0d80927271a6b9784aa Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Mon, 23 Dec 2019 17:24:41 +0200 Subject: [PATCH] Fix Qt compile --- win/Qt/qt_menu.cpp | 7 +++++-- win/Qt/qt_win.cpp | 2 +- win/Qt/qt_win.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/win/Qt/qt_menu.cpp b/win/Qt/qt_menu.cpp index b91b056c3..8be6abaaf 100644 --- a/win/Qt/qt_menu.cpp +++ b/win/Qt/qt_menu.cpp @@ -534,6 +534,9 @@ void NetHackQtMenuWindow::Invert() return; for (int i=0; iitem(i, 0); if (count != NULL) count->setText(""); @@ -813,10 +816,10 @@ void NetHackQtMenuOrTextWindow::StartMenu() actual->StartMenu(); } void NetHackQtMenuOrTextWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr, - const QString& str, bool presel) + const QString& str, unsigned itemflags) { if (!actual) impossible("AddMenu called before we know if Menu or Text"); - actual->AddMenu(glyph,identifier,ch,gch,attr,str,presel); + actual->AddMenu(glyph,identifier,ch,gch,attr,str,itemflags); } void NetHackQtMenuOrTextWindow::EndMenu(const QString& prompt) { diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index 664591834..8c4ecac04 100644 --- a/win/Qt/qt_win.cpp +++ b/win/Qt/qt_win.cpp @@ -125,7 +125,7 @@ void NetHackQtWindow::CursorTo(int x,int y) { puts("unexpected CursorTo"); } void NetHackQtWindow::PutStr(int attr, const QString& text) { puts("unexpected PutStr"); } void NetHackQtWindow::StartMenu() { puts("unexpected StartMenu"); } void NetHackQtWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr, - const QString& str, bool presel) { puts("unexpected AddMenu"); } + const QString& str, unsigned itemflags) { puts("unexpected AddMenu"); } void NetHackQtWindow::EndMenu(const QString& prompt) { puts("unexpected EndMenu"); } int NetHackQtWindow::SelectMenu(int how, MENU_ITEM_P **menu_list) { puts("unexpected SelectMenu"); return 0; } void NetHackQtWindow::ClipAround(int x,int y) { puts("unexpected ClipAround"); } diff --git a/win/Qt/qt_win.h b/win/Qt/qt_win.h index b85104414..486bf4ec6 100644 --- a/win/Qt/qt_win.h +++ b/win/Qt/qt_win.h @@ -34,7 +34,7 @@ public: } virtual void StartMenu(); virtual void AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr, - const QString& str, bool presel); + const QString& str, unsigned itemflags); virtual void EndMenu(const QString& prompt); virtual int SelectMenu(int how, MENU_ITEM_P **menu_list); virtual void ClipAround(int x,int y);