From c8400dcfe61eb0d7f124d35aa1f1dec5088122a7 Mon Sep 17 00:00:00 2001 From: stephena Date: Wed, 19 Nov 2014 22:29:33 +0000 Subject: [PATCH] Fixed debugger 'reset' command help documentation. Renamed 'Vlist' to 'VarList', since it's more descriptive. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3092 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- docs/debugger.html | 2 +- src/common/FrameBufferSDL2.cxx | 10 +- src/common/Variant.hxx | 2 +- src/debugger/DebuggerParser.cxx | 2 +- src/debugger/gui/Cart0840Widget.cxx | 4 +- src/debugger/gui/Cart3EWidget.cxx | 8 +- src/debugger/gui/Cart3FWidget.cxx | 2 +- src/debugger/gui/Cart4A50Widget.cxx | 16 ++-- src/debugger/gui/CartARWidget.cxx | 64 ++++++------- src/debugger/gui/CartBFSCWidget.cxx | 128 ++++++++++++------------- src/debugger/gui/CartBFWidget.cxx | 128 ++++++++++++------------- src/debugger/gui/CartCMWidget.cxx | 8 +- src/debugger/gui/CartCTYWidget.cxx | 14 +-- src/debugger/gui/CartDASHWidget.cxx | 6 +- src/debugger/gui/CartDFSCWidget.cxx | 64 ++++++------- src/debugger/gui/CartDFWidget.cxx | 64 ++++++------- src/debugger/gui/CartDPCPlusWidget.cxx | 12 +-- src/debugger/gui/CartDPCWidget.cxx | 4 +- src/debugger/gui/CartE0Widget.cxx | 6 +- src/debugger/gui/CartE7Widget.cxx | 4 +- src/debugger/gui/CartEFSCWidget.cxx | 32 +++---- src/debugger/gui/CartEFWidget.cxx | 32 +++---- src/debugger/gui/CartF0Widget.cxx | 32 +++---- src/debugger/gui/CartF4SCWidget.cxx | 16 ++-- src/debugger/gui/CartF4Widget.cxx | 16 ++-- src/debugger/gui/CartF6SCWidget.cxx | 8 +- src/debugger/gui/CartF6Widget.cxx | 8 +- src/debugger/gui/CartF8SCWidget.cxx | 4 +- src/debugger/gui/CartF8Widget.cxx | 4 +- src/debugger/gui/CartFA2Widget.cxx | 14 +-- src/debugger/gui/CartFAWidget.cxx | 6 +- src/debugger/gui/CartMCWidget.cxx | 4 +- src/debugger/gui/CartMDMWidget.cxx | 2 +- src/debugger/gui/CartSBWidget.cxx | 2 +- src/debugger/gui/CartUAWidget.cxx | 4 +- src/debugger/gui/CartX07Widget.cxx | 32 +++---- src/debugger/gui/RiotWidget.cxx | 8 +- src/debugger/gui/TiaOutputWidget.cxx | 10 +- src/debugger/gui/TiaZoomWidget.cxx | 6 +- src/emucore/EventHandler.cxx | 12 +-- src/emucore/FrameBuffer.cxx | 2 +- src/gui/AudioDialog.cxx | 22 ++--- src/gui/GameInfoDialog.cxx | 96 +++++++++---------- src/gui/GlobalPropsDialog.cxx | 18 ++-- src/gui/InputDialog.cxx | 10 +- src/gui/LauncherDialog.cxx | 6 +- src/gui/LauncherFilterDialog.cxx | 6 +- src/gui/LoggerDialog.cxx | 6 +- src/gui/SnapshotDialog.cxx | 24 ++--- src/gui/UIDialog.cxx | 64 ++++++------- src/gui/VideoDialog.cxx | 26 ++--- 51 files changed, 540 insertions(+), 540 deletions(-) diff --git a/docs/debugger.html b/docs/debugger.html index ba8db5ac8..22a62d51e 100644 --- a/docs/debugger.html +++ b/docs/debugger.html @@ -662,7 +662,7 @@ listfunctions - List user-defined functions pgfx - Mark 'PGFX' range in disassembly print - Evaluate/print expression xx in hex/dec/binary ram - Show ZP RAM, or set address xx to yy1 [yy2 ...] - reset - Reset 6507 to init vector (excluding TIA/RIOT) + reset - Reset system to power-on state rewind - Rewind state to last step/trace/scanline/frame riot - Show RIOT timer/input status rom - Set ROM address xx to yy1 [yy2 ...] diff --git a/src/common/FrameBufferSDL2.cxx b/src/common/FrameBufferSDL2.cxx index 4bb7d87bd..8ab38cbda 100644 --- a/src/common/FrameBufferSDL2.cxx +++ b/src/common/FrameBufferSDL2.cxx @@ -93,12 +93,12 @@ void FrameBufferSDL2::queryHardware(vector& displays, // For now, supported render types are hardcoded; eventually, SDL may // provide a method to query this #if defined(BSPF_WINDOWS) - VList::push_back(renderers, "Direct3D", "direct3d"); + VarList::push_back(renderers, "Direct3D", "direct3d"); #endif - VList::push_back(renderers, "OpenGL", "opengl"); - VList::push_back(renderers, "OpenGLES2", "opengles2"); - VList::push_back(renderers, "OpenGLES", "opengles"); - VList::push_back(renderers, "Software", "software"); + VarList::push_back(renderers, "OpenGL", "opengl"); + VarList::push_back(renderers, "OpenGLES2", "opengles2"); + VarList::push_back(renderers, "OpenGLES", "opengles"); + VarList::push_back(renderers, "Software", "software"); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/common/Variant.hxx b/src/common/Variant.hxx index ae59b34e2..c28d6f308 100644 --- a/src/common/Variant.hxx +++ b/src/common/Variant.hxx @@ -80,7 +80,7 @@ static const Variant EmptyVariant; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - using VariantList = vector>; -namespace VList { +namespace VarList { inline void push_back(VariantList& list, const Variant& name, const Variant& tag = EmptyVariant) { diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx index 5be2d1a0a..49aad0678 100644 --- a/src/debugger/DebuggerParser.cxx +++ b/src/debugger/DebuggerParser.cxx @@ -1925,7 +1925,7 @@ DebuggerParser::Command DebuggerParser::commands[kNumCommands] = { { "reset", - "Reset 6507 to init vector (excluding TIA/RIOT)", + "Reset system to power-on state", false, true, { kARG_END_ARGS }, diff --git a/src/debugger/gui/Cart0840Widget.cxx b/src/debugger/gui/Cart0840Widget.cxx index 170b7066f..d45ccbf79 100644 --- a/src/debugger/gui/Cart0840Widget.cxx +++ b/src/debugger/gui/Cart0840Widget.cxx @@ -48,8 +48,8 @@ Cartridge0840Widget::Cartridge0840Widget( ypos = addBaseInformation(size, "Fred X. Quimby", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($800)"); - VList::push_back(items, "1 ($840)"); + VarList::push_back(items, "0 ($800)"); + VarList::push_back(items, "1 ($840)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($800) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/Cart3EWidget.cxx b/src/debugger/gui/Cart3EWidget.cxx index cc99df9a2..45e08d31c 100644 --- a/src/debugger/gui/Cart3EWidget.cxx +++ b/src/debugger/gui/Cart3EWidget.cxx @@ -54,13 +54,13 @@ Cartridge3EWidget::Cartridge3EWidget( VariantList romitems; for(uInt32 i = 0; i < myNumRomBanks; ++i) - VList::push_back(romitems, i); - VList::push_back(romitems, "Inactive", ""); + VarList::push_back(romitems, i); + VarList::push_back(romitems, "Inactive", ""); VariantList ramitems; for(uInt32 i = 0; i < myNumRamBanks; ++i) - VList::push_back(ramitems, i); - VList::push_back(ramitems, "Inactive", ""); + VarList::push_back(ramitems, i); + VarList::push_back(ramitems, "Inactive", ""); ostringstream label; label << "Set bank ($" << Common::Base::HEX4 << start << " - $" diff --git a/src/debugger/gui/Cart3FWidget.cxx b/src/debugger/gui/Cart3FWidget.cxx index 55e818a9e..e28425953 100644 --- a/src/debugger/gui/Cart3FWidget.cxx +++ b/src/debugger/gui/Cart3FWidget.cxx @@ -46,7 +46,7 @@ Cartridge3FWidget::Cartridge3FWidget( VariantList items; for(uInt16 i = 0; i < cart.bankCount(); ++i) - VList::push_back(items, Variant(i).toString() + " ($3F)"); + VarList::push_back(items, Variant(i).toString() + " ($3F)"); ostringstream label; label << "Set bank ($" << Common::Base::HEX4 << start << " - $" << diff --git a/src/debugger/gui/Cart4A50Widget.cxx b/src/debugger/gui/Cart4A50Widget.cxx index d85d5b6cb..a0b38c11a 100644 --- a/src/debugger/gui/Cart4A50Widget.cxx +++ b/src/debugger/gui/Cart4A50Widget.cxx @@ -42,20 +42,20 @@ Cartridge4A50Widget::Cartridge4A50Widget( VariantList items16, items32, items128, items256; for(uInt32 i = 0; i < 16; ++i) - VList::push_back(items16, i); - VList::push_back(items16, "Inactive", ""); + VarList::push_back(items16, i); + VarList::push_back(items16, "Inactive", ""); for(uInt32 i = 0; i < 32; ++i) - VList::push_back(items32, i); - VList::push_back(items32, "Inactive", ""); + VarList::push_back(items32, i); + VarList::push_back(items32, "Inactive", ""); for(uInt32 i = 0; i < 128; ++i) - VList::push_back(items128, i); - VList::push_back(items128, "Inactive", ""); + VarList::push_back(items128, i); + VarList::push_back(items128, "Inactive", ""); for(uInt32 i = 0; i < 256; ++i) - VList::push_back(items256, i); - VList::push_back(items256, "Inactive", ""); + VarList::push_back(items256, i); + VarList::push_back(items256, "Inactive", ""); string lowerlabel = "Set lower 2K region ($F000 - $F7FF): "; string middlelabel = "Set middle 1.5K region ($F800 - $FDFF): "; diff --git a/src/debugger/gui/CartARWidget.cxx b/src/debugger/gui/CartARWidget.cxx index 711193953..778500054 100644 --- a/src/debugger/gui/CartARWidget.cxx +++ b/src/debugger/gui/CartARWidget.cxx @@ -38,38 +38,38 @@ CartridgeARWidget::CartridgeARWidget( ypos = addBaseInformation(size, "Starpath", info) + myLineHeight; VariantList items; - VList::push_back(items, " 0"); - VList::push_back(items, " 1"); - VList::push_back(items, " 2"); - VList::push_back(items, " 3"); - VList::push_back(items, " 4"); - VList::push_back(items, " 5"); - VList::push_back(items, " 6"); - VList::push_back(items, " 7"); - VList::push_back(items, " 8"); - VList::push_back(items, " 9"); - VList::push_back(items, " 10"); - VList::push_back(items, " 11"); - VList::push_back(items, " 12"); - VList::push_back(items, " 13"); - VList::push_back(items, " 14"); - VList::push_back(items, " 15"); - VList::push_back(items, " 16"); - VList::push_back(items, " 17"); - VList::push_back(items, " 18"); - VList::push_back(items, " 19"); - VList::push_back(items, " 20"); - VList::push_back(items, " 21"); - VList::push_back(items, " 22"); - VList::push_back(items, " 23"); - VList::push_back(items, " 24"); - VList::push_back(items, " 25"); - VList::push_back(items, " 26"); - VList::push_back(items, " 27"); - VList::push_back(items, " 28"); - VList::push_back(items, " 29"); - VList::push_back(items, " 30"); - VList::push_back(items, " 31"); + VarList::push_back(items, " 0"); + VarList::push_back(items, " 1"); + VarList::push_back(items, " 2"); + VarList::push_back(items, " 3"); + VarList::push_back(items, " 4"); + VarList::push_back(items, " 5"); + VarList::push_back(items, " 6"); + VarList::push_back(items, " 7"); + VarList::push_back(items, " 8"); + VarList::push_back(items, " 9"); + VarList::push_back(items, " 10"); + VarList::push_back(items, " 11"); + VarList::push_back(items, " 12"); + VarList::push_back(items, " 13"); + VarList::push_back(items, " 14"); + VarList::push_back(items, " 15"); + VarList::push_back(items, " 16"); + VarList::push_back(items, " 17"); + VarList::push_back(items, " 18"); + VarList::push_back(items, " 19"); + VarList::push_back(items, " 20"); + VarList::push_back(items, " 21"); + VarList::push_back(items, " 22"); + VarList::push_back(items, " 23"); + VarList::push_back(items, " 24"); + VarList::push_back(items, " 25"); + VarList::push_back(items, " 26"); + VarList::push_back(items, " 27"); + VarList::push_back(items, " 28"); + VarList::push_back(items, " 29"); + VarList::push_back(items, " 30"); + VarList::push_back(items, " 31"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" XX "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartBFSCWidget.cxx b/src/debugger/gui/CartBFSCWidget.cxx index 96de5d5e9..330e7ff4c 100644 --- a/src/debugger/gui/CartBFSCWidget.cxx +++ b/src/debugger/gui/CartBFSCWidget.cxx @@ -49,70 +49,70 @@ CartridgeBFSCWidget::CartridgeBFSCWidget( ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0 ($F80)"); - VList::push_back(items, " 1 ($F81)"); - VList::push_back(items, " 2 ($F82)"); - VList::push_back(items, " 3 ($F83)"); - VList::push_back(items, " 4 ($F84)"); - VList::push_back(items, " 5 ($F85)"); - VList::push_back(items, " 6 ($F86)"); - VList::push_back(items, " 7 ($F87)"); - VList::push_back(items, " 8 ($F88)"); - VList::push_back(items, " 9 ($F89)"); - VList::push_back(items, "10 ($F8A)"); - VList::push_back(items, "11 ($F8B)"); - VList::push_back(items, "12 ($F8C)"); - VList::push_back(items, "13 ($F8D)"); - VList::push_back(items, "14 ($F8E)"); - VList::push_back(items, "15 ($F8F)"); - VList::push_back(items, "16 ($F90)"); - VList::push_back(items, "17 ($F91)"); - VList::push_back(items, "18 ($F92)"); - VList::push_back(items, "19 ($F93)"); - VList::push_back(items, "20 ($F94)"); - VList::push_back(items, "21 ($F95)"); - VList::push_back(items, "22 ($F96)"); - VList::push_back(items, "23 ($F97)"); - VList::push_back(items, "24 ($F98)"); - VList::push_back(items, "25 ($F99)"); - VList::push_back(items, "26 ($F9A)"); - VList::push_back(items, "27 ($F9B)"); - VList::push_back(items, "28 ($F9C)"); - VList::push_back(items, "29 ($F9D)"); - VList::push_back(items, "30 ($F9E)"); - VList::push_back(items, "31 ($F9F)"); - VList::push_back(items, "32 ($FA0)"); - VList::push_back(items, "33 ($FA1)"); - VList::push_back(items, "34 ($FA2)"); - VList::push_back(items, "35 ($FA3)"); - VList::push_back(items, "36 ($FA4)"); - VList::push_back(items, "37 ($FA5)"); - VList::push_back(items, "38 ($FA6)"); - VList::push_back(items, "39 ($FA7)"); - VList::push_back(items, "40 ($FA8)"); - VList::push_back(items, "41 ($FA9)"); - VList::push_back(items, "42 ($FAA)"); - VList::push_back(items, "43 ($FAB)"); - VList::push_back(items, "44 ($FAC)"); - VList::push_back(items, "45 ($FAD)"); - VList::push_back(items, "46 ($FAE)"); - VList::push_back(items, "47 ($FAF)"); - VList::push_back(items, "48 ($FB0)"); - VList::push_back(items, "49 ($FB1)"); - VList::push_back(items, "50 ($FB2)"); - VList::push_back(items, "51 ($FB3)"); - VList::push_back(items, "52 ($FB4)"); - VList::push_back(items, "53 ($FB5)"); - VList::push_back(items, "54 ($FB6)"); - VList::push_back(items, "55 ($FB7)"); - VList::push_back(items, "56 ($FB8)"); - VList::push_back(items, "57 ($FB9)"); - VList::push_back(items, "58 ($FBA)"); - VList::push_back(items, "59 ($FBB)"); - VList::push_back(items, "60 ($FBC)"); - VList::push_back(items, "61 ($FBD)"); - VList::push_back(items, "62 ($FBE)"); - VList::push_back(items, "63 ($FBF)"); + VarList::push_back(items, " 0 ($F80)"); + VarList::push_back(items, " 1 ($F81)"); + VarList::push_back(items, " 2 ($F82)"); + VarList::push_back(items, " 3 ($F83)"); + VarList::push_back(items, " 4 ($F84)"); + VarList::push_back(items, " 5 ($F85)"); + VarList::push_back(items, " 6 ($F86)"); + VarList::push_back(items, " 7 ($F87)"); + VarList::push_back(items, " 8 ($F88)"); + VarList::push_back(items, " 9 ($F89)"); + VarList::push_back(items, "10 ($F8A)"); + VarList::push_back(items, "11 ($F8B)"); + VarList::push_back(items, "12 ($F8C)"); + VarList::push_back(items, "13 ($F8D)"); + VarList::push_back(items, "14 ($F8E)"); + VarList::push_back(items, "15 ($F8F)"); + VarList::push_back(items, "16 ($F90)"); + VarList::push_back(items, "17 ($F91)"); + VarList::push_back(items, "18 ($F92)"); + VarList::push_back(items, "19 ($F93)"); + VarList::push_back(items, "20 ($F94)"); + VarList::push_back(items, "21 ($F95)"); + VarList::push_back(items, "22 ($F96)"); + VarList::push_back(items, "23 ($F97)"); + VarList::push_back(items, "24 ($F98)"); + VarList::push_back(items, "25 ($F99)"); + VarList::push_back(items, "26 ($F9A)"); + VarList::push_back(items, "27 ($F9B)"); + VarList::push_back(items, "28 ($F9C)"); + VarList::push_back(items, "29 ($F9D)"); + VarList::push_back(items, "30 ($F9E)"); + VarList::push_back(items, "31 ($F9F)"); + VarList::push_back(items, "32 ($FA0)"); + VarList::push_back(items, "33 ($FA1)"); + VarList::push_back(items, "34 ($FA2)"); + VarList::push_back(items, "35 ($FA3)"); + VarList::push_back(items, "36 ($FA4)"); + VarList::push_back(items, "37 ($FA5)"); + VarList::push_back(items, "38 ($FA6)"); + VarList::push_back(items, "39 ($FA7)"); + VarList::push_back(items, "40 ($FA8)"); + VarList::push_back(items, "41 ($FA9)"); + VarList::push_back(items, "42 ($FAA)"); + VarList::push_back(items, "43 ($FAB)"); + VarList::push_back(items, "44 ($FAC)"); + VarList::push_back(items, "45 ($FAD)"); + VarList::push_back(items, "46 ($FAE)"); + VarList::push_back(items, "47 ($FAF)"); + VarList::push_back(items, "48 ($FB0)"); + VarList::push_back(items, "49 ($FB1)"); + VarList::push_back(items, "50 ($FB2)"); + VarList::push_back(items, "51 ($FB3)"); + VarList::push_back(items, "52 ($FB4)"); + VarList::push_back(items, "53 ($FB5)"); + VarList::push_back(items, "54 ($FB6)"); + VarList::push_back(items, "55 ($FB7)"); + VarList::push_back(items, "56 ($FB8)"); + VarList::push_back(items, "57 ($FB9)"); + VarList::push_back(items, "58 ($FBA)"); + VarList::push_back(items, "59 ($FBB)"); + VarList::push_back(items, "60 ($FBC)"); + VarList::push_back(items, "61 ($FBD)"); + VarList::push_back(items, "62 ($FBE)"); + VarList::push_back(items, "63 ($FBF)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("63 ($FBF) "), diff --git a/src/debugger/gui/CartBFWidget.cxx b/src/debugger/gui/CartBFWidget.cxx index 86f6bdc8b..2f14fe11a 100644 --- a/src/debugger/gui/CartBFWidget.cxx +++ b/src/debugger/gui/CartBFWidget.cxx @@ -47,70 +47,70 @@ CartridgeBFWidget::CartridgeBFWidget( ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0 ($F80)"); - VList::push_back(items, " 1 ($F81)"); - VList::push_back(items, " 2 ($F82)"); - VList::push_back(items, " 3 ($F83)"); - VList::push_back(items, " 4 ($F84)"); - VList::push_back(items, " 5 ($F85)"); - VList::push_back(items, " 6 ($F86)"); - VList::push_back(items, " 7 ($F87)"); - VList::push_back(items, " 8 ($F88)"); - VList::push_back(items, " 9 ($F89)"); - VList::push_back(items, "10 ($F8A)"); - VList::push_back(items, "11 ($F8B)"); - VList::push_back(items, "12 ($F8C)"); - VList::push_back(items, "13 ($F8D)"); - VList::push_back(items, "14 ($F8E)"); - VList::push_back(items, "15 ($F8F)"); - VList::push_back(items, "16 ($F90)"); - VList::push_back(items, "17 ($F91)"); - VList::push_back(items, "18 ($F92)"); - VList::push_back(items, "19 ($F93)"); - VList::push_back(items, "20 ($F94)"); - VList::push_back(items, "21 ($F95)"); - VList::push_back(items, "22 ($F96)"); - VList::push_back(items, "23 ($F97)"); - VList::push_back(items, "24 ($F98)"); - VList::push_back(items, "25 ($F99)"); - VList::push_back(items, "26 ($F9A)"); - VList::push_back(items, "27 ($F9B)"); - VList::push_back(items, "28 ($F9C)"); - VList::push_back(items, "29 ($F9D)"); - VList::push_back(items, "30 ($F9E)"); - VList::push_back(items, "31 ($F9F)"); - VList::push_back(items, "32 ($FA0)"); - VList::push_back(items, "33 ($FA1)"); - VList::push_back(items, "34 ($FA2)"); - VList::push_back(items, "35 ($FA3)"); - VList::push_back(items, "36 ($FA4)"); - VList::push_back(items, "37 ($FA5)"); - VList::push_back(items, "38 ($FA6)"); - VList::push_back(items, "39 ($FA7)"); - VList::push_back(items, "40 ($FA8)"); - VList::push_back(items, "41 ($FA9)"); - VList::push_back(items, "42 ($FAA)"); - VList::push_back(items, "43 ($FAB)"); - VList::push_back(items, "44 ($FAC)"); - VList::push_back(items, "45 ($FAD)"); - VList::push_back(items, "46 ($FAE)"); - VList::push_back(items, "47 ($FAF)"); - VList::push_back(items, "48 ($FB0)"); - VList::push_back(items, "49 ($FB1)"); - VList::push_back(items, "50 ($FB2)"); - VList::push_back(items, "51 ($FB3)"); - VList::push_back(items, "52 ($FB4)"); - VList::push_back(items, "53 ($FB5)"); - VList::push_back(items, "54 ($FB6)"); - VList::push_back(items, "55 ($FB7)"); - VList::push_back(items, "56 ($FB8)"); - VList::push_back(items, "57 ($FB9)"); - VList::push_back(items, "58 ($FBA)"); - VList::push_back(items, "59 ($FBB)"); - VList::push_back(items, "60 ($FBC)"); - VList::push_back(items, "61 ($FBD)"); - VList::push_back(items, "62 ($FBE)"); - VList::push_back(items, "63 ($FBF)"); + VarList::push_back(items, " 0 ($F80)"); + VarList::push_back(items, " 1 ($F81)"); + VarList::push_back(items, " 2 ($F82)"); + VarList::push_back(items, " 3 ($F83)"); + VarList::push_back(items, " 4 ($F84)"); + VarList::push_back(items, " 5 ($F85)"); + VarList::push_back(items, " 6 ($F86)"); + VarList::push_back(items, " 7 ($F87)"); + VarList::push_back(items, " 8 ($F88)"); + VarList::push_back(items, " 9 ($F89)"); + VarList::push_back(items, "10 ($F8A)"); + VarList::push_back(items, "11 ($F8B)"); + VarList::push_back(items, "12 ($F8C)"); + VarList::push_back(items, "13 ($F8D)"); + VarList::push_back(items, "14 ($F8E)"); + VarList::push_back(items, "15 ($F8F)"); + VarList::push_back(items, "16 ($F90)"); + VarList::push_back(items, "17 ($F91)"); + VarList::push_back(items, "18 ($F92)"); + VarList::push_back(items, "19 ($F93)"); + VarList::push_back(items, "20 ($F94)"); + VarList::push_back(items, "21 ($F95)"); + VarList::push_back(items, "22 ($F96)"); + VarList::push_back(items, "23 ($F97)"); + VarList::push_back(items, "24 ($F98)"); + VarList::push_back(items, "25 ($F99)"); + VarList::push_back(items, "26 ($F9A)"); + VarList::push_back(items, "27 ($F9B)"); + VarList::push_back(items, "28 ($F9C)"); + VarList::push_back(items, "29 ($F9D)"); + VarList::push_back(items, "30 ($F9E)"); + VarList::push_back(items, "31 ($F9F)"); + VarList::push_back(items, "32 ($FA0)"); + VarList::push_back(items, "33 ($FA1)"); + VarList::push_back(items, "34 ($FA2)"); + VarList::push_back(items, "35 ($FA3)"); + VarList::push_back(items, "36 ($FA4)"); + VarList::push_back(items, "37 ($FA5)"); + VarList::push_back(items, "38 ($FA6)"); + VarList::push_back(items, "39 ($FA7)"); + VarList::push_back(items, "40 ($FA8)"); + VarList::push_back(items, "41 ($FA9)"); + VarList::push_back(items, "42 ($FAA)"); + VarList::push_back(items, "43 ($FAB)"); + VarList::push_back(items, "44 ($FAC)"); + VarList::push_back(items, "45 ($FAD)"); + VarList::push_back(items, "46 ($FAE)"); + VarList::push_back(items, "47 ($FAF)"); + VarList::push_back(items, "48 ($FB0)"); + VarList::push_back(items, "49 ($FB1)"); + VarList::push_back(items, "50 ($FB2)"); + VarList::push_back(items, "51 ($FB3)"); + VarList::push_back(items, "52 ($FB4)"); + VarList::push_back(items, "53 ($FB5)"); + VarList::push_back(items, "54 ($FB6)"); + VarList::push_back(items, "55 ($FB7)"); + VarList::push_back(items, "56 ($FB8)"); + VarList::push_back(items, "57 ($FB9)"); + VarList::push_back(items, "58 ($FBA)"); + VarList::push_back(items, "59 ($FBB)"); + VarList::push_back(items, "60 ($FBC)"); + VarList::push_back(items, "61 ($FBD)"); + VarList::push_back(items, "62 ($FBE)"); + VarList::push_back(items, "63 ($FBF)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FBF) "), diff --git a/src/debugger/gui/CartCMWidget.cxx b/src/debugger/gui/CartCMWidget.cxx index cc9e0306d..16b79ebc6 100644 --- a/src/debugger/gui/CartCMWidget.cxx +++ b/src/debugger/gui/CartCMWidget.cxx @@ -46,10 +46,10 @@ CartridgeCMWidget::CartridgeCMWidget( ypos = addBaseInformation(size, "CompuMate", info) + myLineHeight; VariantList items; - VList::push_back(items, " 0 "); - VList::push_back(items, " 1 "); - VList::push_back(items, " 2 "); - VList::push_back(items, " 3 "); + VarList::push_back(items, " 0 "); + VarList::push_back(items, " 1 "); + VarList::push_back(items, " 2 "); + VarList::push_back(items, " 3 "); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 0 "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartCTYWidget.cxx b/src/debugger/gui/CartCTYWidget.cxx index 76c36c053..3fe2dad53 100644 --- a/src/debugger/gui/CartCTYWidget.cxx +++ b/src/debugger/gui/CartCTYWidget.cxx @@ -40,13 +40,13 @@ CartridgeCTYWidget::CartridgeCTYWidget( ypos = addBaseInformation(size, "Chris D. Walton", info) + myLineHeight; VariantList items; - VList::push_back(items, "1 ($FF5)"); - VList::push_back(items, "2 ($FF6)"); - VList::push_back(items, "3 ($FF7)"); - VList::push_back(items, "4 ($FF8)"); - VList::push_back(items, "5 ($FF9)"); - VList::push_back(items, "6 ($FFA)"); - VList::push_back(items, "7 ($FFB)"); + VarList::push_back(items, "1 ($FF5)"); + VarList::push_back(items, "2 ($FF6)"); + VarList::push_back(items, "3 ($FF7)"); + VarList::push_back(items, "4 ($FF8)"); + VarList::push_back(items, "5 ($FF9)"); + VarList::push_back(items, "6 ($FFA)"); + VarList::push_back(items, "7 ($FFB)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartDASHWidget.cxx b/src/debugger/gui/CartDASHWidget.cxx index 7ea89a63b..a034ef806 100644 --- a/src/debugger/gui/CartDASHWidget.cxx +++ b/src/debugger/gui/CartDASHWidget.cxx @@ -50,11 +50,11 @@ CartridgeDASHWidget::CartridgeDASHWidget( VariantList bankno; for(uInt32 i = 0; i < myCart.ROM_BANK_COUNT; ++i) - VList::push_back(bankno, i, i); + VarList::push_back(bankno, i, i); VariantList banktype; - VList::push_back(banktype, "ROM", "ROM"); - VList::push_back(banktype, "RAM", "RAM"); + VarList::push_back(banktype, "ROM", "ROM"); + VarList::push_back(banktype, "RAM", "RAM"); for(uInt32 i = 0; i < 4; ++i) { diff --git a/src/debugger/gui/CartDFSCWidget.cxx b/src/debugger/gui/CartDFSCWidget.cxx index 2acb2ba30..fcc042785 100644 --- a/src/debugger/gui/CartDFSCWidget.cxx +++ b/src/debugger/gui/CartDFSCWidget.cxx @@ -49,38 +49,38 @@ CartridgeDFSCWidget::CartridgeDFSCWidget( ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0 ($FC0)"); - VList::push_back(items, " 1 ($FC1)"); - VList::push_back(items, " 2 ($FC2)"); - VList::push_back(items, " 3 ($FC3)"); - VList::push_back(items, " 4 ($FC4)"); - VList::push_back(items, " 5 ($FC5)"); - VList::push_back(items, " 6 ($FC6)"); - VList::push_back(items, " 7 ($FC7)"); - VList::push_back(items, " 8 ($FC8)"); - VList::push_back(items, " 9 ($FC9)"); - VList::push_back(items, "10 ($FCA)"); - VList::push_back(items, "11 ($FCB)"); - VList::push_back(items, "12 ($FCC)"); - VList::push_back(items, "13 ($FCD)"); - VList::push_back(items, "14 ($FCE)"); - VList::push_back(items, "15 ($FCF)"); - VList::push_back(items, "16 ($FD0)"); - VList::push_back(items, "17 ($FD1)"); - VList::push_back(items, "18 ($FD2)"); - VList::push_back(items, "19 ($FD3)"); - VList::push_back(items, "20 ($FD4)"); - VList::push_back(items, "21 ($FD5)"); - VList::push_back(items, "22 ($FD6)"); - VList::push_back(items, "23 ($FD7)"); - VList::push_back(items, "24 ($FD8)"); - VList::push_back(items, "25 ($FD9)"); - VList::push_back(items, "26 ($FDA)"); - VList::push_back(items, "27 ($FDB)"); - VList::push_back(items, "28 ($FDC)"); - VList::push_back(items, "29 ($FDD)"); - VList::push_back(items, "30 ($FDE)"); - VList::push_back(items, "31 ($FDF)"); + VarList::push_back(items, " 0 ($FC0)"); + VarList::push_back(items, " 1 ($FC1)"); + VarList::push_back(items, " 2 ($FC2)"); + VarList::push_back(items, " 3 ($FC3)"); + VarList::push_back(items, " 4 ($FC4)"); + VarList::push_back(items, " 5 ($FC5)"); + VarList::push_back(items, " 6 ($FC6)"); + VarList::push_back(items, " 7 ($FC7)"); + VarList::push_back(items, " 8 ($FC8)"); + VarList::push_back(items, " 9 ($FC9)"); + VarList::push_back(items, "10 ($FCA)"); + VarList::push_back(items, "11 ($FCB)"); + VarList::push_back(items, "12 ($FCC)"); + VarList::push_back(items, "13 ($FCD)"); + VarList::push_back(items, "14 ($FCE)"); + VarList::push_back(items, "15 ($FCF)"); + VarList::push_back(items, "16 ($FD0)"); + VarList::push_back(items, "17 ($FD1)"); + VarList::push_back(items, "18 ($FD2)"); + VarList::push_back(items, "19 ($FD3)"); + VarList::push_back(items, "20 ($FD4)"); + VarList::push_back(items, "21 ($FD5)"); + VarList::push_back(items, "22 ($FD6)"); + VarList::push_back(items, "23 ($FD7)"); + VarList::push_back(items, "24 ($FD8)"); + VarList::push_back(items, "25 ($FD9)"); + VarList::push_back(items, "26 ($FDA)"); + VarList::push_back(items, "27 ($FDB)"); + VarList::push_back(items, "28 ($FDC)"); + VarList::push_back(items, "29 ($FDD)"); + VarList::push_back(items, "30 ($FDE)"); + VarList::push_back(items, "31 ($FDF)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FE0) "), diff --git a/src/debugger/gui/CartDFWidget.cxx b/src/debugger/gui/CartDFWidget.cxx index f9b44f42e..c11b1a113 100644 --- a/src/debugger/gui/CartDFWidget.cxx +++ b/src/debugger/gui/CartDFWidget.cxx @@ -47,38 +47,38 @@ CartridgeDFWidget::CartridgeDFWidget( ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0 ($FC0)"); - VList::push_back(items, " 1 ($FC1)"); - VList::push_back(items, " 2 ($FC2)"); - VList::push_back(items, " 3 ($FC3)"); - VList::push_back(items, " 4 ($FC4)"); - VList::push_back(items, " 5 ($FC5)"); - VList::push_back(items, " 6 ($FC6)"); - VList::push_back(items, " 7 ($FC7)"); - VList::push_back(items, " 8 ($FC8)"); - VList::push_back(items, " 9 ($FC9)"); - VList::push_back(items, "10 ($FCA)"); - VList::push_back(items, "11 ($FCB)"); - VList::push_back(items, "12 ($FCC)"); - VList::push_back(items, "13 ($FCD)"); - VList::push_back(items, "14 ($FCE)"); - VList::push_back(items, "15 ($FCF)"); - VList::push_back(items, "16 ($FD0)"); - VList::push_back(items, "17 ($FD1)"); - VList::push_back(items, "18 ($FD2)"); - VList::push_back(items, "19 ($FD3)"); - VList::push_back(items, "20 ($FD4)"); - VList::push_back(items, "21 ($FD5)"); - VList::push_back(items, "22 ($FD6)"); - VList::push_back(items, "23 ($FD7)"); - VList::push_back(items, "24 ($FD8)"); - VList::push_back(items, "25 ($FD9)"); - VList::push_back(items, "26 ($FDA)"); - VList::push_back(items, "27 ($FDB)"); - VList::push_back(items, "28 ($FDC)"); - VList::push_back(items, "29 ($FDD)"); - VList::push_back(items, "30 ($FDE)"); - VList::push_back(items, "31 ($FDF)"); + VarList::push_back(items, " 0 ($FC0)"); + VarList::push_back(items, " 1 ($FC1)"); + VarList::push_back(items, " 2 ($FC2)"); + VarList::push_back(items, " 3 ($FC3)"); + VarList::push_back(items, " 4 ($FC4)"); + VarList::push_back(items, " 5 ($FC5)"); + VarList::push_back(items, " 6 ($FC6)"); + VarList::push_back(items, " 7 ($FC7)"); + VarList::push_back(items, " 8 ($FC8)"); + VarList::push_back(items, " 9 ($FC9)"); + VarList::push_back(items, "10 ($FCA)"); + VarList::push_back(items, "11 ($FCB)"); + VarList::push_back(items, "12 ($FCC)"); + VarList::push_back(items, "13 ($FCD)"); + VarList::push_back(items, "14 ($FCE)"); + VarList::push_back(items, "15 ($FCF)"); + VarList::push_back(items, "16 ($FD0)"); + VarList::push_back(items, "17 ($FD1)"); + VarList::push_back(items, "18 ($FD2)"); + VarList::push_back(items, "19 ($FD3)"); + VarList::push_back(items, "20 ($FD4)"); + VarList::push_back(items, "21 ($FD5)"); + VarList::push_back(items, "22 ($FD6)"); + VarList::push_back(items, "23 ($FD7)"); + VarList::push_back(items, "24 ($FD8)"); + VarList::push_back(items, "25 ($FD9)"); + VarList::push_back(items, "26 ($FDA)"); + VarList::push_back(items, "27 ($FDB)"); + VarList::push_back(items, "28 ($FDC)"); + VarList::push_back(items, "29 ($FDD)"); + VarList::push_back(items, "30 ($FDE)"); + VarList::push_back(items, "31 ($FDF)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FDF) "), diff --git a/src/debugger/gui/CartDPCPlusWidget.cxx b/src/debugger/gui/CartDPCPlusWidget.cxx index 310abaf15..49a8b9af2 100644 --- a/src/debugger/gui/CartDPCPlusWidget.cxx +++ b/src/debugger/gui/CartDPCPlusWidget.cxx @@ -55,12 +55,12 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF6)"); - VList::push_back(items, "1 ($FF7)"); - VList::push_back(items, "2 ($FF8)"); - VList::push_back(items, "3 ($FF9)"); - VList::push_back(items, "4 ($FFA)"); - VList::push_back(items, "5 ($FFB)"); + VarList::push_back(items, "0 ($FF6)"); + VarList::push_back(items, "1 ($FF7)"); + VarList::push_back(items, "2 ($FF8)"); + VarList::push_back(items, "3 ($FF9)"); + VarList::push_back(items, "4 ($FFA)"); + VarList::push_back(items, "5 ($FFB)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartDPCWidget.cxx b/src/debugger/gui/CartDPCWidget.cxx index 6bf9b46c5..7362b4478 100644 --- a/src/debugger/gui/CartDPCWidget.cxx +++ b/src/debugger/gui/CartDPCWidget.cxx @@ -52,8 +52,8 @@ CartridgeDPCWidget::CartridgeDPCWidget( myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF8)"); - VList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "0 ($FF8)"); + VarList::push_back(items, "1 ($FF9)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartE0Widget.cxx b/src/debugger/gui/CartE0Widget.cxx index f1ce651b3..5a5099ba4 100644 --- a/src/debugger/gui/CartE0Widget.cxx +++ b/src/debugger/gui/CartE0Widget.cxx @@ -67,9 +67,9 @@ CartridgeE0Widget::CartridgeE0Widget( VariantList items0, items1, items2; for(int i = 0; i < 8; ++i) { - VList::push_back(items0, seg0[i]); - VList::push_back(items1, seg1[i]); - VList::push_back(items2, seg2[i]); + VarList::push_back(items0, seg0[i]); + VarList::push_back(items1, seg1[i]); + VarList::push_back(items2, seg2[i]); } const int lwidth = _font.getStringWidth("Set slice for segment X: "); diff --git a/src/debugger/gui/CartE7Widget.cxx b/src/debugger/gui/CartE7Widget.cxx index 05588ff19..794e5a001 100644 --- a/src/debugger/gui/CartE7Widget.cxx +++ b/src/debugger/gui/CartE7Widget.cxx @@ -63,9 +63,9 @@ CartridgeE7Widget::CartridgeE7Widget( VariantList items0, items1; for(int i = 0; i < 8; ++i) - VList::push_back(items0, spot_lower[i]); + VarList::push_back(items0, spot_lower[i]); for(int i = 0; i < 4; ++i) - VList::push_back(items1, spot_upper[i]); + VarList::push_back(items1, spot_upper[i]); const int lwidth = _font.getStringWidth("Set slice for upper 256B: "), fwidth = _font.getStringWidth("3 - RAM ($FEB)"); diff --git a/src/debugger/gui/CartEFSCWidget.cxx b/src/debugger/gui/CartEFSCWidget.cxx index a1b0cb1b1..ec5996007 100644 --- a/src/debugger/gui/CartEFSCWidget.cxx +++ b/src/debugger/gui/CartEFSCWidget.cxx @@ -50,22 +50,22 @@ CartridgeEFSCWidget::CartridgeEFSCWidget( info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0 ($FE0)"); - VList::push_back(items, " 1 ($FE1)"); - VList::push_back(items, " 2 ($FE2)"); - VList::push_back(items, " 3 ($FE3)"); - VList::push_back(items, " 4 ($FE4)"); - VList::push_back(items, " 5 ($FE5)"); - VList::push_back(items, " 6 ($FE6)"); - VList::push_back(items, " 7 ($FE7)"); - VList::push_back(items, " 8 ($FE8)"); - VList::push_back(items, " 9 ($FE9)"); - VList::push_back(items, "10 ($FEA)"); - VList::push_back(items, "11 ($FEB)"); - VList::push_back(items, "12 ($FEC)"); - VList::push_back(items, "13 ($FED)"); - VList::push_back(items, "14 ($FEE)"); - VList::push_back(items, "15 ($FEF)"); + VarList::push_back(items, " 0 ($FE0)"); + VarList::push_back(items, " 1 ($FE1)"); + VarList::push_back(items, " 2 ($FE2)"); + VarList::push_back(items, " 3 ($FE3)"); + VarList::push_back(items, " 4 ($FE4)"); + VarList::push_back(items, " 5 ($FE5)"); + VarList::push_back(items, " 6 ($FE6)"); + VarList::push_back(items, " 7 ($FE7)"); + VarList::push_back(items, " 8 ($FE8)"); + VarList::push_back(items, " 9 ($FE9)"); + VarList::push_back(items, "10 ($FEA)"); + VarList::push_back(items, "11 ($FEB)"); + VarList::push_back(items, "12 ($FEC)"); + VarList::push_back(items, "13 ($FED)"); + VarList::push_back(items, "14 ($FEE)"); + VarList::push_back(items, "15 ($FEF)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FE0) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartEFWidget.cxx b/src/debugger/gui/CartEFWidget.cxx index 8a96e9f63..5be770f65 100644 --- a/src/debugger/gui/CartEFWidget.cxx +++ b/src/debugger/gui/CartEFWidget.cxx @@ -48,22 +48,22 @@ CartridgeEFWidget::CartridgeEFWidget( info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0 ($FE0)"); - VList::push_back(items, " 1 ($FE1)"); - VList::push_back(items, " 2 ($FE2)"); - VList::push_back(items, " 3 ($FE3)"); - VList::push_back(items, " 4 ($FE4)"); - VList::push_back(items, " 5 ($FE5)"); - VList::push_back(items, " 6 ($FE6)"); - VList::push_back(items, " 7 ($FE7)"); - VList::push_back(items, " 8 ($FE8)"); - VList::push_back(items, " 9 ($FE9)"); - VList::push_back(items, "10 ($FEA)"); - VList::push_back(items, "11 ($FEB)"); - VList::push_back(items, "12 ($FEC)"); - VList::push_back(items, "13 ($FED)"); - VList::push_back(items, "14 ($FEE)"); - VList::push_back(items, "15 ($FEF)"); + VarList::push_back(items, " 0 ($FE0)"); + VarList::push_back(items, " 1 ($FE1)"); + VarList::push_back(items, " 2 ($FE2)"); + VarList::push_back(items, " 3 ($FE3)"); + VarList::push_back(items, " 4 ($FE4)"); + VarList::push_back(items, " 5 ($FE5)"); + VarList::push_back(items, " 6 ($FE6)"); + VarList::push_back(items, " 7 ($FE7)"); + VarList::push_back(items, " 8 ($FE8)"); + VarList::push_back(items, " 9 ($FE9)"); + VarList::push_back(items, "10 ($FEA)"); + VarList::push_back(items, "11 ($FEB)"); + VarList::push_back(items, "12 ($FEC)"); + VarList::push_back(items, "13 ($FED)"); + VarList::push_back(items, "14 ($FEE)"); + VarList::push_back(items, "15 ($FEF)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FE0) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF0Widget.cxx b/src/debugger/gui/CartF0Widget.cxx index 33a995c24..7df5c9b9d 100644 --- a/src/debugger/gui/CartF0Widget.cxx +++ b/src/debugger/gui/CartF0Widget.cxx @@ -49,22 +49,22 @@ CartridgeF0Widget::CartridgeF0Widget( info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0"); - VList::push_back(items, " 1"); - VList::push_back(items, " 2"); - VList::push_back(items, " 3"); - VList::push_back(items, " 4"); - VList::push_back(items, " 5"); - VList::push_back(items, " 6"); - VList::push_back(items, " 7"); - VList::push_back(items, " 8"); - VList::push_back(items, " 9"); - VList::push_back(items, " 10"); - VList::push_back(items, " 11"); - VList::push_back(items, " 12"); - VList::push_back(items, " 13"); - VList::push_back(items, " 14"); - VList::push_back(items, " 15"); + VarList::push_back(items, " 0"); + VarList::push_back(items, " 1"); + VarList::push_back(items, " 2"); + VarList::push_back(items, " 3"); + VarList::push_back(items, " 4"); + VarList::push_back(items, " 5"); + VarList::push_back(items, " 6"); + VarList::push_back(items, " 7"); + VarList::push_back(items, " 8"); + VarList::push_back(items, " 9"); + VarList::push_back(items, " 10"); + VarList::push_back(items, " 11"); + VarList::push_back(items, " 12"); + VarList::push_back(items, " 13"); + VarList::push_back(items, " 14"); + VarList::push_back(items, " 15"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF4SCWidget.cxx b/src/debugger/gui/CartF4SCWidget.cxx index e564a35d7..38a3a045b 100644 --- a/src/debugger/gui/CartF4SCWidget.cxx +++ b/src/debugger/gui/CartF4SCWidget.cxx @@ -49,14 +49,14 @@ CartridgeF4SCWidget::CartridgeF4SCWidget( ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF4)"); - VList::push_back(items, "1 ($FF5)"); - VList::push_back(items, "2 ($FF6)"); - VList::push_back(items, "3 ($FF7)"); - VList::push_back(items, "4 ($FF8)"); - VList::push_back(items, "5 ($FF9)"); - VList::push_back(items, "6 ($FFA)"); - VList::push_back(items, "7 ($FFB)"); + VarList::push_back(items, "0 ($FF4)"); + VarList::push_back(items, "1 ($FF5)"); + VarList::push_back(items, "2 ($FF6)"); + VarList::push_back(items, "3 ($FF7)"); + VarList::push_back(items, "4 ($FF8)"); + VarList::push_back(items, "5 ($FF9)"); + VarList::push_back(items, "6 ($FFA)"); + VarList::push_back(items, "7 ($FFB)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF4Widget.cxx b/src/debugger/gui/CartF4Widget.cxx index b7de34e08..96f0313e5 100644 --- a/src/debugger/gui/CartF4Widget.cxx +++ b/src/debugger/gui/CartF4Widget.cxx @@ -47,14 +47,14 @@ CartridgeF4Widget::CartridgeF4Widget( ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF4)"); - VList::push_back(items, "1 ($FF5)"); - VList::push_back(items, "2 ($FF6)"); - VList::push_back(items, "3 ($FF7)"); - VList::push_back(items, "4 ($FF8)"); - VList::push_back(items, "5 ($FF9)"); - VList::push_back(items, "6 ($FFA)"); - VList::push_back(items, "7 ($FFB)"); + VarList::push_back(items, "0 ($FF4)"); + VarList::push_back(items, "1 ($FF5)"); + VarList::push_back(items, "2 ($FF6)"); + VarList::push_back(items, "3 ($FF7)"); + VarList::push_back(items, "4 ($FF8)"); + VarList::push_back(items, "5 ($FF9)"); + VarList::push_back(items, "6 ($FFA)"); + VarList::push_back(items, "7 ($FFB)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF6SCWidget.cxx b/src/debugger/gui/CartF6SCWidget.cxx index 3b028b59f..27c801a4a 100644 --- a/src/debugger/gui/CartF6SCWidget.cxx +++ b/src/debugger/gui/CartF6SCWidget.cxx @@ -49,10 +49,10 @@ CartridgeF6SCWidget::CartridgeF6SCWidget( ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF6)"); - VList::push_back(items, "1 ($FF7)"); - VList::push_back(items, "2 ($FF8)"); - VList::push_back(items, "3 ($FF9)"); + VarList::push_back(items, "0 ($FF6)"); + VarList::push_back(items, "1 ($FF7)"); + VarList::push_back(items, "2 ($FF8)"); + VarList::push_back(items, "3 ($FF9)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF6Widget.cxx b/src/debugger/gui/CartF6Widget.cxx index 4d4e7af88..1eef9b230 100644 --- a/src/debugger/gui/CartF6Widget.cxx +++ b/src/debugger/gui/CartF6Widget.cxx @@ -47,10 +47,10 @@ CartridgeF6Widget::CartridgeF6Widget( ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF6)"); - VList::push_back(items, "1 ($FF7)"); - VList::push_back(items, "2 ($FF8)"); - VList::push_back(items, "3 ($FF9)"); + VarList::push_back(items, "0 ($FF6)"); + VarList::push_back(items, "1 ($FF7)"); + VarList::push_back(items, "2 ($FF8)"); + VarList::push_back(items, "3 ($FF9)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF8SCWidget.cxx b/src/debugger/gui/CartF8SCWidget.cxx index ae8678d45..7427d2309 100644 --- a/src/debugger/gui/CartF8SCWidget.cxx +++ b/src/debugger/gui/CartF8SCWidget.cxx @@ -49,8 +49,8 @@ CartridgeF8SCWidget::CartridgeF8SCWidget( ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF8)"); - VList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "0 ($FF8)"); + VarList::push_back(items, "1 ($FF9)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartF8Widget.cxx b/src/debugger/gui/CartF8Widget.cxx index bdb2fe3eb..f39c179f1 100644 --- a/src/debugger/gui/CartF8Widget.cxx +++ b/src/debugger/gui/CartF8Widget.cxx @@ -47,8 +47,8 @@ CartridgeF8Widget::CartridgeF8Widget( ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF8)"); - VList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "0 ($FF8)"); + VarList::push_back(items, "1 ($FF9)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartFA2Widget.cxx b/src/debugger/gui/CartFA2Widget.cxx index e8fc15e60..7b0715062 100644 --- a/src/debugger/gui/CartFA2Widget.cxx +++ b/src/debugger/gui/CartFA2Widget.cxx @@ -52,14 +52,14 @@ CartridgeFA2Widget::CartridgeFA2Widget( info.str(), 15) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF5)"); - VList::push_back(items, "1 ($FF6)"); - VList::push_back(items, "2 ($FF7)"); - VList::push_back(items, "3 ($FF8)"); - VList::push_back(items, "4 ($FF9)"); - VList::push_back(items, "5 ($FFA)"); + VarList::push_back(items, "0 ($FF5)"); + VarList::push_back(items, "1 ($FF6)"); + VarList::push_back(items, "2 ($FF7)"); + VarList::push_back(items, "3 ($FF8)"); + VarList::push_back(items, "4 ($FF9)"); + VarList::push_back(items, "5 ($FFA)"); if(cart.bankCount() == 7) - VList::push_back(items, "6 ($FFB)"); + VarList::push_back(items, "6 ($FFB)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), diff --git a/src/debugger/gui/CartFAWidget.cxx b/src/debugger/gui/CartFAWidget.cxx index 6414f0c19..228ce4d1a 100644 --- a/src/debugger/gui/CartFAWidget.cxx +++ b/src/debugger/gui/CartFAWidget.cxx @@ -49,9 +49,9 @@ CartridgeFAWidget::CartridgeFAWidget( ypos = addBaseInformation(size, "CBS", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($FF8)"); - VList::push_back(items, "1 ($FF9)"); - VList::push_back(items, "2 ($FFA)"); + VarList::push_back(items, "0 ($FF8)"); + VarList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "2 ($FFA)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartMCWidget.cxx b/src/debugger/gui/CartMCWidget.cxx index c00676d7c..767bb6d6b 100644 --- a/src/debugger/gui/CartMCWidget.cxx +++ b/src/debugger/gui/CartMCWidget.cxx @@ -51,13 +51,13 @@ CartridgeMCWidget::CartridgeMCWidget( for(uInt32 i = 0x80; i <= 0xFF; ++i) { const string& b = Variant(i).toString(); - VList::push_back(items, b + " (ROM)", b); + VarList::push_back(items, b + " (ROM)", b); } // Add 64 512B 'RAM' blocks for(uInt32 i = 0x00; i <= 0x3F; ++i) { const string& b = Variant(i).toString(); - VList::push_back(items, b + " (RAM)", b); + VarList::push_back(items, b + " (RAM)", b); } const int lwidth = _font.getStringWidth("Set slice for segment X ($3X): "), diff --git a/src/debugger/gui/CartMDMWidget.cxx b/src/debugger/gui/CartMDMWidget.cxx index 49a4873fa..52c7f3e7a 100644 --- a/src/debugger/gui/CartMDMWidget.cxx +++ b/src/debugger/gui/CartMDMWidget.cxx @@ -45,7 +45,7 @@ CartridgeMDMWidget::CartridgeMDMWidget( { info.str(""); info << dec << (i & 0xFF) << " ($" << Common::Base::HEX4 << i << ")"; - VList::push_back(items, info.str()); + VarList::push_back(items, info.str()); } myBank = diff --git a/src/debugger/gui/CartSBWidget.cxx b/src/debugger/gui/CartSBWidget.cxx index 1d277993f..edd303737 100644 --- a/src/debugger/gui/CartSBWidget.cxx +++ b/src/debugger/gui/CartSBWidget.cxx @@ -49,7 +49,7 @@ CartridgeSBWidget::CartridgeSBWidget( bank << dec << setw(2) << setfill(' ') << i << " ($" << Common::Base::HEX2 << spot << ")"; - VList::push_back(items, bank.str()); + VarList::push_back(items, bank.str()); bank.str(""); } diff --git a/src/debugger/gui/CartUAWidget.cxx b/src/debugger/gui/CartUAWidget.cxx index 3ea35c6bc..b43d88ef6 100644 --- a/src/debugger/gui/CartUAWidget.cxx +++ b/src/debugger/gui/CartUAWidget.cxx @@ -48,8 +48,8 @@ CartridgeUAWidget::CartridgeUAWidget( ypos = addBaseInformation(size, "UA Limited", info.str()) + myLineHeight; VariantList items; - VList::push_back(items, "0 ($220)"); - VList::push_back(items, "1 ($240)"); + VarList::push_back(items, "0 ($220)"); + VarList::push_back(items, "1 ($240)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/CartX07Widget.cxx b/src/debugger/gui/CartX07Widget.cxx index caf487d3e..6e682457d 100644 --- a/src/debugger/gui/CartX07Widget.cxx +++ b/src/debugger/gui/CartX07Widget.cxx @@ -50,22 +50,22 @@ CartridgeX07Widget::CartridgeX07Widget( info.str()) + myLineHeight; VariantList items; - VList::push_back(items, " 0"); - VList::push_back(items, " 1"); - VList::push_back(items, " 2"); - VList::push_back(items, " 3"); - VList::push_back(items, " 4"); - VList::push_back(items, " 5"); - VList::push_back(items, " 6"); - VList::push_back(items, " 7"); - VList::push_back(items, " 8"); - VList::push_back(items, " 9"); - VList::push_back(items, " 10"); - VList::push_back(items, " 11"); - VList::push_back(items, " 12"); - VList::push_back(items, " 13"); - VList::push_back(items, " 14"); - VList::push_back(items, " 15"); + VarList::push_back(items, " 0"); + VarList::push_back(items, " 1"); + VarList::push_back(items, " 2"); + VarList::push_back(items, " 3"); + VarList::push_back(items, " 4"); + VarList::push_back(items, " 5"); + VarList::push_back(items, " 6"); + VarList::push_back(items, " 7"); + VarList::push_back(items, " 8"); + VarList::push_back(items, " 9"); + VarList::push_back(items, " 10"); + VarList::push_back(items, " 11"); + VarList::push_back(items, " 12"); + VarList::push_back(items, " 13"); + VarList::push_back(items, " 14"); + VarList::push_back(items, " 15"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "), myLineHeight, items, "Set bank: ", diff --git a/src/debugger/gui/RiotWidget.cxx b/src/debugger/gui/RiotWidget.cxx index d666a5597..86b20b3ae 100644 --- a/src/debugger/gui/RiotWidget.cxx +++ b/src/debugger/gui/RiotWidget.cxx @@ -176,8 +176,8 @@ RiotWidget::RiotWidget(GuiObject* boss, const GUI::Font& lfont, xpos = col; ypos += 2 * lineHeight; int col2_ypos = ypos; items.clear(); - VList::push_back(items, "B/easy", "b"); - VList::push_back(items, "A/hard", "a"); + VarList::push_back(items, "B/easy", "b"); + VarList::push_back(items, "A/hard", "a"); myP0Diff = new PopUpWidget(boss, lfont, xpos, ypos, pwidth, lineHeight, items, "P0 Diff: ", lwidth, kP0DiffChanged); myP0Diff->setTarget(this); @@ -191,8 +191,8 @@ RiotWidget::RiotWidget(GuiObject* boss, const GUI::Font& lfont, // TV Type ypos += myP1Diff->getHeight() + 5; items.clear(); - VList::push_back(items, "B&W", "bw"); - VList::push_back(items, "Color", "color"); + VarList::push_back(items, "B&W", "bw"); + VarList::push_back(items, "Color", "color"); myTVType = new PopUpWidget(boss, lfont, xpos, ypos, pwidth, lineHeight, items, "TV Type: ", lwidth, kTVTypeChanged); myTVType->setTarget(this); diff --git a/src/debugger/gui/TiaOutputWidget.cxx b/src/debugger/gui/TiaOutputWidget.cxx index f47f53a28..b1f3dfb62 100644 --- a/src/debugger/gui/TiaOutputWidget.cxx +++ b/src/debugger/gui/TiaOutputWidget.cxx @@ -44,11 +44,11 @@ TiaOutputWidget::TiaOutputWidget(GuiObject* boss, const GUI::Font& font, { // Create context menu for commands VariantList l; - VList::push_back(l, "Fill to scanline", "scanline"); - VList::push_back(l, "Set breakpoint", "bp"); - VList::push_back(l, "Set zoom position", "zoom"); - VList::push_back(l, "Save snapshot", "snap"); - VList::push_back(l, "Toggle fixed debug colors (from beam pos)", "fixed"); + VarList::push_back(l, "Fill to scanline", "scanline"); + VarList::push_back(l, "Set breakpoint", "bp"); + VarList::push_back(l, "Set zoom position", "zoom"); + VarList::push_back(l, "Save snapshot", "snap"); + VarList::push_back(l, "Toggle fixed debug colors (from beam pos)", "fixed"); myMenu = make_ptr(this, font, l); } diff --git a/src/debugger/gui/TiaZoomWidget.cxx b/src/debugger/gui/TiaZoomWidget.cxx index de235a403..978607a24 100644 --- a/src/debugger/gui/TiaZoomWidget.cxx +++ b/src/debugger/gui/TiaZoomWidget.cxx @@ -54,9 +54,9 @@ TiaZoomWidget::TiaZoomWidget(GuiObject* boss, const GUI::Font& font, // Create context menu for zoom levels VariantList l; - VList::push_back(l, "2x zoom", "2"); - VList::push_back(l, "4x zoom", "4"); - VList::push_back(l, "8x zoom", "8"); + VarList::push_back(l, "2x zoom", "2"); + VarList::push_back(l, "4x zoom", "4"); + VarList::push_back(l, "8x zoom", "8"); myMenu = make_ptr(this, font, l); } diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index f3e78d45b..560512cdf 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -1563,13 +1563,13 @@ VariantList EventHandler::getComboList(EventMode /**/) const VariantList l; ostringstream buf; - VList::push_back(l, "None", "-1"); + VarList::push_back(l, "None", "-1"); for(uInt32 i = 0; i < kEmulActionListSize; ++i) { if(EventHandler::ourEmulActionList[i].allow_combo) { buf << i; - VList::push_back(l, EventHandler::ourEmulActionList[i].action, buf.str()); + VarList::push_back(l, EventHandler::ourEmulActionList[i].action, buf.str()); buf.str(""); } } @@ -1739,10 +1739,10 @@ void EventHandler::takeSnapshot(uInt32 number) ostringstream version; version << "Stella " << STELLA_VERSION << " (Build " << STELLA_BUILD << ") [" << BSPF_ARCH << "]"; - VList::push_back(comments, "Software", version.str()); - VList::push_back(comments, "ROM Name", myOSystem.console().properties().get(Cartridge_Name)); - VList::push_back(comments, "ROM MD5", myOSystem.console().properties().get(Cartridge_MD5)); - VList::push_back(comments, "TV Effects", myOSystem.frameBuffer().tiaSurface().effectsInfo()); + VarList::push_back(comments, "Software", version.str()); + VarList::push_back(comments, "ROM Name", myOSystem.console().properties().get(Cartridge_Name)); + VarList::push_back(comments, "ROM MD5", myOSystem.console().properties().get(Cartridge_MD5)); + VarList::push_back(comments, "TV Effects", myOSystem.frameBuffer().tiaSurface().effectsInfo()); // Now create a PNG snapshot if(myOSystem.settings().getBool("ss1x")) diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index e21ca5f6b..dc6908543 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -130,7 +130,7 @@ bool FrameBuffer::initialize() { ostringstream desc; desc << "Zoom " << zoom << "x"; - VList::push_back(myTIAZoomLevels, desc.str(), zoom); + VarList::push_back(myTIAZoomLevels, desc.str(), zoom); } // Set palette for GUI (upper area of array, doesn't change during execution) diff --git a/src/gui/AudioDialog.cxx b/src/gui/AudioDialog.cxx index ffcd9b001..0785e03be 100644 --- a/src/gui/AudioDialog.cxx +++ b/src/gui/AudioDialog.cxx @@ -69,12 +69,12 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, ypos += lineHeight + 4; // Fragment size - VList::push_back(items, "128 bytes", "128"); - VList::push_back(items, "256 bytes", "256"); - VList::push_back(items, "512 bytes", "512"); - VList::push_back(items, "1 KB", "1024"); - VList::push_back(items, "2 KB", "2048"); - VList::push_back(items, "4 KB", "4096"); + VarList::push_back(items, "128 bytes", "128"); + VarList::push_back(items, "256 bytes", "256"); + VarList::push_back(items, "512 bytes", "512"); + VarList::push_back(items, "1 KB", "1024"); + VarList::push_back(items, "2 KB", "2048"); + VarList::push_back(items, "4 KB", "4096"); myFragsizePopup = new PopUpWidget(this, font, xpos, ypos, pwidth + myVolumeLabel->getWidth() - 4, lineHeight, items, "Sample size (*): ", lwidth); @@ -83,11 +83,11 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, // Output frequency items.clear(); - VList::push_back(items, "11025 Hz", "11025"); - VList::push_back(items, "22050 Hz", "22050"); - VList::push_back(items, "31400 Hz", "31400"); - VList::push_back(items, "44100 Hz", "44100"); - VList::push_back(items, "48000 Hz", "48000"); + VarList::push_back(items, "11025 Hz", "11025"); + VarList::push_back(items, "22050 Hz", "22050"); + VarList::push_back(items, "31400 Hz", "31400"); + VarList::push_back(items, "44100 Hz", "44100"); + VarList::push_back(items, "48000 Hz", "48000"); myFreqPopup = new PopUpWidget(this, font, xpos, ypos, pwidth + myVolumeLabel->getWidth() - 4, lineHeight, items, "Frequency (*): ", lwidth); diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 8d5d8a0ab..c95a0505c 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -114,8 +114,8 @@ GameInfoDialog::GameInfoDialog( "Sound:", kTextAlignLeft); pwidth = font.getStringWidth("Stereo"); items.clear(); - VList::push_back(items, "Mono", "MONO"); - VList::push_back(items, "Stereo", "STEREO"); + VarList::push_back(items, "Mono", "MONO"); + VarList::push_back(items, "Stereo", "STEREO"); mySound = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(mySound); @@ -126,7 +126,7 @@ GameInfoDialog::GameInfoDialog( pwidth = font.getStringWidth("CM (SpectraVideo CompuMate)"); items.clear(); for(int i = 0; i < Cartridge::ourNumBSTypes; ++i) - VList::push_back(items, Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type); + VarList::push_back(items, Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type); myType = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myType); @@ -145,8 +145,8 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "Left Difficulty:", kTextAlignLeft); items.clear(); - VList::push_back(items, "B", "B"); - VList::push_back(items, "A", "A"); + VarList::push_back(items, "B", "B"); + VarList::push_back(items, "A", "A"); myLeftDiff = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myLeftDiff); @@ -163,8 +163,8 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "TV Type:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Color", "COLOR"); - VList::push_back(items, "B & W", "BW"); + VarList::push_back(items, "Color", "COLOR"); + VarList::push_back(items, "B & W", "BW"); myTVType = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myTVType); @@ -183,23 +183,23 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "P0 Controller:", kTextAlignLeft); ctrls.clear(); - VList::push_back(ctrls, "Joystick", "JOYSTICK" ); - VList::push_back(ctrls, "Paddles", "PADDLES" ); - VList::push_back(ctrls, "Paddles_IAxis", "PADDLES_IAXIS"); - VList::push_back(ctrls, "Paddles_IDir", "PADDLES_IDIR" ); - VList::push_back(ctrls, "Paddles_IAxDr", "PADDLES_IAXDR"); - VList::push_back(ctrls, "BoosterGrip", "BOOSTERGRIP" ); - VList::push_back(ctrls, "Driving", "DRIVING" ); - VList::push_back(ctrls, "Keyboard", "KEYBOARD" ); - VList::push_back(ctrls, "CX-22 Trakball", "TRACKBALL22" ); - VList::push_back(ctrls, "CX-80 Mouse", "TRACKBALL80" ); - VList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE" ); - VList::push_back(ctrls, "AtariVox", "ATARIVOX" ); - VList::push_back(ctrls, "SaveKey", "SAVEKEY" ); - VList::push_back(ctrls, "Sega Genesis", "GENESIS" ); - VList::push_back(ctrls, "CompuMate", "COMPUMATE" ); -// VList::push_back(ctrls, "KidVid", "KIDVID" ); - VList::push_back(ctrls, "MindLink", "MINDLINK" ); + VarList::push_back(ctrls, "Joystick", "JOYSTICK" ); + VarList::push_back(ctrls, "Paddles", "PADDLES" ); + VarList::push_back(ctrls, "Paddles_IAxis", "PADDLES_IAXIS"); + VarList::push_back(ctrls, "Paddles_IDir", "PADDLES_IDIR" ); + VarList::push_back(ctrls, "Paddles_IAxDr", "PADDLES_IAXDR"); + VarList::push_back(ctrls, "BoosterGrip", "BOOSTERGRIP" ); + VarList::push_back(ctrls, "Driving", "DRIVING" ); + VarList::push_back(ctrls, "Keyboard", "KEYBOARD" ); + VarList::push_back(ctrls, "CX-22 Trakball", "TRACKBALL22" ); + VarList::push_back(ctrls, "CX-80 Mouse", "TRACKBALL80" ); + VarList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE" ); + VarList::push_back(ctrls, "AtariVox", "ATARIVOX" ); + VarList::push_back(ctrls, "SaveKey", "SAVEKEY" ); + VarList::push_back(ctrls, "Sega Genesis", "GENESIS" ); + VarList::push_back(ctrls, "CompuMate", "COMPUMATE" ); +// VarList::push_back(ctrls, "KidVid", "KIDVID" ); + VarList::push_back(ctrls, "MindLink", "MINDLINK" ); myP0Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, ctrls, "", 0, 0); wid.push_back(myP0Controller); @@ -210,8 +210,8 @@ GameInfoDialog::GameInfoDialog( xpos += font.getStringWidth("in "); pwidth = font.getStringWidth("right port"); ports.clear(); - VList::push_back(ports, "left port", "L"); - VList::push_back(ports, "right port", "R"); + VarList::push_back(ports, "left port", "L"); + VarList::push_back(ports, "right port", "R"); myLeftPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, ports, "", 0, kLeftCChanged); wid.push_back(myLeftPort); @@ -238,8 +238,8 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "Swap Paddles:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Yes", "YES"); - VList::push_back(items, "No", "NO"); + VarList::push_back(items, "Yes", "YES"); + VarList::push_back(items, "No", "NO"); mySwapPaddles = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(mySwapPaddles); @@ -248,8 +248,8 @@ GameInfoDialog::GameInfoDialog( lwidth = font.getStringWidth("Mouse axis mode: "); pwidth = font.getStringWidth("Specific axis"); items.clear(); - VList::push_back(items, "Automatic", "auto"); - VList::push_back(items, "Specific axis", "specific"); + VarList::push_back(items, "Automatic", "auto"); + VarList::push_back(items, "Specific axis", "specific"); myMouseControl = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "Mouse axis mode: ", lwidth, kMCtrlChanged); @@ -259,15 +259,15 @@ GameInfoDialog::GameInfoDialog( lwidth = font.getStringWidth("X-Axis is: "); pwidth = font.getStringWidth("MindLink 0"); items.clear(); - VList::push_back(items, "None", MouseControl::NoControl); - VList::push_back(items, "Paddle 0", MouseControl::Paddle0); - VList::push_back(items, "Paddle 1", MouseControl::Paddle1); - VList::push_back(items, "Paddle 2", MouseControl::Paddle2); - VList::push_back(items, "Paddle 3", MouseControl::Paddle3); - VList::push_back(items, "Driving 0", MouseControl::Driving0); - VList::push_back(items, "Driving 1", MouseControl::Driving1); - VList::push_back(items, "MindLink 0", MouseControl::MindLink0); - VList::push_back(items, "MindLink 1", MouseControl::MindLink1); + VarList::push_back(items, "None", MouseControl::NoControl); + VarList::push_back(items, "Paddle 0", MouseControl::Paddle0); + VarList::push_back(items, "Paddle 1", MouseControl::Paddle1); + VarList::push_back(items, "Paddle 2", MouseControl::Paddle2); + VarList::push_back(items, "Paddle 3", MouseControl::Paddle3); + VarList::push_back(items, "Driving 0", MouseControl::Driving0); + VarList::push_back(items, "Driving 1", MouseControl::Driving1); + VarList::push_back(items, "MindLink 0", MouseControl::MindLink0); + VarList::push_back(items, "MindLink 1", MouseControl::MindLink1); xpos = 45; ypos += lineHeight + 4; myMouseX = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, @@ -293,13 +293,13 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "Format:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Auto-detect", "AUTO"); - VList::push_back(items, "NTSC", "NTSC"); - VList::push_back(items, "PAL", "PAL"); - VList::push_back(items, "SECAM", "SECAM"); - VList::push_back(items, "NTSC50", "NTSC50"); - VList::push_back(items, "PAL60", "PAL60"); - VList::push_back(items, "SECAM60", "SECAM60"); + VarList::push_back(items, "Auto-detect", "AUTO"); + VarList::push_back(items, "NTSC", "NTSC"); + VarList::push_back(items, "PAL", "PAL"); + VarList::push_back(items, "SECAM", "SECAM"); + VarList::push_back(items, "NTSC50", "NTSC50"); + VarList::push_back(items, "PAL60", "PAL60"); + VarList::push_back(items, "SECAM60", "SECAM60"); myFormat = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myFormat); @@ -323,8 +323,8 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "Use Phosphor:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Yes", "YES"); - VList::push_back(items, "No", "NO"); + VarList::push_back(items, "Yes", "YES"); + VarList::push_back(items, "No", "NO"); myPhosphor = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, kPhosphorChanged); wid.push_back(myPhosphor); diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx index 91ce9b3c0..317115a5e 100644 --- a/src/gui/GlobalPropsDialog.cxx +++ b/src/gui/GlobalPropsDialog.cxx @@ -57,7 +57,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, "Bankswitch type:", kTextAlignLeft); for(int i = 0; i < Cartridge::ourNumBSTypes; ++i) - VList::push_back(items, Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type); + VarList::push_back(items, Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type); myBSType = new PopUpWidget(this, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myBSType); @@ -68,9 +68,9 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, "Left Difficulty:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Default", "DEFAULT"); - VList::push_back(items, "B", "B"); - VList::push_back(items, "A", "A"); + VarList::push_back(items, "Default", "DEFAULT"); + VarList::push_back(items, "B", "B"); + VarList::push_back(items, "A", "A"); myLeftDiff = new PopUpWidget(this, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myLeftDiff); @@ -89,9 +89,9 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, "TV Type:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Default", "DEFAULT"); - VList::push_back(items, "Color", "COLOR"); - VList::push_back(items, "B & W", "BW"); + VarList::push_back(items, "Default", "DEFAULT"); + VarList::push_back(items, "Color", "COLOR"); + VarList::push_back(items, "B & W", "BW"); myTVType = new PopUpWidget(this, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myTVType); @@ -101,8 +101,8 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, "Startup Mode:", kTextAlignLeft); items.clear(); - VList::push_back(items, "Console", "false"); - VList::push_back(items, "Debugger", "true"); + VarList::push_back(items, "Console", "false"); + VarList::push_back(items, "Debugger", "true"); myDebug = new PopUpWidget(this, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); wid.push_back(myDebug); diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index 20c0dc5cf..e3c8df49d 100644 --- a/src/gui/InputDialog.cxx +++ b/src/gui/InputDialog.cxx @@ -114,8 +114,8 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) lwidth = font.getStringWidth("Use mouse as a controller: "); pwidth = font.getStringWidth("Analog devices"); - VList::push_back(items, "Left / Right", "lr"); - VList::push_back(items, "Right / Left", "rl"); + VarList::push_back(items, "Left / Right", "lr"); + VarList::push_back(items, "Right / Left", "rl"); mySAPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "Stelladaptor port order: ", lwidth); wid.push_back(mySAPort); @@ -123,9 +123,9 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) // Use mouse as controller ypos += lineHeight + 5; items.clear(); - VList::push_back(items, "Always", "always"); - VList::push_back(items, "Analog devices", "analog"); - VList::push_back(items, "Never", "never"); + VarList::push_back(items, "Always", "always"); + VarList::push_back(items, "Analog devices", "analog"); + VarList::push_back(items, "Never", "never"); myMouseControl = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "Use mouse as a controller: ", lwidth); wid.push_back(myMouseControl); diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index b3014058e..b674b1b9c 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -174,9 +174,9 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent, // Create context menu for ROM list options VariantList l; - VList::push_back(l, "Power-on options", "override"); - VList::push_back(l, "Filter listing", "filter"); - VList::push_back(l, "Reload listing", "reload"); + VarList::push_back(l, "Power-on options", "override"); + VarList::push_back(l, "Filter listing", "filter"); + VarList::push_back(l, "Reload listing", "reload"); myMenu = make_ptr(this, osystem.frameBuffer().font(), l); // Create global props dialog, which is used to temporarily overrride diff --git a/src/gui/LauncherFilterDialog.cxx b/src/gui/LauncherFilterDialog.cxx index 8ed9082dc..c8902c078 100644 --- a/src/gui/LauncherFilterDialog.cxx +++ b/src/gui/LauncherFilterDialog.cxx @@ -52,9 +52,9 @@ LauncherFilterDialog::LauncherFilterDialog(GuiObject* boss, const GUI::Font& fon xpos = 10; ypos = 10; // Types of files to show - VList::push_back(items, "All files", "allfiles"); - VList::push_back(items, "All roms", "allroms"); - VList::push_back(items, "ROMs ending with", "__EXTS"); + VarList::push_back(items, "All files", "allfiles"); + VarList::push_back(items, "All roms", "allroms"); + VarList::push_back(items, "ROMs ending with", "__EXTS"); myFileType = new PopUpWidget(this, font, xpos, ypos, pwidth, lineHeight, items, "Show: ", lwidth, kFileTypeChanged); diff --git a/src/gui/LoggerDialog.cxx b/src/gui/LoggerDialog.cxx index 23f124226..c4880fdaa 100644 --- a/src/gui/LoggerDialog.cxx +++ b/src/gui/LoggerDialog.cxx @@ -64,9 +64,9 @@ LoggerDialog::LoggerDialog(OSystem& osystem, DialogContainer& parent, // Level of logging (how much info to print) xpos += 20; VariantList items; - VList::push_back(items, "None", "0"); - VList::push_back(items, "Basic", "1"); - VList::push_back(items, "Verbose", "2"); + VarList::push_back(items, "None", "0"); + VarList::push_back(items, "Basic", "1"); + VarList::push_back(items, "Verbose", "2"); myLogLevel = new PopUpWidget(this, font, xpos, ypos, font.getStringWidth("Verbose"), lineHeight, items, "Log level: ", diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index 9d1202d2f..a370b8d39 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -74,8 +74,8 @@ SnapshotDialog::SnapshotDialog( lwidth = font.getStringWidth("Continuous snapshot interval: "); fwidth = font.getStringWidth("internal database"); VariantList items; - VList::push_back(items, "actual ROM name", "rom"); - VList::push_back(items, "internal database", "int"); + VarList::push_back(items, "actual ROM name", "rom"); + VarList::push_back(items, "internal database", "int"); xpos = vBorder+10; ypos += buttonHeight + 8; mySnapName = new PopUpWidget(this, font, xpos, ypos, fwidth, lineHeight, items, @@ -84,16 +84,16 @@ SnapshotDialog::SnapshotDialog( // Snapshot interval (continuous mode) items.clear(); - VList::push_back(items, "1 second", "1"); - VList::push_back(items, "2 seconds", "2"); - VList::push_back(items, "3 seconds", "3"); - VList::push_back(items, "4 seconds", "4"); - VList::push_back(items, "5 seconds", "5"); - VList::push_back(items, "6 seconds", "6"); - VList::push_back(items, "7 seconds", "7"); - VList::push_back(items, "8 seconds", "8"); - VList::push_back(items, "9 seconds", "9"); - VList::push_back(items, "10 seconds", "10"); + VarList::push_back(items, "1 second", "1"); + VarList::push_back(items, "2 seconds", "2"); + VarList::push_back(items, "3 seconds", "3"); + VarList::push_back(items, "4 seconds", "4"); + VarList::push_back(items, "5 seconds", "5"); + VarList::push_back(items, "6 seconds", "6"); + VarList::push_back(items, "7 seconds", "7"); + VarList::push_back(items, "8 seconds", "8"); + VarList::push_back(items, "9 seconds", "9"); + VarList::push_back(items, "10 seconds", "10"); ypos += buttonHeight; mySnapInterval = new PopUpWidget(this, font, xpos, ypos, fwidth, lineHeight, items, diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx index b1431ed12..2e13d59ef 100644 --- a/src/gui/UIDialog.cxx +++ b/src/gui/UIDialog.cxx @@ -100,9 +100,9 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // Launcher font pwidth = font.getStringWidth("2x (1000x760)"); items.clear(); - VList::push_back(items, "Small", "small"); - VList::push_back(items, "Medium", "medium"); - VList::push_back(items, "Large", "large"); + VarList::push_back(items, "Small", "small"); + VarList::push_back(items, "Medium", "medium"); + VarList::push_back(items, "Large", "large"); myLauncherFontPopup = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, "Launcher Font: ", lwidth); @@ -111,9 +111,9 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // ROM launcher info/snapshot viewer items.clear(); - VList::push_back(items, "Off", "0"); - VList::push_back(items, "1x (640x480) ", "1"); - VList::push_back(items, "2x (1000x760)", "2"); + VarList::push_back(items, "Off", "0"); + VarList::push_back(items, "1x (640x480) ", "1"); + VarList::push_back(items, "2x (1000x760)", "2"); myRomViewerPopup = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, "ROM Info viewer: ", lwidth); @@ -123,8 +123,8 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // Exit to Launcher pwidth = font.getStringWidth("If in use"); items.clear(); - VList::push_back(items, "If in use", "0"); - VList::push_back(items, "Always", "1"); + VarList::push_back(items, "If in use", "0"); + VarList::push_back(items, "Always", "1"); myLauncherExitPopup = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, "Exit to Launcher: ", lwidth); @@ -198,10 +198,10 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, pwidth = font.getStringWidth("Bold non-labels only"); xpos = vBorder; items.clear(); - VList::push_back(items, "All Normal font", "0"); - VList::push_back(items, "Bold labels only", "1"); - VList::push_back(items, "Bold non-labels only", "2"); - VList::push_back(items, "All Bold font", "3"); + VarList::push_back(items, "All Normal font", "0"); + VarList::push_back(items, "Bold labels only", "1"); + VarList::push_back(items, "Bold non-labels only", "2"); + VarList::push_back(items, "All Bold font", "3"); myDebuggerFontStyle = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, "Font Style: ", lwidth); @@ -241,8 +241,8 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // UI Palette ypos += 1; items.clear(); - VList::push_back(items, "Standard", "standard"); - VList::push_back(items, "Classic", "classic"); + VarList::push_back(items, "Standard", "standard"); + VarList::push_back(items, "Classic", "classic"); myPalettePopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "Interface Palette (*): ", lwidth); wid.push_back(myPalettePopup); @@ -250,14 +250,14 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // Delay between quick-selecting characters in ListWidget items.clear(); - VList::push_back(items, "300 ms", "300"); - VList::push_back(items, "400 ms", "400"); - VList::push_back(items, "500 ms", "500"); - VList::push_back(items, "600 ms", "600"); - VList::push_back(items, "700 ms", "700"); - VList::push_back(items, "800 ms", "800"); - VList::push_back(items, "900 ms", "900"); - VList::push_back(items, "1 sec", "1000"); + VarList::push_back(items, "300 ms", "300"); + VarList::push_back(items, "400 ms", "400"); + VarList::push_back(items, "500 ms", "500"); + VarList::push_back(items, "600 ms", "600"); + VarList::push_back(items, "700 ms", "700"); + VarList::push_back(items, "800 ms", "800"); + VarList::push_back(items, "900 ms", "900"); + VarList::push_back(items, "1 sec", "1000"); myListDelayPopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "List quick delay: ", lwidth); wid.push_back(myListDelayPopup); @@ -265,16 +265,16 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // Number of lines a mouse wheel will scroll items.clear(); - VList::push_back(items, "1 line", "1"); - VList::push_back(items, "2 lines", "2"); - VList::push_back(items, "3 lines", "3"); - VList::push_back(items, "4 lines", "4"); - VList::push_back(items, "5 lines", "5"); - VList::push_back(items, "6 lines", "6"); - VList::push_back(items, "7 lines", "7"); - VList::push_back(items, "8 lines", "8"); - VList::push_back(items, "9 lines", "9"); - VList::push_back(items, "10 lines", "10"); + VarList::push_back(items, "1 line", "1"); + VarList::push_back(items, "2 lines", "2"); + VarList::push_back(items, "3 lines", "3"); + VarList::push_back(items, "4 lines", "4"); + VarList::push_back(items, "5 lines", "5"); + VarList::push_back(items, "6 lines", "6"); + VarList::push_back(items, "7 lines", "7"); + VarList::push_back(items, "8 lines", "8"); + VarList::push_back(items, "9 lines", "9"); + VarList::push_back(items, "10 lines", "10"); myWheelLinesPopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "Mouse wheel scroll: ", lwidth); wid.push_back(myWheelLinesPopup); diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx index 7b2617dc3..a704e5176 100644 --- a/src/gui/VideoDialog.cxx +++ b/src/gui/VideoDialog.cxx @@ -80,9 +80,9 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // TIA Palette items.clear(); - VList::push_back(items, "Standard", "standard"); - VList::push_back(items, "Z26", "z26"); - VList::push_back(items, "User", "user"); + VarList::push_back(items, "Standard", "standard"); + VarList::push_back(items, "Z26", "z26"); + VarList::push_back(items, "User", "user"); myTIAPalette = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "TIA Palette: ", lwidth); wid.push_back(myTIAPalette); @@ -90,8 +90,8 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // TIA interpolation items.clear(); - VList::push_back(items, "Linear", "linear"); - VList::push_back(items, "Nearest", "nearest"); + VarList::push_back(items, "Linear", "linear"); + VarList::push_back(items, "Nearest", "nearest"); myTIAInterpolate = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "TIA Inter: ", lwidth); wid.push_back(myTIAInterpolate); @@ -99,8 +99,8 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // Timing to use between frames items.clear(); - VList::push_back(items, "Sleep", "sleep"); - VList::push_back(items, "Busy-wait", "busy"); + VarList::push_back(items, "Sleep", "sleep"); + VarList::push_back(items, "Busy-wait", "busy"); myFrameTiming = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, "Timing (*): ", lwidth); wid.push_back(myFrameTiming); @@ -201,12 +201,12 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // TV Mode items.clear(); - VList::push_back(items, "Disabled", NTSCFilter::PRESET_OFF); - VList::push_back(items, "Composite", NTSCFilter::PRESET_COMPOSITE); - VList::push_back(items, "S-Video", NTSCFilter::PRESET_SVIDEO); - VList::push_back(items, "RGB", NTSCFilter::PRESET_RGB); - VList::push_back(items, "Bad adjust", NTSCFilter::PRESET_BAD); - VList::push_back(items, "Custom", NTSCFilter::PRESET_CUSTOM); + VarList::push_back(items, "Disabled", NTSCFilter::PRESET_OFF); + VarList::push_back(items, "Composite", NTSCFilter::PRESET_COMPOSITE); + VarList::push_back(items, "S-Video", NTSCFilter::PRESET_SVIDEO); + VarList::push_back(items, "RGB", NTSCFilter::PRESET_RGB); + VarList::push_back(items, "Bad adjust", NTSCFilter::PRESET_BAD); + VarList::push_back(items, "Custom", NTSCFilter::PRESET_CUSTOM); lwidth = font.getStringWidth("TV Mode: "); pwidth = font.getStringWidth("Bad adjust"), myTVMode =