Skip to content

Commit c589755

Browse files
nakstnakst
authored
Fix C++20 errors
1 parent 17c1fc2 commit c589755

1 file changed

Lines changed: 30 additions & 30 deletions

File tree

‎gf2.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,68 +1528,68 @@ void InterfaceAddBuiltinWindowsAndCommands() {
15281528
interfaceDataViewers.Add({ "Add bitmap...", BitmapAddDialog });
15291529

15301530
interfaceCommands.Add({ .label = "Run\tShift+F5",
1531-
{ .code = UI_KEYCODE_FKEY(5), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "r" } });
1531+
.shortcut = { .code = UI_KEYCODE_FKEY(5), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "r" } });
15321532
interfaceCommands.Add({ .label = "Run paused\tCtrl+F5",
1533-
{ .code = UI_KEYCODE_FKEY(5), .ctrl = true, .invoke = CommandSendToGDB, .cp = (void *) "start" } });
1533+
.shortcut = { .code = UI_KEYCODE_FKEY(5), .ctrl = true, .invoke = CommandSendToGDB, .cp = (void *) "start" } });
15341534
interfaceCommands.Add({ .label = "Kill\tF3",
1535-
{ .code = UI_KEYCODE_FKEY(3), .invoke = CommandSendToGDB, .cp = (void *) "kill" } });
1535+
.shortcut = { .code = UI_KEYCODE_FKEY(3), .invoke = CommandSendToGDB, .cp = (void *) "kill" } });
15361536
interfaceCommands.Add({ .label = "Restart GDB\tCtrl+R",
1537-
{ .code = UI_KEYCODE_LETTER('R'), .ctrl = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-restart-gdb" } });
1537+
.shortcut = { .code = UI_KEYCODE_LETTER('R'), .ctrl = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-restart-gdb" } });
15381538
interfaceCommands.Add({ .label = "Load Last Coredump\tCtrl+Shift+R",
1539-
{ .code = UI_KEYCODE_LETTER('R'), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-load-last-coredump" } });
1539+
.shortcut = { .code = UI_KEYCODE_LETTER('R'), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-load-last-coredump" } });
15401540
interfaceCommands.Add({ .label = "Connect\tF4",
1541-
{ .code = UI_KEYCODE_FKEY(4), .invoke = CommandSendToGDB, .cp = (void *) "target remote :1234" } });
1541+
.shortcut = { .code = UI_KEYCODE_FKEY(4), .invoke = CommandSendToGDB, .cp = (void *) "target remote :1234" } });
15421542
interfaceCommands.Add({ .label = "Continue\tF5",
1543-
{ .code = UI_KEYCODE_FKEY(5), .invoke = CommandSendToGDB, .cp = (void *) "c" } });
1543+
.shortcut = { .code = UI_KEYCODE_FKEY(5), .invoke = CommandSendToGDB, .cp = (void *) "c" } });
15441544
interfaceCommands.Add({ .label = "Step over\tF10",
1545-
{ .code = UI_KEYCODE_FKEY(10), .invoke = CommandSendToGDB, .cp = (void *) "gf-next" } });
1545+
.shortcut = { .code = UI_KEYCODE_FKEY(10), .invoke = CommandSendToGDB, .cp = (void *) "gf-next" } });
15461546
interfaceCommands.Add({ .label = "Step out of block\tShift+F10",
1547-
{ .code = UI_KEYCODE_FKEY(10), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-step-out-of-block" } });
1547+
.shortcut = { .code = UI_KEYCODE_FKEY(10), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-step-out-of-block" } });
15481548
interfaceCommands.Add({ .label = "Step in\tF11",
1549-
{ .code = UI_KEYCODE_FKEY(11), .invoke = CommandSendToGDB, .cp = (void *) "gf-step" } });
1549+
.shortcut = { .code = UI_KEYCODE_FKEY(11), .invoke = CommandSendToGDB, .cp = (void *) "gf-step" } });
15501550
interfaceCommands.Add({ .label = "Step into outer\tShift+F8",
1551-
{ .code = UI_KEYCODE_FKEY(8), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-step-into-outer" } });
1551+
.shortcut = { .code = UI_KEYCODE_FKEY(8), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-step-into-outer" } });
15521552
interfaceCommands.Add({ .label = "Step out\tShift+F11",
1553-
{ .code = UI_KEYCODE_FKEY(11), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "finish" } });
1553+
.shortcut = { .code = UI_KEYCODE_FKEY(11), .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "finish" } });
15541554
interfaceCommands.Add({ .label = "Reverse continue\tCtrl+Shift+F5",
1555-
{ .code = UI_KEYCODE_FKEY(5), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "reverse-continue" } });
1555+
.shortcut = { .code = UI_KEYCODE_FKEY(5), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "reverse-continue" } });
15561556
interfaceCommands.Add({ .label = "Reverse step over\tCtrl+Shift+F10",
1557-
{ .code = UI_KEYCODE_FKEY(10), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "reverse-next" } });
1557+
.shortcut = { .code = UI_KEYCODE_FKEY(10), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "reverse-next" } });
15581558
interfaceCommands.Add({ .label = "Reverse step in\tCtrl+Shift+F11",
1559-
{ .code = UI_KEYCODE_FKEY(11), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "reverse-step" } });
1559+
.shortcut = { .code = UI_KEYCODE_FKEY(11), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "reverse-step" } });
15601560
interfaceCommands.Add({ .label = "Pause\tF8",
1561-
{ .code = UI_KEYCODE_FKEY(8), .invoke = CommandPause } });
1561+
.shortcut = { .code = UI_KEYCODE_FKEY(8), .invoke = CommandPause } });
15621562
interfaceCommands.Add({ .label = "Toggle breakpoint\tF9",
1563-
{ .code = UI_KEYCODE_FKEY(9), .invoke = CommandToggleBreakpoint } });
1563+
.shortcut = { .code = UI_KEYCODE_FKEY(9), .invoke = CommandToggleBreakpoint } });
15641564
if (vimServerEnabled) {
15651565
interfaceCommands.Add({ .label = "Sync with gvim\tF2",
1566-
{ .code = UI_KEYCODE_FKEY(2), .invoke = CommandSyncWithGvim } });
1566+
.shortcut = { .code = UI_KEYCODE_FKEY(2), .invoke = CommandSyncWithGvim } });
15671567
}
15681568
interfaceCommands.Add({ .label = "Ask GDB for PWD\tCtrl+Shift+P",
1569-
{ .code = UI_KEYCODE_LETTER('P'), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-get-pwd" } });
1569+
.shortcut = { .code = UI_KEYCODE_LETTER('P'), .ctrl = true, .shift = true, .invoke = CommandSendToGDB, .cp = (void *) "gf-get-pwd" } });
15701570
interfaceCommands.Add({ .label = "Toggle disassembly\tCtrl+D",
1571-
{ .code = UI_KEYCODE_LETTER('D'), .ctrl = true, .invoke = CommandToggleDisassembly } });
1571+
.shortcut = { .code = UI_KEYCODE_LETTER('D'), .ctrl = true, .invoke = CommandToggleDisassembly } });
15721572
interfaceCommands.Add({ .label = "Set disassembly mode\tCtrl+M",
1573-
{ .code = UI_KEYCODE_LETTER('M'), .ctrl = true, .invoke = CommandSetDisassemblyMode } });
1573+
.shortcut = { .code = UI_KEYCODE_LETTER('M'), .ctrl = true, .invoke = CommandSetDisassemblyMode } });
15741574
interfaceCommands.Add({ .label = "Add watch",
1575-
{ .invoke = CommandAddWatch } });
1575+
.shortcut = { .invoke = CommandAddWatch } });
15761576
interfaceCommands.Add({ .label = "Inspect line",
1577-
{ .code = UI_KEYCODE_BACKTICK, .invoke = CommandInspectLine } });
1577+
.shortcut = { .code = UI_KEYCODE_BACKTICK, .invoke = CommandInspectLine } });
15781578
interfaceCommands.Add({ .label = "Copy Layout to Clipboard", { .invoke = CopyLayoutToClipboard } });
15791579
interfaceCommands.Add({ .label = nullptr,
1580-
{ .code = UI_KEYCODE_LETTER('E'), .ctrl = true, .invoke = CommandWatchAddEntryForAddress } });
1580+
.shortcut = { .code = UI_KEYCODE_LETTER('E'), .ctrl = true, .invoke = CommandWatchAddEntryForAddress } });
15811581
interfaceCommands.Add({ .label = nullptr,
1582-
{ .code = UI_KEYCODE_LETTER('G'), .ctrl = true, .invoke = CommandWatchViewSourceAtAddress } });
1582+
.shortcut = { .code = UI_KEYCODE_LETTER('G'), .ctrl = true, .invoke = CommandWatchViewSourceAtAddress } });
15831583
interfaceCommands.Add({ .label = nullptr,
1584-
{ .code = UI_KEYCODE_LETTER('B'), .ctrl = true, .invoke = CommandToggleFillDataTab } });
1584+
.shortcut = { .code = UI_KEYCODE_LETTER('B'), .ctrl = true, .invoke = CommandToggleFillDataTab } });
15851585
interfaceCommands.Add({ .label = nullptr,
1586-
{ .code = UI_KEYCODE_LETTER('P'), .ctrl = true, .shift = false, .invoke = CommandPreviousCommand } });
1586+
.shortcut = { .code = UI_KEYCODE_LETTER('P'), .ctrl = true, .shift = false, .invoke = CommandPreviousCommand } });
15871587
interfaceCommands.Add({ .label = nullptr,
1588-
{ .code = UI_KEYCODE_LETTER('N'), .ctrl = true, .shift = false, .invoke = CommandNextCommand } });
1588+
.shortcut = { .code = UI_KEYCODE_LETTER('N'), .ctrl = true, .shift = false, .invoke = CommandNextCommand } });
15891589
interfaceCommands.Add({ .label = nullptr,
1590-
{ .code = UI_KEYCODE_LETTER('L'), .ctrl = true, .shift = false, .invoke = CommandClearOutput } });
1590+
.shortcut = { .code = UI_KEYCODE_LETTER('L'), .ctrl = true, .shift = false, .invoke = CommandClearOutput } });
15911591
interfaceCommands.Add({ .label = nullptr,
1592-
{ .code = UI_KEYCODE_LETTER('U'), .ctrl = true, .shift = false, .invoke = [](void*){ UITextboxClear(textboxInput, false); } } });
1592+
.shortcut = { .code = UI_KEYCODE_LETTER('U'), .ctrl = true, .shift = false, .invoke = [](void*){ UITextboxClear(textboxInput, false); } } });
15931593

15941594
msgReceivedData = ReceiveMessageRegister(MsgReceivedData);
15951595
msgReceivedControl = ReceiveMessageRegister(MsgReceivedControl);

0 commit comments

Comments
 (0)