nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Revert "PR913 - Another Qt 6 signal: mapped -> mappedString"

Browse Source 
This reverts commit 57617da39b.
This commit is contained in:
nhmall
2022-10-29 10:33:17 -04:00
parent ad74d9e407
commit a51c983a13
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
win/Qt/qt_main.cpp
View File

@@ -829,13 +829,8 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
// order changed: was Again, Get, Kick, Throw, Fire, Drop, Eat, Rest // order changed: was Again, Get, Kick, Throw, Fire, Drop, Eat, Rest
// now Again, PickUp, Drop, Kick, Throw, Fire, Eat, Rest // now Again, PickUp, Drop, Kick, Throw, Fire, Eat, Rest
QSignalMapper* sm = new QSignalMapper(this); QSignalMapper* sm = new QSignalMapper(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(sm, SIGNAL(mappedString(const QString&)),
this, SLOT(doKeys(const QString&)));
#else
connect(sm, SIGNAL(mapped(const QString&)), connect(sm, SIGNAL(mapped(const QString&)),
this, SLOT(doKeys(const QString&))); this, SLOT(doKeys(const QString&)));
#endif
AddToolButton(toolbar, sm, "Again", do_repeat, QPixmap(again_xpm)); AddToolButton(toolbar, sm, "Again", do_repeat, QPixmap(again_xpm));
// this used to be called "Get" which is confusing to experienced players // this used to be called "Get" which is confusing to experienced players
AddToolButton(toolbar, sm, "Pick up", dopickup, QPixmap(pickup_xpm)); AddToolButton(toolbar, sm, "Pick up", dopickup, QPixmap(pickup_xpm));