diff options
| author | 2026-03-29 05:20:40 +1100 | |
|---|---|---|
| committer | 2026-03-29 05:20:40 +1100 | |
| commit | b55ba81d2a417df3e0ee9260be06425550f13541 (patch) | |
| tree | d17414652c9edb2f161daf254f9b2988970f4b76 /src/osd/modules/debugger | |
| parent | 8653a44cb144c66a3f199a08763a885adb121071 (diff) | |
Fixed things C++20 doesn't allow:
ui/info.cpp, imagedev/cassette.cpp: Deal with UTF-8 strings as a distint
type.
ui/inputmap.cpp, debugger/qt/dasmwindow.cpp, debugger/qt/mainwindow.cpp,
sound/coreaudio_sound.cpp, cpu/drcbec.cpp, mit/tx0_v.cpp,
konami/3dom2.cpp: machine/mc68328.cpp, cpu/mips/mips1.cpp,
cpu/mips/r4000.cpp, cpu/romp, machine/cammu.cpp, machine/ns32081.cpp:
Avoid arithmetic between different enum types.
dec/pdp1.cpp, konami/firebeat.cpp, mit/tx0.cpp, sound/lc7535.cpp,
sound/spkrdev.cpp: Avoid arithmetic between enum and floating point.
gaelco/gaelco3d_m.cpp: Fixed deprecated uses of volatile variables.
sound/discrete.h: Avoid comparing enum to floatint point.
ui/toolbar.ipp: Don't use UTF-8 qualifier on pure ASCII strings, just
assume char is ASCII-like.
cpu/unsp: Use default constructor for compiler_state.
sgi/pm2_mmu.cpp: Avoid conflict between file static access and
identically named function in unistd.h.
osd/interface/audio.h: Provide an explicit constructor.
util/server_http_impl.hpp: Fixed uninitialised class member warning.
Diffstat (limited to 'src/osd/modules/debugger')
| -rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.cpp | 2 | ||||
| -rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp index e90054a3292..a7d57f0518c 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.cpp +++ b/src/osd/modules/debugger/qt/dasmwindow.cpp @@ -92,7 +92,7 @@ DasmWindow::DasmWindow(DebuggerQt &debugger, QWidget *parent) : m_breakpointEnableAct = new QAction("Disable Breakpoint at Cursor", this); m_runToCursorAct = new QAction("Run to Cursor", this); m_breakpointToggleAct->setShortcut(Qt::Key_F9); - m_breakpointEnableAct->setShortcut(Qt::SHIFT | Qt::Key_F9); + m_breakpointEnableAct->setShortcut(0 | Qt::SHIFT | Qt::Key_F9); // zero because C++20 doesn't allow arithmetic between different enums m_runToCursorAct->setShortcut(Qt::Key_F4); connect(m_breakpointToggleAct, &QAction::triggered, this, &DasmWindow::toggleBreakpointAtCursor); connect(m_breakpointEnableAct, &QAction::triggered, this, &DasmWindow::enableBreakpointAtCursor); diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index 0085dac364b..1f765afc2a6 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -67,7 +67,7 @@ MainWindow::MainWindow(DebuggerQt &debugger, QWidget *parent) : m_breakpointEnableAct = new QAction("Disable Breakpoint at Cursor", this); m_runToCursorAct = new QAction("Run to Cursor", this); m_breakpointToggleAct->setShortcut(Qt::Key_F9); - m_breakpointEnableAct->setShortcut(Qt::SHIFT | Qt::Key_F9); + m_breakpointEnableAct->setShortcut(0 | Qt::SHIFT | Qt::Key_F9); // zero because C++20 doesn't allow arithmetic between different enums m_runToCursorAct->setShortcut(Qt::Key_F4); connect(m_breakpointToggleAct, &QAction::triggered, this, &MainWindow::toggleBreakpointAtCursor); connect(m_breakpointEnableAct, &QAction::triggered, this, &MainWindow::enableBreakpointAtCursor); |
