g++-12 bits, mostly Qt5 related

I forced a test compile to -std=c++20 mostly to see what we would
be up against. There was only a small number of things and they
are corrected in this commit.

c++20 has some issues with comparisons and bit twiddling between
different enums.

The vendor-supplied Qt5 header files triggered some of those issues as
well, so the qt_pre.h and qt_post.h NetHack header files were adjusted
to make those new warnings go away.  I have not tested Qt6 under the
new compiler and c++ version yet.

Because there are multiple pragmas in qt_pre.h now, the conditional
ifdef structure in there was modified a little to make maintenance
simpler and have a single pragma push at the top. The pragma pop
comes after the Qt vendor-supplied header files, and is done
in qt_post.h.

The display.h macro cmap_to_glyph() was used in
a Qt c++ file and triggered a series of warnings because of that.
Rather than write c++20-friendly versions of those macros, the
simple fix is to provide a function on the C side of things
to front the cmap_to_glyph() macro, so fn_cmap_to_glyph()
was added.

Also thrown into this commit, PatR picked up on the fact that for
yesterday's new warning in qt_menu.cpp, the compiler had correctly
picked up on the fact that the format range of the variable 'cash'
had been correctly upper-capped at 999999999L in the warning message
because of an assignment prior. He suggested that perhaps by also adding
    if (cash < 0)
       cash = 0;
the warning might be eliminated altogether.
After a test, that was proven to be correct, so yesterday's
more-kludgy change is reverted and replaced with that variable
variable restriction ahead of the snprintf().
This commit is contained in:
nhmall
2022-06-11 13:52:58 -04:00
parent 46e58c8e95
commit 6c61004b06
10 changed files with 94 additions and 11 deletions
+16
View File
@@ -222,15 +222,31 @@ NetHackQtStatusWindow::NetHackQtStatusWindow() :
ride.setIcon(p_ride, "riding");
// separator lines
#if __cplusplus >= 202002L
hline1.setFrameStyle(static_cast<int>(QFrame::HLine)
| static_cast<int>(QFrame::Sunken));
hline2.setFrameStyle(static_cast<int>(QFrame::HLine)
| static_cast<int>(QFrame::Sunken));
hline3.setFrameStyle(static_cast<int>(QFrame::HLine)
| static_cast<int>(QFrame::Sunken));
#else
hline1.setFrameStyle(QFrame::HLine | QFrame::Sunken);
hline2.setFrameStyle(QFrame::HLine | QFrame::Sunken);
hline3.setFrameStyle(QFrame::HLine | QFrame::Sunken);
#endif
hline1.setLineWidth(1);
hline2.setLineWidth(1);
hline3.setLineWidth(1);
// vertical separators for condensed layout (statuslines:2)
#if __cplusplus >= 202002L
vline1.setFrameStyle(static_cast<int>(QFrame::VLine)
| static_cast<int>(QFrame::Sunken));
vline2.setFrameStyle(static_cast<int>(QFrame::VLine)
| static_cast<int>(QFrame::Sunken));
#else
vline1.setFrameStyle(QFrame::VLine | QFrame::Sunken);
vline2.setFrameStyle(QFrame::VLine | QFrame::Sunken);
#endif
vline1.setLineWidth(1); // separates Alignment from Charisma
vline2.setLineWidth(1);
vline2.hide(); // padding to keep row 2 aligned with row 1, never shown