ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert all arrays in the codebase to vectors, so that we get all 

the advantages of C++11 (move semantics, list initialization, etc).
I'd hoped to somehow wrap a vector behind Common::Array and not have
to change the codebase to this extent, but it didn't work out.  And
I've since read that it's bad form to extend from std::vector anyway.
This is *THE LAST* bit of work I'm doing with arrays; everything is
now a proper vector.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3055 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-08 21:27:36 +00:00
parent 740eeed579
commit 7b9169c18d
105 changed files with 639 additions and 741 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cheat/Cheat.hxx
View File

@ -22,7 +22,8 @@
class OSystem;
#include "StringList.hxx"
#include <regex>
#include "bspf.hxx"
class Cheat
@ -30,13 +31,10 @@ class Cheat
public:
Cheat(OSystem& osystem, const string& name, const string& code)
: myOSystem(osystem),
myName(name),
myName(name == "" ? code : regex_replace(name, regex(":|\""), "")),
myCode(code),
myEnabled(false)
{
if(name == "") myName = code;
myName = StringList::removePattern(myName, "\":");
}
{ }
virtual ~Cheat() { }
bool enabled() const { return myEnabled; }

1
src/cheat/CheatCodeDialog.cxx
View File

@ -29,7 +29,6 @@
#include "InputTextDialog.hxx"
#include "OSystem.hxx"
#include "Props.hxx"
#include "StringList.hxx"
#include "Widget.hxx"
#include "CheatCodeDialog.hxx"

9
src/cheat/CheatManager.cxx
View File

@ -27,6 +27,7 @@
#include "CheetahCheat.hxx"
#include "BankRomCheat.hxx"
#include "RamCheat.hxx"
#include "Vec.hxx"
#include "CheatManager.hxx"
@ -59,7 +60,7 @@ Cheat* CheatManager::add(const string& name, const string& code,
{
if(myCheatList[i]->name() == name || myCheatList[i]->code() == code)
{
myCheatList.removeAt(i);
Vec::removeAt(myCheatList, i);
break;
}
}
@ -68,7 +69,7 @@ Cheat* CheatManager::add(const string& name, const string& code,
if(idx == -1)
myCheatList.push_back(cheat);
else
myCheatList.insertAt(idx, cheat);
Vec::insertAt(myCheatList, idx, cheat);
// And enable/disable it (the cheat knows how to enable or disable itself)
if(enable)
@ -91,7 +92,7 @@ void CheatManager::remove(int idx)
addPerFrame(c, false);
// Then remove it from the cheatlist entirely
myCheatList.removeAt(idx);
Vec::removeAt(myCheatList, idx);
c->disable();
delete c;
}
@ -122,7 +123,7 @@ void CheatManager::addPerFrame(Cheat* cheat, bool enable)
else
{
if(found)
myPerFrameList.removeAt(i);
Vec::removeAt(myPerFrameList, i);
}
}

3
src/cheat/CheatManager.hxx
View File

@ -26,9 +26,8 @@ class Cheat;
class OSystem;
#include "bspf.hxx"
#include "Array.hxx"
typedef Common::Array<Cheat*> CheatList;
typedef vector<Cheat*> CheatList;
typedef map<string,string> CheatCodeMap;
/**

1
src/common/FSNodeZIP.hxx
View File

@ -20,7 +20,6 @@
#ifndef FS_NODE_ZIP_HXX
#define FS_NODE_ZIP_HXX
#include "StringList.hxx"
#include "FSNode.hxx"
/*

12
src/common/FrameBufferSDL2.cxx
View File

@ -78,7 +78,7 @@ FrameBufferSDL2::~FrameBufferSDL2()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBufferSDL2::queryHardware(Common::Array<GUI::Size>& displays,
void FrameBufferSDL2::queryHardware(vector<GUI::Size>& displays,
VariantList& renderers)
{
// First get the maximum windowed desktop resolution
@ -93,12 +93,12 @@ void FrameBufferSDL2::queryHardware(Common::Array<GUI::Size>& displays,
// For now, supported render types are hardcoded; eventually, SDL may
// provide a method to query this
#if defined(BSPF_WINDOWS)
renderers.push_back("Direct3D", "direct3d");
VList::push_back(renderers, "Direct3D", "direct3d");
#endif
renderers.push_back("OpenGL", "opengl");
renderers.push_back("OpenGLES2", "opengles2");
renderers.push_back("OpenGLES", "opengles");
renderers.push_back("Software", "software");
VList::push_back(renderers, "OpenGL", "opengl");
VList::push_back(renderers, "OpenGLES2", "opengles2");
VList::push_back(renderers, "OpenGLES", "opengles");
VList::push_back(renderers, "Software", "software");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/common/FrameBufferSDL2.hxx
View File

@ -115,7 +115,7 @@ class FrameBufferSDL2 : public FrameBuffer
This method is called to query and initialize the video hardware
for desktop and fullscreen resolution information.
*/
void queryHardware(Common::Array<GUI::Size>& displays, VariantList& renderers);
void queryHardware(vector<GUI::Size>& displays, VariantList& renderers);
/**
This method is called to query the video hardware for the index

3
src/common/MouseControl.hxx
View File

@ -24,7 +24,6 @@ class Console;
class Properties;
#include "bspf.hxx"
#include "Array.hxx"
#include "Control.hxx"
/**
@ -108,7 +107,7 @@ class MouseControl
};
int myCurrentModeNum;
Common::Array<MouseMode> myModeList;
vector<MouseMode> myModeList;
};
#endif

49
src/common/StringList.hxx
View File

@ -1,49 +0,0 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-2014 by Bradford W. Mott, Stephen Anthony
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id$
//============================================================================
#ifndef STRING_LIST_HXX
#define STRING_LIST_HXX
#include "Array.hxx"
class StringList : public Common::Array<string>
{
public:
static string removePattern(const string& str, const string& pattern)
{
// This can probably be made more efficient ...
string tmp;
for(unsigned int i = 0; i < str.length(); ++i)
{
bool match = false;
for(unsigned int j = 0; j < pattern.length(); ++j)
{
if(str[i] == pattern[j])
{
match = true;
break;
}
}
if(!match) tmp += str[i];
}
return tmp;
}
};
#endif

1
src/common/StringParser.hxx
View File

@ -20,7 +20,6 @@
#ifndef STRING_PARSER_HXX
#define STRING_PARSER_HXX
#include "StringList.hxx"
#include "bspf.hxx"
/**

16
src/common/Variant.hxx
View File

@ -20,7 +20,6 @@
#ifndef VARIANT_HXX
#define VARIANT_HXX
#include "Array.hxx"
#include "Rect.hxx"
#include "bspf.hxx"
@ -76,19 +75,20 @@ class Variant
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static const Variant EmptyVariant = Variant();
static const Variant EmptyVariant;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
class VariantList : public Common::Array<pair<string,Variant>>
{
public:
void push_back(const Variant& name, const Variant& tag = EmptyVariant)
typedef vector<pair<string,Variant>> VariantList;
namespace VList {
inline void push_back(VariantList& list, const Variant& name,
const Variant& tag = EmptyVariant)
{
emplace_back(name.toString(), tag);
list.emplace_back(name.toString(), tag);
}
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static const VariantList EmptyVarList = VariantList();
static const VariantList EmptyVarList;
#endif

43
src/common/Array.hxx → src/common/Vec.hxx
View File

@ -17,40 +17,31 @@
// $Id$
//============================================================================
#ifndef ARRAY_HXX
#define ARRAY_HXX
#include <cassert>
#ifndef VECTOR_OPS_HXX
#define VECTOR_OPS_HXX
#include "bspf.hxx"
namespace Common {
namespace Vec {
template <class T>
class Array : public vector<T>
void append(vector<T>& dst, const vector<T>& src)
{
public:
void append(const Array<T>& array)
{
this->insert(this->end(), array.begin(), array.end());
}
dst.insert(dst.end(), src.begin(), src.end());
}
void insertAt(uInt32 idx, const T& element)
{
this->insert(this->cbegin()+idx, element);
}
template <class T>
void insertAt(vector<T>& dst, uInt32 idx, const T& element)
{
dst.insert(dst.cbegin()+idx, element);
}
void removeAt(uInt32 idx)
{
this->erase(this->cbegin()+idx);
}
};
template <class T>
void removeAt(vector<T>& dst, uInt32 idx)
{
dst.erase(dst.cbegin()+idx);
}
} // Namespace Common
// Common array types
class IntArray : public Common::Array<Int32> { };
class BoolArray : public Common::Array<bool> { };
class ByteArray : public Common::Array<uInt8> { };
} // Namespace Vec
#endif

7
src/common/bspf.hxx
View File

@ -72,8 +72,15 @@
#include <cstring>
#include <cctype>
#include <cstdio>
#include <vector>
using namespace std;
// Common array types
typedef vector<Int32> IntArray;
typedef vector<bool> BoolArray;
typedef vector<uInt8> ByteArray;
typedef vector<string> StringList;
// Defines to help with path handling
#if (defined(BSPF_UNIX) || defined(BSPF_MAC_OSX))
#define BSPF_PATH_SEPARATOR "/"

1
src/debugger/CartDebug.cxx
View File

@ -20,7 +20,6 @@
#include <time.h>
#include "bspf.hxx"
#include "Array.hxx"
#include "System.hxx"
#include "FSNode.hxx"
#include "DiStella.hxx"

5
src/debugger/CartDebug.hxx
View File

@ -28,7 +28,6 @@ class CartDebugWidget;
#include <list>
#include "bspf.hxx"
#include "Array.hxx"
#include "Base.hxx"
#include "Cart.hxx"
#include "DebuggerSystem.hxx"
@ -85,7 +84,7 @@ class CartDebug : public DebuggerSystem
string bytes;
bool hllabel;
};
typedef Common::Array<DisassemblyTag> DisassemblyList;
typedef vector<DisassemblyTag> DisassemblyList;
struct Disassembly {
DisassemblyList list;
int fieldwidth;
@ -351,7 +350,7 @@ class CartDebug : public DebuggerSystem
CartDebugWidget* myDebugWidget;
// A complete record of relevant diassembly information for each bank
Common::Array<BankInfo> myBankInfo;
vector<BankInfo> myBankInfo;
// Used for the disassembly display, and mapping from addresses
// to corresponding lines of text in that display

1
src/debugger/CpuDebug.cxx
View File

@ -19,7 +19,6 @@
#include <sstream>
#include "Array.hxx"
#include "M6502.hxx"
#include "Debugger.hxx"
#include "CartDebug.hxx"

1
src/debugger/CpuDebug.hxx
View File

@ -20,7 +20,6 @@
#ifndef CPU_DEBUG_HXX
#define CPU_DEBUG_HXX
#include "Array.hxx"
#include "M6502.hxx"
#include "System.hxx"
#include "DebuggerSystem.hxx"

1
src/debugger/Debugger.hxx
View File

@ -40,7 +40,6 @@ class ButtonWidget;
#include <map>
#include "Array.hxx"
#include "Base.hxx"
#include "DialogContainer.hxx"
#include "DebuggerDialog.hxx"

3
src/debugger/DebuggerParser.cxx
View File

@ -36,6 +36,7 @@
#include "RomWidget.hxx"
#include "ProgressDialog.hxx"
#include "PackedBitArray.hxx"
#include "Vec.hxx"
#include "Base.hxx"
using namespace Common;
@ -886,7 +887,7 @@ void DebuggerParser::executeDelwatch()
int which = args[0] - 1;
if(which >= 0 && which < (int)watches.size())
{
watches.removeAt(which);
Vec::removeAt(watches, which);
commandResult << "removed watch";
}
else

2
src/debugger/DebuggerParser.hxx
View File

@ -27,8 +27,6 @@ class FilesystemNode;
struct Command;
#include "bspf.hxx"
#include "Array.hxx"
#include "StringList.hxx"
#include "FrameBuffer.hxx"
#include "Settings.hxx"

1
src/debugger/DiStella.hxx
View File

@ -23,7 +23,6 @@
#include <queue>
#include <sstream>
#include "Array.hxx"
#include "Base.hxx"
#include "CartDebug.hxx"
#include "bspf.hxx"

1
src/debugger/RiotDebug.hxx
View File

@ -23,7 +23,6 @@
class Debugger;
class RiotDebug;
#include "Array.hxx"
#include "M6532.hxx"
#include "DebuggerSystem.hxx"

1
src/debugger/TIADebug.hxx
View File

@ -24,7 +24,6 @@ class Debugger;
class TiaDebug;
class TIA;
#include "Array.hxx"
#include "DebuggerSystem.hxx"
// pointer types for TIADebug instance methods

4
src/debugger/gui/Cart0840Widget.cxx
View File

@ -48,8 +48,8 @@ Cartridge0840Widget::Cartridge0840Widget(
ypos = addBaseInformation(size, "Fred X. Quimby", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($800)");
items.push_back("1 ($840)");
VList::push_back(items, "0 ($800)");
VList::push_back(items, "1 ($840)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($800) "),
myLineHeight, items, "Set bank: ",

8
src/debugger/gui/Cart3EWidget.cxx
View File

@ -54,13 +54,13 @@ Cartridge3EWidget::Cartridge3EWidget(
VariantList romitems;
for(uInt32 i = 0; i < myNumRomBanks; ++i)
romitems.push_back(i);
romitems.push_back("Inactive", "");
VList::push_back(romitems, i);
VList::push_back(romitems, "Inactive", "");
VariantList ramitems;
for(uInt32 i = 0; i < myNumRamBanks; ++i)
ramitems.push_back(i);
ramitems.push_back("Inactive", "");
VList::push_back(ramitems, i);
VList::push_back(ramitems, "Inactive", "");
ostringstream label;
label << "Set bank ($" << Common::Base::HEX4 << start << " - $"

2
src/debugger/gui/Cart3FWidget.cxx
View File

@ -46,7 +46,7 @@ Cartridge3FWidget::Cartridge3FWidget(
VariantList items;
for(uInt16 i = 0; i < cart.bankCount(); ++i)
items.push_back(Variant(i).toString() + " ($3F)");
VList::push_back(items, Variant(i).toString() + " ($3F)");
ostringstream label;
label << "Set bank ($" << Common::Base::HEX4 << start << " - $" <<

16
src/debugger/gui/Cart4A50Widget.cxx
View File

@ -42,20 +42,20 @@ Cartridge4A50Widget::Cartridge4A50Widget(
VariantList items16, items32, items128, items256;
for(uInt32 i = 0; i < 16; ++i)
items16.push_back(i);
items16.push_back("Inactive", "");
VList::push_back(items16, i);
VList::push_back(items16, "Inactive", "");
for(uInt32 i = 0; i < 32; ++i)
items32.push_back(i);
items32.push_back("Inactive", "");
VList::push_back(items32, i);
VList::push_back(items32, "Inactive", "");
for(uInt32 i = 0; i < 128; ++i)
items128.push_back(i);
items128.push_back("Inactive", "");
VList::push_back(items128, i);
VList::push_back(items128, "Inactive", "");
for(uInt32 i = 0; i < 256; ++i)
items256.push_back(i);
items256.push_back("Inactive", "");
VList::push_back(items256, i);
VList::push_back(items256, "Inactive", "");
string lowerlabel = "Set lower 2K region ($F000 - $F7FF): ";
string middlelabel = "Set middle 1.5K region ($F800 - $FDFF): ";

64
src/debugger/gui/CartARWidget.cxx
View File

@ -38,38 +38,38 @@ CartridgeARWidget::CartridgeARWidget(
ypos = addBaseInformation(size, "Starpath", info) + myLineHeight;
VariantList items;
items.push_back(" 0");
items.push_back(" 1");
items.push_back(" 2");
items.push_back(" 3");
items.push_back(" 4");
items.push_back(" 5");
items.push_back(" 6");
items.push_back(" 7");
items.push_back(" 8");
items.push_back(" 9");
items.push_back(" 10");
items.push_back(" 11");
items.push_back(" 12");
items.push_back(" 13");
items.push_back(" 14");
items.push_back(" 15");
items.push_back(" 16");
items.push_back(" 17");
items.push_back(" 18");
items.push_back(" 19");
items.push_back(" 20");
items.push_back(" 21");
items.push_back(" 22");
items.push_back(" 23");
items.push_back(" 24");
items.push_back(" 25");
items.push_back(" 26");
items.push_back(" 27");
items.push_back(" 28");
items.push_back(" 29");
items.push_back(" 30");
items.push_back(" 31");
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");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" XX "),
myLineHeight, items, "Set bank: ",

128
src/debugger/gui/CartBFSCWidget.cxx
View File

@ -49,70 +49,70 @@ CartridgeBFSCWidget::CartridgeBFSCWidget(
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0 ($F80)");
items.push_back(" 1 ($F81)");
items.push_back(" 2 ($F82)");
items.push_back(" 3 ($F83)");
items.push_back(" 4 ($F84)");
items.push_back(" 5 ($F85)");
items.push_back(" 6 ($F86)");
items.push_back(" 7 ($F87)");
items.push_back(" 8 ($F88)");
items.push_back(" 9 ($F89)");
items.push_back("10 ($F8A)");
items.push_back("11 ($F8B)");
items.push_back("12 ($F8C)");
items.push_back("13 ($F8D)");
items.push_back("14 ($F8E)");
items.push_back("15 ($F8F)");
items.push_back("16 ($F90)");
items.push_back("17 ($F91)");
items.push_back("18 ($F92)");
items.push_back("19 ($F93)");
items.push_back("20 ($F94)");
items.push_back("21 ($F95)");
items.push_back("22 ($F96)");
items.push_back("23 ($F97)");
items.push_back("24 ($F98)");
items.push_back("25 ($F99)");
items.push_back("26 ($F9A)");
items.push_back("27 ($F9B)");
items.push_back("28 ($F9C)");
items.push_back("29 ($F9D)");
items.push_back("30 ($F9E)");
items.push_back("31 ($F9F)");
items.push_back("32 ($FA0)");
items.push_back("33 ($FA1)");
items.push_back("34 ($FA2)");
items.push_back("35 ($FA3)");
items.push_back("36 ($FA4)");
items.push_back("37 ($FA5)");
items.push_back("38 ($FA6)");
items.push_back("39 ($FA7)");
items.push_back("40 ($FA8)");
items.push_back("41 ($FA9)");
items.push_back("42 ($FAA)");
items.push_back("43 ($FAB)");
items.push_back("44 ($FAC)");
items.push_back("45 ($FAD)");
items.push_back("46 ($FAE)");
items.push_back("47 ($FAF)");
items.push_back("48 ($FB0)");
items.push_back("49 ($FB1)");
items.push_back("50 ($FB2)");
items.push_back("51 ($FB3)");
items.push_back("52 ($FB4)");
items.push_back("53 ($FB5)");
items.push_back("54 ($FB6)");
items.push_back("55 ($FB7)");
items.push_back("56 ($FB8)");
items.push_back("57 ($FB9)");
items.push_back("58 ($FBA)");
items.push_back("59 ($FBB)");
items.push_back("60 ($FBC)");
items.push_back("61 ($FBD)");
items.push_back("62 ($FBE)");
items.push_back("63 ($FBF)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("63 ($FBF) "),

128
src/debugger/gui/CartBFWidget.cxx
View File

@ -47,70 +47,70 @@ CartridgeBFWidget::CartridgeBFWidget(
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0 ($F80)");
items.push_back(" 1 ($F81)");
items.push_back(" 2 ($F82)");
items.push_back(" 3 ($F83)");
items.push_back(" 4 ($F84)");
items.push_back(" 5 ($F85)");
items.push_back(" 6 ($F86)");
items.push_back(" 7 ($F87)");
items.push_back(" 8 ($F88)");
items.push_back(" 9 ($F89)");
items.push_back("10 ($F8A)");
items.push_back("11 ($F8B)");
items.push_back("12 ($F8C)");
items.push_back("13 ($F8D)");
items.push_back("14 ($F8E)");
items.push_back("15 ($F8F)");
items.push_back("16 ($F90)");
items.push_back("17 ($F91)");
items.push_back("18 ($F92)");
items.push_back("19 ($F93)");
items.push_back("20 ($F94)");
items.push_back("21 ($F95)");
items.push_back("22 ($F96)");
items.push_back("23 ($F97)");
items.push_back("24 ($F98)");
items.push_back("25 ($F99)");
items.push_back("26 ($F9A)");
items.push_back("27 ($F9B)");
items.push_back("28 ($F9C)");
items.push_back("29 ($F9D)");
items.push_back("30 ($F9E)");
items.push_back("31 ($F9F)");
items.push_back("32 ($FA0)");
items.push_back("33 ($FA1)");
items.push_back("34 ($FA2)");
items.push_back("35 ($FA3)");
items.push_back("36 ($FA4)");
items.push_back("37 ($FA5)");
items.push_back("38 ($FA6)");
items.push_back("39 ($FA7)");
items.push_back("40 ($FA8)");
items.push_back("41 ($FA9)");
items.push_back("42 ($FAA)");
items.push_back("43 ($FAB)");
items.push_back("44 ($FAC)");
items.push_back("45 ($FAD)");
items.push_back("46 ($FAE)");
items.push_back("47 ($FAF)");
items.push_back("48 ($FB0)");
items.push_back("49 ($FB1)");
items.push_back("50 ($FB2)");
items.push_back("51 ($FB3)");
items.push_back("52 ($FB4)");
items.push_back("53 ($FB5)");
items.push_back("54 ($FB6)");
items.push_back("55 ($FB7)");
items.push_back("56 ($FB8)");
items.push_back("57 ($FB9)");
items.push_back("58 ($FBA)");
items.push_back("59 ($FBB)");
items.push_back("60 ($FBC)");
items.push_back("61 ($FBD)");
items.push_back("62 ($FBE)");
items.push_back("63 ($FBF)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FBF) "),

8
src/debugger/gui/CartCMWidget.cxx
View File

@ -46,10 +46,10 @@ CartridgeCMWidget::CartridgeCMWidget(
ypos = addBaseInformation(size, "CompuMate", info) + myLineHeight;
VariantList items;
items.push_back(" 0 ");
items.push_back(" 1 ");
items.push_back(" 2 ");
items.push_back(" 3 ");
VList::push_back(items, " 0 ");
VList::push_back(items, " 1 ");
VList::push_back(items, " 2 ");
VList::push_back(items, " 3 ");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 0 "),
myLineHeight, items, "Set bank: ",

14
src/debugger/gui/CartCTYWidget.cxx
View File

@ -40,13 +40,13 @@ CartridgeCTYWidget::CartridgeCTYWidget(
ypos = addBaseInformation(size, "Chris D. Walton", info) + myLineHeight;
VariantList items;
items.push_back("1 ($FF5)");
items.push_back("2 ($FF6)");
items.push_back("3 ($FF7)");
items.push_back("4 ($FF8)");
items.push_back("5 ($FF9)");
items.push_back("6 ($FFA)");
items.push_back("7 ($FFB)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

6
src/debugger/gui/CartDASHWidget.cxx
View File

@ -50,11 +50,11 @@ CartridgeDASHWidget::CartridgeDASHWidget(
VariantList bankno;
for(uInt32 i = 0; i < myCart.ROM_BANK_COUNT; ++i)
bankno.push_back(i, i);
VList::push_back(bankno, i, i);
VariantList banktype;
banktype.push_back("ROM", "ROM");
banktype.push_back("RAM", "RAM");
VList::push_back(banktype, "ROM", "ROM");
VList::push_back(banktype, "RAM", "RAM");
for(uInt32 i = 0; i < 4; ++i)
{

64
src/debugger/gui/CartDFSCWidget.cxx
View File

@ -49,38 +49,38 @@ CartridgeDFSCWidget::CartridgeDFSCWidget(
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0 ($FC0)");
items.push_back(" 1 ($FC1)");
items.push_back(" 2 ($FC2)");
items.push_back(" 3 ($FC3)");
items.push_back(" 4 ($FC4)");
items.push_back(" 5 ($FC5)");
items.push_back(" 6 ($FC6)");
items.push_back(" 7 ($FC7)");
items.push_back(" 8 ($FC8)");
items.push_back(" 9 ($FC9)");
items.push_back("10 ($FCA)");
items.push_back("11 ($FCB)");
items.push_back("12 ($FCC)");
items.push_back("13 ($FCD)");
items.push_back("14 ($FCE)");
items.push_back("15 ($FCF)");
items.push_back("16 ($FD0)");
items.push_back("17 ($FD1)");
items.push_back("18 ($FD2)");
items.push_back("19 ($FD3)");
items.push_back("20 ($FD4)");
items.push_back("21 ($FD5)");
items.push_back("22 ($FD6)");
items.push_back("23 ($FD7)");
items.push_back("24 ($FD8)");
items.push_back("25 ($FD9)");
items.push_back("26 ($FDA)");
items.push_back("27 ($FDB)");
items.push_back("28 ($FDC)");
items.push_back("29 ($FDD)");
items.push_back("30 ($FDE)");
items.push_back("31 ($FDF)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FE0) "),

64
src/debugger/gui/CartDFWidget.cxx
View File

@ -47,38 +47,38 @@ CartridgeDFWidget::CartridgeDFWidget(
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0 ($FC0)");
items.push_back(" 1 ($FC1)");
items.push_back(" 2 ($FC2)");
items.push_back(" 3 ($FC3)");
items.push_back(" 4 ($FC4)");
items.push_back(" 5 ($FC5)");
items.push_back(" 6 ($FC6)");
items.push_back(" 7 ($FC7)");
items.push_back(" 8 ($FC8)");
items.push_back(" 9 ($FC9)");
items.push_back("10 ($FCA)");
items.push_back("11 ($FCB)");
items.push_back("12 ($FCC)");
items.push_back("13 ($FCD)");
items.push_back("14 ($FCE)");
items.push_back("15 ($FCF)");
items.push_back("16 ($FD0)");
items.push_back("17 ($FD1)");
items.push_back("18 ($FD2)");
items.push_back("19 ($FD3)");
items.push_back("20 ($FD4)");
items.push_back("21 ($FD5)");
items.push_back("22 ($FD6)");
items.push_back("23 ($FD7)");
items.push_back("24 ($FD8)");
items.push_back("25 ($FD9)");
items.push_back("26 ($FDA)");
items.push_back("27 ($FDB)");
items.push_back("28 ($FDC)");
items.push_back("29 ($FDD)");
items.push_back("30 ($FDE)");
items.push_back("31 ($FDF)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FDF) "),

12
src/debugger/gui/CartDPCPlusWidget.cxx
View File

@ -55,12 +55,12 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myLineHeight;
VariantList items;
items.push_back("0 ($FF6)");
items.push_back("1 ($FF7)");
items.push_back("2 ($FF8)");
items.push_back("3 ($FF9)");
items.push_back("4 ($FFA)");
items.push_back("5 ($FFB)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

4
src/debugger/gui/CartDPCWidget.cxx
View File

@ -52,8 +52,8 @@ CartridgeDPCWidget::CartridgeDPCWidget(
myLineHeight;
VariantList items;
items.push_back("0 ($FF8)");
items.push_back("1 ($FF9)");
VList::push_back(items, "0 ($FF8)");
VList::push_back(items, "1 ($FF9)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

6
src/debugger/gui/CartE0Widget.cxx
View File

@ -67,9 +67,9 @@ CartridgeE0Widget::CartridgeE0Widget(
VariantList items0, items1, items2;
for(int i = 0; i < 8; ++i)
{
items0.push_back(seg0[i]);
items1.push_back(seg1[i]);
items2.push_back(seg2[i]);
VList::push_back(items0, seg0[i]);
VList::push_back(items1, seg1[i]);
VList::push_back(items2, seg2[i]);
}
const int lwidth = _font.getStringWidth("Set slice for segment X: ");

4
src/debugger/gui/CartE7Widget.cxx
View File

@ -63,9 +63,9 @@ CartridgeE7Widget::CartridgeE7Widget(
VariantList items0, items1;
for(int i = 0; i < 8; ++i)
items0.push_back(spot_lower[i]);
VList::push_back(items0, spot_lower[i]);
for(int i = 0; i < 4; ++i)
items1.push_back(spot_upper[i]);
VList::push_back(items1, spot_upper[i]);
const int lwidth = _font.getStringWidth("Set slice for upper 256B: "),
fwidth = _font.getStringWidth("3 - RAM ($FEB)");

32
src/debugger/gui/CartEFSCWidget.cxx
View File

@ -50,22 +50,22 @@ CartridgeEFSCWidget::CartridgeEFSCWidget(
info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0 ($FE0)");
items.push_back(" 1 ($FE1)");
items.push_back(" 2 ($FE2)");
items.push_back(" 3 ($FE3)");
items.push_back(" 4 ($FE4)");
items.push_back(" 5 ($FE5)");
items.push_back(" 6 ($FE6)");
items.push_back(" 7 ($FE7)");
items.push_back(" 8 ($FE8)");
items.push_back(" 9 ($FE9)");
items.push_back("10 ($FEA)");
items.push_back("11 ($FEB)");
items.push_back("12 ($FEC)");
items.push_back("13 ($FED)");
items.push_back("14 ($FEE)");
items.push_back("15 ($FEF)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FE0) "),
myLineHeight, items, "Set bank: ",

32
src/debugger/gui/CartEFWidget.cxx
View File

@ -48,22 +48,22 @@ CartridgeEFWidget::CartridgeEFWidget(
info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0 ($FE0)");
items.push_back(" 1 ($FE1)");
items.push_back(" 2 ($FE2)");
items.push_back(" 3 ($FE3)");
items.push_back(" 4 ($FE4)");
items.push_back(" 5 ($FE5)");
items.push_back(" 6 ($FE6)");
items.push_back(" 7 ($FE7)");
items.push_back(" 8 ($FE8)");
items.push_back(" 9 ($FE9)");
items.push_back("10 ($FEA)");
items.push_back("11 ($FEB)");
items.push_back("12 ($FEC)");
items.push_back("13 ($FED)");
items.push_back("14 ($FEE)");
items.push_back("15 ($FEF)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FE0) "),
myLineHeight, items, "Set bank: ",

32
src/debugger/gui/CartF0Widget.cxx
View File

@ -49,22 +49,22 @@ CartridgeF0Widget::CartridgeF0Widget(
info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0");
items.push_back(" 1");
items.push_back(" 2");
items.push_back(" 3");
items.push_back(" 4");
items.push_back(" 5");
items.push_back(" 6");
items.push_back(" 7");
items.push_back(" 8");
items.push_back(" 9");
items.push_back(" 10");
items.push_back(" 11");
items.push_back(" 12");
items.push_back(" 13");
items.push_back(" 14");
items.push_back(" 15");
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");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "),
myLineHeight, items, "Set bank: ",

16
src/debugger/gui/CartF4SCWidget.cxx
View File

@ -49,14 +49,14 @@ CartridgeF4SCWidget::CartridgeF4SCWidget(
ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight;
VariantList items;
items.push_back("0 ($FF4)");
items.push_back("1 ($FF5)");
items.push_back("2 ($FF6)");
items.push_back("3 ($FF7)");
items.push_back("4 ($FF8)");
items.push_back("5 ($FF9)");
items.push_back("6 ($FFA)");
items.push_back("7 ($FFB)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

16
src/debugger/gui/CartF4Widget.cxx
View File

@ -47,14 +47,14 @@ CartridgeF4Widget::CartridgeF4Widget(
ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight;
VariantList items;
items.push_back("0 ($FF4)");
items.push_back("1 ($FF5)");
items.push_back("2 ($FF6)");
items.push_back("3 ($FF7)");
items.push_back("4 ($FF8)");
items.push_back("5 ($FF9)");
items.push_back("6 ($FFA)");
items.push_back("7 ($FFB)");
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)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

8
src/debugger/gui/CartF6SCWidget.cxx
View File

@ -49,10 +49,10 @@ CartridgeF6SCWidget::CartridgeF6SCWidget(
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($FF6)");
items.push_back("1 ($FF7)");
items.push_back("2 ($FF8)");
items.push_back("3 ($FF9)");
VList::push_back(items, "0 ($FF6)");
VList::push_back(items, "1 ($FF7)");
VList::push_back(items, "2 ($FF8)");
VList::push_back(items, "3 ($FF9)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

8
src/debugger/gui/CartF6Widget.cxx
View File

@ -47,10 +47,10 @@ CartridgeF6Widget::CartridgeF6Widget(
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($FF6)");
items.push_back("1 ($FF7)");
items.push_back("2 ($FF8)");
items.push_back("3 ($FF9)");
VList::push_back(items, "0 ($FF6)");
VList::push_back(items, "1 ($FF7)");
VList::push_back(items, "2 ($FF8)");
VList::push_back(items, "3 ($FF9)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

4
src/debugger/gui/CartF8SCWidget.cxx
View File

@ -49,8 +49,8 @@ CartridgeF8SCWidget::CartridgeF8SCWidget(
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($FF8)");
items.push_back("1 ($FF9)");
VList::push_back(items, "0 ($FF8)");
VList::push_back(items, "1 ($FF9)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

4
src/debugger/gui/CartF8Widget.cxx
View File

@ -47,8 +47,8 @@ CartridgeF8Widget::CartridgeF8Widget(
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($FF8)");
items.push_back("1 ($FF9)");
VList::push_back(items, "0 ($FF8)");
VList::push_back(items, "1 ($FF9)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

14
src/debugger/gui/CartFA2Widget.cxx
View File

@ -52,14 +52,14 @@ CartridgeFA2Widget::CartridgeFA2Widget(
info.str(), 15) + myLineHeight;
VariantList items;
items.push_back("0 ($FF5)");
items.push_back("1 ($FF6)");
items.push_back("2 ($FF7)");
items.push_back("3 ($FF8)");
items.push_back("4 ($FF9)");
items.push_back("5 ($FFA)");
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)");
if(cart.bankCount() == 7)
items.push_back("6 ($FFB)");
VList::push_back(items, "6 ($FFB)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),

6
src/debugger/gui/CartFAWidget.cxx
View File

@ -49,9 +49,9 @@ CartridgeFAWidget::CartridgeFAWidget(
ypos = addBaseInformation(size, "CBS", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($FF8)");
items.push_back("1 ($FF9)");
items.push_back("2 ($FFA)");
VList::push_back(items, "0 ($FF8)");
VList::push_back(items, "1 ($FF9)");
VList::push_back(items, "2 ($FFA)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

4
src/debugger/gui/CartMCWidget.cxx
View File

@ -51,13 +51,13 @@ CartridgeMCWidget::CartridgeMCWidget(
for(uInt32 i = 0x80; i <= 0xFF; ++i)
{
const string& b = Variant(i).toString();
items.push_back(b + " (ROM)", b);
VList::push_back(items, b + " (ROM)", b);
}
// Add 64 512B 'RAM' blocks
for(uInt32 i = 0x00; i <= 0x3F; ++i)
{
const string& b = Variant(i).toString();
items.push_back(b + " (RAM)", b);
VList::push_back(items, b + " (RAM)", b);
}
const int lwidth = _font.getStringWidth("Set slice for segment X ($3X): "),

2
src/debugger/gui/CartMDMWidget.cxx
View File

@ -45,7 +45,7 @@ CartridgeMDMWidget::CartridgeMDMWidget(
{
info.str("");
info << dec << (i & 0xFF) << " ($" << Common::Base::HEX4 << i << ")";
items.push_back(info.str());
VList::push_back(items, info.str());
}
myBank =

2
src/debugger/gui/CartSBWidget.cxx
View File

@ -49,7 +49,7 @@ CartridgeSBWidget::CartridgeSBWidget(
bank << dec << setw(2) << setfill(' ') << i << " ($" << Common::Base::HEX2
<< spot << ")";
items.push_back(bank.str());
VList::push_back(items, bank.str());
bank.str("");
}

4
src/debugger/gui/CartUAWidget.cxx
View File

@ -48,8 +48,8 @@ CartridgeUAWidget::CartridgeUAWidget(
ypos = addBaseInformation(size, "UA Limited", info.str()) + myLineHeight;
VariantList items;
items.push_back("0 ($220)");
items.push_back("1 ($240)");
VList::push_back(items, "0 ($220)");
VList::push_back(items, "1 ($240)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "),
myLineHeight, items, "Set bank: ",

32
src/debugger/gui/CartX07Widget.cxx
View File

@ -50,22 +50,22 @@ CartridgeX07Widget::CartridgeX07Widget(
info.str()) + myLineHeight;
VariantList items;
items.push_back(" 0");
items.push_back(" 1");
items.push_back(" 2");
items.push_back(" 3");
items.push_back(" 4");
items.push_back(" 5");
items.push_back(" 6");
items.push_back(" 7");
items.push_back(" 8");
items.push_back(" 9");
items.push_back(" 10");
items.push_back(" 11");
items.push_back(" 12");
items.push_back(" 13");
items.push_back(" 14");
items.push_back(" 15");
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");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "),
myLineHeight, items, "Set bank: ",

1
src/debugger/gui/DataGridWidget.hxx
View File

@ -27,7 +27,6 @@ class ScrollBarWidget;
#include "Command.hxx"
#include "Debugger.hxx"
#include "EditableWidget.hxx"
#include "Array.hxx"
#include "Base.hxx"
#include "Rect.hxx"

1
src/debugger/gui/PromptWidget.cxx
View File

@ -28,7 +28,6 @@
#include "Debugger.hxx"
#include "DebuggerDialog.hxx"
#include "DebuggerParser.hxx"
#include "StringList.hxx"
#include "PromptWidget.hxx"
#include "CartDebug.hxx"

1
src/debugger/gui/RamWidget.hxx
View File

@ -27,7 +27,6 @@ class DataGridOpsWidget;
class EditTextWidget;
class StaticTextWidget;
#include "Array.hxx"
#include "Widget.hxx"
#include "Command.hxx"

8
src/debugger/gui/RiotWidget.cxx
View File

@ -176,8 +176,8 @@ RiotWidget::RiotWidget(GuiObject* boss, const GUI::Font& lfont,
xpos = col; ypos += 2 * lineHeight;
int col2_ypos = ypos;
items.clear();
items.push_back("B/easy", "b");
items.push_back("A/hard", "a");
VList::push_back(items, "B/easy", "b");
VList::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();
items.push_back("B&W", "bw");
items.push_back("Color", "color");
VList::push_back(items, "B&W", "bw");
VList::push_back(items, "Color", "color");
myTVType = new PopUpWidget(boss, lfont, xpos, ypos, pwidth, lineHeight, items,
"TV Type: ", lwidth, kTVTypeChanged);
myTVType->setTarget(this);

1
src/debugger/gui/RiotWidget.hxx
View File

@ -27,7 +27,6 @@ class PopUpWidget;
class ToggleBitWidget;
class ControllerWidget;
#include "Array.hxx"
#include "Control.hxx"
#include "Command.hxx"

3
src/debugger/gui/RomListWidget.hxx
View File

@ -25,7 +25,6 @@ class ScrollBarWidget;
class PackedBitArray;
class CheckListWidget;
#include "Array.hxx"
#include "Base.hxx"
#include "CartDebug.hxx"
#include "EditableWidget.hxx"
@ -108,7 +107,7 @@ class RomListWidget : public EditableWidget
const CartDebug::Disassembly* myDisasm;
const PackedBitArray* myBPState;
Common::Array<CheckboxWidget*> myCheckList;
vector<CheckboxWidget*> myCheckList;
};
#endif

1
src/debugger/gui/RomWidget.cxx
View File

@ -27,7 +27,6 @@
#include "DataGridWidget.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx"
#include "StringList.hxx"
#include "ContextMenu.hxx"
#include "RomListWidget.hxx"
#include "RomWidget.hxx"

10
src/debugger/gui/TiaOutputWidget.cxx
View File

@ -45,11 +45,11 @@ TiaOutputWidget::TiaOutputWidget(GuiObject* boss, const GUI::Font& font,
{
// Create context menu for commands
VariantList l;
l.push_back("Fill to scanline", "scanline");
l.push_back("Set breakpoint", "bp");
l.push_back("Set zoom position", "zoom");
l.push_back("Save snapshot", "snap");
l.push_back("Toggle fixed debug colors (from beam pos)", "fixed");
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");
myMenu = new ContextMenu(this, font, l);
}

6
src/debugger/gui/TiaZoomWidget.cxx
View File

@ -55,9 +55,9 @@ TiaZoomWidget::TiaZoomWidget(GuiObject* boss, const GUI::Font& font,
// Create context menu for zoom levels
VariantList l;
l.push_back("2x zoom", "2");
l.push_back("4x zoom", "4");
l.push_back("8x zoom", "8");
VList::push_back(l, "2x zoom", "2");
VList::push_back(l, "4x zoom", "4");
VList::push_back(l, "8x zoom", "8");
myMenu = new ContextMenu(this, font, l);
}

1
src/debugger/gui/ToggleBitWidget.cxx
View File

@ -22,7 +22,6 @@
#include "Dialog.hxx"
#include "Debugger.hxx"
#include "FrameBuffer.hxx"
#include "StringList.hxx"
#include "ToggleBitWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/debugger/gui/ToggleBitWidget.hxx
View File

@ -20,8 +20,6 @@
#ifndef TOGGLE_BIT_WIDGET_HXX
#define TOGGLE_BIT_WIDGET_HXX
class StringList;
#include "ToggleWidget.hxx"
/* ToggleBitWidget */

1
src/debugger/gui/ToggleWidget.hxx
View File

@ -22,7 +22,6 @@
#include "Widget.hxx"
#include "Command.hxx"
#include "Array.hxx"
/* ToggleWidget */
class ToggleWidget : public Widget, public CommandSender

1
src/emucore/Cart.hxx
View File

@ -30,7 +30,6 @@ class CartRamWidget;
class GuiObject;
#include "bspf.hxx"
#include "Array.hxx"
#include "Device.hxx"
#include "Settings.hxx"
#include "Font.hxx"

27
src/emucore/EventHandler.cxx
View File

@ -1532,8 +1532,9 @@ inline bool EventHandler::eventIsAnalog(Event::Type event) const
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventHandler::getActionList(EventMode mode, StringList& l) const
StringList EventHandler::getActionList(EventMode mode) const
{
StringList l;
switch(mode)
{
case kEmulationMode:
@ -1547,28 +1548,33 @@ void EventHandler::getActionList(EventMode mode, StringList& l) const
default:
break;
}
return l;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventHandler::getComboList(EventMode, VariantList& l) const
VariantList EventHandler::getComboList(EventMode /**/) const
{
// For now, this only works in emulation mode
VariantList l;
ostringstream buf;
l.push_back("None", "-1");
VList::push_back(l, "None", "-1");
for(uInt32 i = 0; i < kEmulActionListSize; ++i)
{
if(EventHandler::ourEmulActionList[i].allow_combo)
{
buf << i;
l.push_back(EventHandler::ourEmulActionList[i].action, buf.str());
VList::push_back(l, EventHandler::ourEmulActionList[i].action, buf.str());
buf.str("");
}
}
return l;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventHandler::getComboListForEvent(Event::Type event, StringList& l) const
StringList EventHandler::getComboListForEvent(Event::Type event) const
{
StringList l;
ostringstream buf;
if(event >= Event::Combo1 && event <= Event::Combo16)
{
@ -1591,6 +1597,7 @@ void EventHandler::getComboListForEvent(Event::Type event, StringList& l) const
l.push_back("-1");
}
}
return l;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1727,10 +1734,10 @@ void EventHandler::takeSnapshot(uInt32 number)
ostringstream version;
version << "Stella " << STELLA_VERSION << " (Build " << STELLA_BUILD << ") ["
<< BSPF_ARCH << "]";
comments.push_back("Software", version.str());
comments.push_back("ROM Name", myOSystem.console().properties().get(Cartridge_Name));
comments.push_back("ROM MD5", myOSystem.console().properties().get(Cartridge_MD5));
comments.push_back("TV Effects", myOSystem.frameBuffer().tiaSurface().effectsInfo());
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());
// Now create a PNG snapshot
if(myOSystem.settings().getBool("ss1x"))

12
src/emucore/EventHandler.hxx
View File

@ -27,12 +27,10 @@ class OSystem;
class DialogContainer;
class EventMappingWidget;
class MouseControl;
class VariantList;
#include "Array.hxx"
#include "Event.hxx"
#include "StellaKeys.hxx"
#include "StringList.hxx"
#include "Variant.hxx"
#include "bspf.hxx"
enum MouseButton {
@ -210,11 +208,11 @@ class EventHandler
bool frying() const { return myFryingFlag; }
void getActionList(EventMode mode, StringList& list) const;
void getComboList(EventMode mode, VariantList& map) const;
StringList getActionList(EventMode mode) const;
VariantList getComboList(EventMode mode) const;
/** Used to access the list of events assigned to a specific combo event. */
void getComboListForEvent(Event::Type event, StringList& list) const;
StringList getComboListForEvent(Event::Type event) const;
void setComboListForEvent(Event::Type event, const StringList& events);
Event::Type eventForKey(StellaKey key, EventMode mode) const
@ -462,7 +460,7 @@ class EventHandler
map<string,StickInfo> myDatabase;
// Contains only joysticks that are currently available, indexed by id
Common::Array<StellaJoystick*> mySticks;
vector<StellaJoystick*> mySticks;
void setStickDefaultMapping(int stick, Event::Type type, EventMode mode);
void printDatabase() const;

3
src/emucore/EventJoyHandler.cxx
View File

@ -22,6 +22,7 @@
#include "OSystem.hxx"
#include "Settings.hxx"
#include "Vec.hxx"
#include "bspf.hxx"
#include "EventHandler.hxx"
@ -325,7 +326,7 @@ int EventHandler::JoystickHandler::add(StellaJoystick* stick)
}
stick->type = StellaJoystick::JT_REGULAR;
}
mySticks.insertAt(stick->ID, stick);
Vec::insertAt(mySticks, stick->ID, stick);
// Map the stelladaptors we've found according to the specified ports
if(specialAdaptor)

5
src/emucore/FSNode.hxx
View File

@ -48,7 +48,6 @@
*/
#include "bspf.hxx"
#include "Array.hxx"
class FilesystemNode;
class AbstractFSNode;
@ -58,7 +57,7 @@ class AbstractFSNode;
* This is subclass instead of just a typedef so that we can use forward
* declarations of it in other places.
*/
class FSList : public Common::Array<FilesystemNode> { };
class FSList : public vector<FilesystemNode> { };
/**
* This class acts as a wrapper around the AbstractFSNode class defined
@ -264,7 +263,7 @@ class FilesystemNode
* the semantics.
*/
typedef Common::Array<AbstractFSNode *> AbstractFSList;
typedef vector<AbstractFSNode*> AbstractFSList;
class AbstractFSNode
{

2
src/emucore/FrameBuffer.cxx
View File

@ -136,7 +136,7 @@ bool FrameBuffer::initialize()
{
ostringstream desc;
desc << "Zoom " << zoom << "x";
myTIAZoomLevels.push_back(desc.str(), zoom);
VList::push_back(myTIAZoomLevels, desc.str(), zoom);
}
// Set palette for GUI (upper area of array, doesn't change during execution)

10
src/emucore/FrameBuffer.hxx
View File

@ -367,7 +367,7 @@ class FrameBuffer
This method is called to query and initialize the video hardware
for desktop and fullscreen resolution information.
*/
virtual void queryHardware(Common::Array<GUI::Size>& mons, VariantList& ren) = 0;
virtual void queryHardware(vector<GUI::Size>& mons, VariantList& ren) = 0;
virtual Int32 getCurrentDisplayIndex() = 0;
@ -494,14 +494,14 @@ class FrameBuffer
friend ostream& operator<<(ostream& os, const VideoModeList& l)
{
for(Common::Array<VideoMode>::const_iterator i = l.myModeList.begin();
for(vector<VideoMode>::const_iterator i = l.myModeList.begin();
i != l.myModeList.end(); ++i)
os << "-----\n" << *i << endl << "-----\n";
return os;
}
private:
Common::Array<VideoMode> myModeList;
vector<VideoMode> myModeList;
int myIdx;
};
@ -527,7 +527,7 @@ class FrameBuffer
// The resolution of the attached displays
// The primary display is first in the array
Common::Array<GUI::Size> myDisplays;
vector<GUI::Size> myDisplays;
// Supported renderers
VariantList myRenderers;
@ -564,7 +564,7 @@ class FrameBuffer
// The list of all available video modes for this framebuffer
VideoModeList* myCurrentModeList;
VideoModeList myWindowedModeList;
Common::Array<VideoModeList> myFullscreenModeLists;
vector<VideoModeList> myFullscreenModeLists;
// Names of the TIA zoom levels that can be used for this framebuffer
VariantList myTIAZoomLevels;

5
src/emucore/M6502.cxx
View File

@ -43,6 +43,7 @@
#define DISASM_NONE 0
#endif
#include "Settings.hxx"
#include "Vec.hxx"
#include "M6502.hxx"
@ -444,8 +445,8 @@ void M6502::delCondBreak(uInt32 brk)
if(brk < myBreakConds.size())
{
delete myBreakConds[brk];
myBreakConds.removeAt(brk);
myBreakCondNames.removeAt(brk);
Vec::removeAt(myBreakConds, brk);
Vec::removeAt(myBreakCondNames, brk);
}
}

4
src/emucore/M6502.hxx
View File

@ -29,11 +29,9 @@ class Settings;
#include "bspf.hxx"
#include "System.hxx"
#include "Array.hxx"
#include "StringList.hxx"
#include "Serializable.hxx"
typedef Common::Array<Expression*> ExpressionList;
typedef vector<Expression*> ExpressionList;
/**
The 6502 is an 8-bit microprocessor that has a 64K addressing space.

1
src/emucore/OSystem.hxx
View File

@ -36,7 +36,6 @@ class Sound;
class StateManager;
class VideoDialog;
#include "Array.hxx"
#include "FSNode.hxx"
#include "FrameBuffer.hxx"
#include "PNGLibrary.hxx"

3
src/emucore/Settings.hxx
View File

@ -22,7 +22,6 @@
class OSystem;
#include "Array.hxx"
#include "Variant.hxx"
#include "bspf.hxx"
@ -129,7 +128,7 @@ class Settings
Variant value;
Variant initialValue;
};
typedef Common::Array<Setting> SettingsArray;
typedef vector<Setting> SettingsArray;
const SettingsArray& getInternalSettings() const
{ return myInternalSettings; }

6
src/gui/AboutDialog.hxx
View File

@ -20,8 +20,6 @@
#ifndef ABOUT_DIALOG_HXX
#define ABOUT_DIALOG_HXX
#include "Array.hxx"
class OSystem;
class DialogContainer;
class CommandSender;
@ -41,8 +39,8 @@ class AboutDialog : public Dialog
ButtonWidget* myPrevButton;
StaticTextWidget* myTitle;
Common::Array<StaticTextWidget*> myDesc;
Common::Array<string> myDescStr;
vector<StaticTextWidget*> myDesc;
vector<string> myDescStr;
int myPage;
int myNumPages;

23
src/gui/AudioDialog.cxx
View File

@ -27,7 +27,6 @@
#include "Menu.hxx"
#include "OSystem.hxx"
#include "PopUpWidget.hxx"
#include "StringList.hxx"
#include "Settings.hxx"
#include "Sound.hxx"
#include "Widget.hxx"
@ -71,12 +70,12 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
// Fragment size
items.clear();
items.push_back("128 bytes", "128");
items.push_back("256 bytes", "256");
items.push_back("512 bytes", "512");
items.push_back("1 KB", "1024");
items.push_back("2 KB", "2048");
items.push_back("4 KB", "4096");
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");
myFragsizePopup = new PopUpWidget(this, font, xpos, ypos,
pwidth + myVolumeLabel->getWidth() - 4, lineHeight,
items, "Sample size (*): ", lwidth);
@ -85,11 +84,11 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
// Output frequency
items.clear();
items.push_back("11025 Hz", "11025");
items.push_back("22050 Hz", "22050");
items.push_back("31400 Hz", "31400");
items.push_back("44100 Hz", "44100");
items.push_back("48000 Hz", "48000");
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");
myFreqPopup = new PopUpWidget(this, font, xpos, ypos,
pwidth + myVolumeLabel->getWidth() - 4, lineHeight,
items, "Frequency (*): ", lwidth);

2
src/gui/CheckListWidget.hxx
View File

@ -24,7 +24,7 @@ class CheckboxWidget;
#include "ListWidget.hxx"
typedef Common::Array<CheckboxWidget*> CheckboxArray;
typedef vector<CheckboxWidget*> CheckboxArray;
/** CheckListWidget */

4
src/gui/ComboDialog.cxx
View File

@ -28,7 +28,6 @@
#include "OSystem.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx"
#include "StringList.hxx"
#include "Widget.hxx"
#include "ComboDialog.hxx"
@ -111,8 +110,7 @@ void ComboDialog::show(Event::Type event, const string& name)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ComboDialog::loadConfig()
{
StringList events;
instance().eventHandler().getComboListForEvent(myComboEvent, events);
StringList events = instance().eventHandler().getComboListForEvent(myComboEvent);
int size = BSPF_min((int)events.size(), 8);
for(int i = 0; i < size; ++i)

1
src/gui/ComboDialog.hxx
View File

@ -23,7 +23,6 @@
class PopUpWidget;
class EditTextWidget;
class StaticTextWidget;
class VariantList;
class OSystem;
#include "Dialog.hxx"

13
src/gui/Dialog.cxx
View File

@ -26,6 +26,7 @@
#include "Dialog.hxx"
#include "Widget.hxx"
#include "TabWidget.hxx"
#include "Vec.hxx"
/*
* TODO list
@ -150,7 +151,7 @@ void Dialog::addToFocusList(WidgetArray& list)
for(uInt32 i = 0; i < list.size(); ++i)
list[i]->setFlags(WIDGET_RETAIN_FOCUS);
_myFocus.list.append(list);
Vec::append(_myFocus.list, list);
_focusList = _myFocus.list;
if(list.size() > 0)
@ -176,14 +177,14 @@ void Dialog::addToFocusList(WidgetArray& list, TabWidget* w, int tabId)
// Now insert in the correct place in that focus list
uInt32 id = tabId;
if(id < focus.size())
focus[id].list.append(list);
Vec::append(focus[id].list, list);
else
{
// Make sure the array is large enough
while(focus.size() <= id)
focus.push_back(Focus());
focus[id].list.append(list);
Vec::append(focus[id].list, list);
}
if(list.size() > 0)
@ -245,13 +246,13 @@ void Dialog::buildCurrentFocusList(int tabID)
_myTabList[id].appendFocusList(_focusList);
// Add remaining items from main focus list
_focusList.append(_myFocus.list);
Vec::append(_focusList, _myFocus.list);
// Add button group at end of current focus list
// We do it this way for TabWidget, so that buttons are scanned
// *after* the widgets in the current tab
if(_buttonGroup.size() > 0)
_focusList.append(_buttonGroup);
Vec::append(_focusList, _buttonGroup);
// Finally, the moment we've all been waiting for :)
// Set the actual focus widget
@ -727,7 +728,7 @@ void Dialog::TabFocus::appendFocusList(WidgetArray& list)
int active = widget->getActiveTab();
if(active >= 0 && active < (int)focus.size())
list.append(focus[active].list);
Vec::append(list, focus[active].list);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/gui/Dialog.hxx
View File

@ -134,7 +134,7 @@ class Dialog : public GuiObject
Focus(Widget* w = 0);
virtual ~Focus();
};
typedef Common::Array<Focus> FocusList;
typedef vector<Focus> FocusList;
struct TabFocus {
TabWidget* widget;
@ -148,7 +148,7 @@ class Dialog : public GuiObject
void saveCurrentFocus(Widget* w);
Widget* getNewFocus();
};
typedef Common::Array<TabFocus> TabFocusList;
typedef vector<TabFocus> TabFocusList;
Focus _myFocus; // focus for base dialog
TabFocusList _myTabList; // focus for each tab (if any)

3
src/gui/EventMappingWidget.cxx
View File

@ -94,8 +94,7 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
myComboButton->setTarget(this);
addFocusWidget(myComboButton);
VariantList combolist;
instance().eventHandler().getComboList(mode, combolist);
VariantList combolist = instance().eventHandler().getComboList(mode);
myComboDialog = new ComboDialog(boss, font, combolist);
}
else

97
src/gui/GameInfoDialog.cxx
View File

@ -27,7 +27,6 @@
#include "PopUpWidget.hxx"
#include "Props.hxx"
#include "PropsSet.hxx"
#include "StringList.hxx"
#include "TabWidget.hxx"
#include "Widget.hxx"
@ -116,8 +115,8 @@ GameInfoDialog::GameInfoDialog(
"Sound:", kTextAlignLeft);
pwidth = font.getStringWidth("Stereo");
items.clear();
items.push_back("Mono", "MONO");
items.push_back("Stereo", "STEREO");
VList::push_back(items, "Mono", "MONO");
VList::push_back(items, "Stereo", "STEREO");
mySound = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(mySound);
@ -128,7 +127,7 @@ GameInfoDialog::GameInfoDialog(
pwidth = font.getStringWidth("CM (SpectraVideo CompuMate)");
items.clear();
for(int i = 0; i < Cartridge::ourNumBSTypes; ++i)
items.push_back(Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type);
VList::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);
@ -147,8 +146,8 @@ GameInfoDialog::GameInfoDialog(
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"Left Difficulty:", kTextAlignLeft);
items.clear();
items.push_back("B", "B");
items.push_back("A", "A");
VList::push_back(items, "B", "B");
VList::push_back(items, "A", "A");
myLeftDiff = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(myLeftDiff);
@ -165,8 +164,8 @@ GameInfoDialog::GameInfoDialog(
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"TV Type:", kTextAlignLeft);
items.clear();
items.push_back("Color", "COLOR");
items.push_back("B & W", "BW");
VList::push_back(items, "Color", "COLOR");
VList::push_back(items, "B & W", "BW");
myTVType = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(myTVType);
@ -185,23 +184,23 @@ GameInfoDialog::GameInfoDialog(
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"P0 Controller:", kTextAlignLeft);
ctrls.clear();
ctrls.push_back("Joystick", "JOYSTICK" );
ctrls.push_back("Paddles", "PADDLES" );
ctrls.push_back("Paddles_IAxis", "PADDLES_IAXIS");
ctrls.push_back("Paddles_IDir", "PADDLES_IDIR" );
ctrls.push_back("Paddles_IAxDr", "PADDLES_IAXDR");
ctrls.push_back("BoosterGrip", "BOOSTERGRIP" );
ctrls.push_back("Driving", "DRIVING" );
ctrls.push_back("Keyboard", "KEYBOARD" );
ctrls.push_back("CX-22 Trakball", "TRACKBALL22" );
ctrls.push_back("CX-80 Mouse", "TRACKBALL80" );
ctrls.push_back("AmigaMouse", "AMIGAMOUSE" );
ctrls.push_back("AtariVox", "ATARIVOX" );
ctrls.push_back("SaveKey", "SAVEKEY" );
ctrls.push_back("Sega Genesis", "GENESIS" );
ctrls.push_back("CompuMate", "COMPUMATE" );
// ctrls.push_back("KidVid", "KIDVID" );
ctrls.push_back("MindLink", "MINDLINK" );
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" );
myP0Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, ctrls, "", 0, 0);
wid.push_back(myP0Controller);
@ -212,8 +211,8 @@ GameInfoDialog::GameInfoDialog(
xpos += font.getStringWidth("in ");
pwidth = font.getStringWidth("right port");
ports.clear();
ports.push_back("left port", "L");
ports.push_back("right port", "R");
VList::push_back(ports, "left port", "L");
VList::push_back(ports, "right port", "R");
myLeftPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
ports, "", 0, kLeftCChanged);
wid.push_back(myLeftPort);
@ -240,8 +239,8 @@ GameInfoDialog::GameInfoDialog(
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"Swap Paddles:", kTextAlignLeft);
items.clear();
items.push_back("Yes", "YES");
items.push_back("No", "NO");
VList::push_back(items, "Yes", "YES");
VList::push_back(items, "No", "NO");
mySwapPaddles = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(mySwapPaddles);
@ -250,8 +249,8 @@ GameInfoDialog::GameInfoDialog(
lwidth = font.getStringWidth("Mouse axis mode: ");
pwidth = font.getStringWidth("Specific axis");
items.clear();
items.push_back("Automatic", "auto");
items.push_back("Specific axis", "specific");
VList::push_back(items, "Automatic", "auto");
VList::push_back(items, "Specific axis", "specific");
myMouseControl =
new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items,
"Mouse axis mode: ", lwidth, kMCtrlChanged);
@ -261,15 +260,15 @@ GameInfoDialog::GameInfoDialog(
lwidth = font.getStringWidth("X-Axis is: ");
pwidth = font.getStringWidth("MindLink 0");
items.clear();
items.push_back("None", MouseControl::NoControl);
items.push_back("Paddle 0", MouseControl::Paddle0);
items.push_back("Paddle 1", MouseControl::Paddle1);
items.push_back("Paddle 2", MouseControl::Paddle2);
items.push_back("Paddle 3", MouseControl::Paddle3);
items.push_back("Driving 0", MouseControl::Driving0);
items.push_back("Driving 1", MouseControl::Driving1);
items.push_back("MindLink 0", MouseControl::MindLink0);
items.push_back("MindLink 1", MouseControl::MindLink1);
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);
xpos = 45; ypos += lineHeight + 4;
myMouseX = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items,
@ -295,13 +294,13 @@ GameInfoDialog::GameInfoDialog(
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"Format:", kTextAlignLeft);
items.clear();
items.push_back("Auto-detect", "AUTO");
items.push_back("NTSC", "NTSC");
items.push_back("PAL", "PAL");
items.push_back("SECAM", "SECAM");
items.push_back("NTSC50", "NTSC50");
items.push_back("PAL60", "PAL60");
items.push_back("SECAM60", "SECAM60");
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");
myFormat = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(myFormat);
@ -325,8 +324,8 @@ GameInfoDialog::GameInfoDialog(
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"Use Phosphor:", kTextAlignLeft);
items.clear();
items.push_back("Yes", "YES");
items.push_back("No", "NO");
VList::push_back(items, "Yes", "YES");
VList::push_back(items, "No", "NO");
myPhosphor = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth,
lineHeight, items, "", 0, kPhosphorChanged);
wid.push_back(myPhosphor);

19
src/gui/GlobalPropsDialog.cxx
View File

@ -25,7 +25,6 @@
#include "OSystem.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "StringList.hxx"
#include "Widget.hxx"
#include "LauncherDialog.hxx"
@ -59,7 +58,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
"Bankswitch type:", kTextAlignLeft);
items.clear();
for(int i = 0; i < Cartridge::ourNumBSTypes; ++i)
items.push_back(Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type);
VList::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);
@ -70,9 +69,9 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight,
"Left Difficulty:", kTextAlignLeft);
items.clear();
items.push_back("Default", "DEFAULT");
items.push_back("B", "B");
items.push_back("A", "A");
VList::push_back(items, "Default", "DEFAULT");
VList::push_back(items, "B", "B");
VList::push_back(items, "A", "A");
myLeftDiff = new PopUpWidget(this, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(myLeftDiff);
@ -91,9 +90,9 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight,
"TV Type:", kTextAlignLeft);
items.clear();
items.push_back("Default", "DEFAULT");
items.push_back("Color", "COLOR");
items.push_back("B & W", "BW");
VList::push_back(items, "Default", "DEFAULT");
VList::push_back(items, "Color", "COLOR");
VList::push_back(items, "B & W", "BW");
myTVType = new PopUpWidget(this, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(myTVType);
@ -103,8 +102,8 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight,
"Startup Mode:", kTextAlignLeft);
items.clear();
items.push_back("Console", "false");
items.push_back("Debugger", "true");
VList::push_back(items, "Console", "false");
VList::push_back(items, "Debugger", "true");
myDebug = new PopUpWidget(this, font, xpos+lwidth, ypos,
pwidth, lineHeight, items, "", 0, 0);
wid.push_back(myDebug);

3
src/gui/GuiObject.hxx
View File

@ -29,9 +29,8 @@ class Widget;
#include "Command.hxx"
#include "OSystem.hxx"
#include "Array.hxx"
typedef Common::Array<Widget*> WidgetArray;
typedef vector<Widget*> WidgetArray;
// The commands generated by various widgets
enum {

17
src/gui/InputDialog.cxx
View File

@ -19,12 +19,10 @@
#include "bspf.hxx"
#include "Array.hxx"
#include "OSystem.hxx"
#include "Joystick.hxx"
#include "Paddles.hxx"
#include "Settings.hxx"
#include "StringList.hxx"
#include "EventMappingWidget.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx"
@ -59,7 +57,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
// 1) Event mapper for emulation actions
tabID = myTab->addTab("Emul. Events");
instance().eventHandler().getActionList(kEmulationMode, actions);
actions = instance().eventHandler().getActionList(kEmulationMode);
myEmulEventMapper = new EventMappingWidget(myTab, font, 2, 2,
myTab->getWidth(),
myTab->getHeight() - ypos,
@ -69,8 +67,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
// 2) Event mapper for UI actions
tabID = myTab->addTab("UI Events");
actions.clear();
instance().eventHandler().getActionList(kMenuMode, actions);
actions = instance().eventHandler().getActionList(kMenuMode);
myMenuEventMapper = new EventMappingWidget(myTab, font, 2, 2,
myTab->getWidth(),
myTab->getHeight() - ypos,
@ -119,8 +116,8 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
pwidth = font.getStringWidth("Analog devices");
items.clear();
items.push_back("Left / Right", "lr");
items.push_back("Right / Left", "rl");
VList::push_back(items, "Left / Right", "lr");
VList::push_back(items, "Right / Left", "rl");
mySAPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items,
"Stelladaptor port order: ", lwidth);
wid.push_back(mySAPort);
@ -128,9 +125,9 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
// Use mouse as controller
ypos += lineHeight + 5;
items.clear();
items.push_back("Always", "always");
items.push_back("Analog devices", "analog");
items.push_back("Never", "never");
VList::push_back(items, "Always", "always");
VList::push_back(items, "Analog devices", "analog");
VList::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);

2
src/gui/InputTextDialog.hxx
View File

@ -59,7 +59,7 @@ class InputTextDialog : public Dialog, public CommandSender
void handleCommand(CommandSender* sender, int cmd, int data, int id);
private:
typedef Common::Array<EditTextWidget*> InputWidget;
typedef vector<EditTextWidget*> InputWidget;
InputWidget myInput;
StaticTextWidget* myTitle;

7
src/gui/LauncherDialog.cxx
View File

@ -38,7 +38,6 @@
#include "PropsSet.hxx"
#include "RomInfoWidget.hxx"
#include "Settings.hxx"
#include "StringList.hxx"
#include "StringListWidget.hxx"
#include "Widget.hxx"
@ -180,9 +179,9 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
// Create context menu for ROM list options
VariantList l;
l.push_back("Power-on options", "override");
l.push_back("Filter listing", "filter");
l.push_back("Reload listing", "reload");
VList::push_back(l, "Power-on options", "override");
VList::push_back(l, "Filter listing", "filter");
VList::push_back(l, "Reload listing", "reload");
myMenu = new ContextMenu(this, osystem.frameBuffer().font(), l);
// Create global props dialog, which is used to temporarily overrride

1
src/gui/LauncherDialog.hxx
View File

@ -40,7 +40,6 @@ class StringListWidget;
#include "Dialog.hxx"
#include "FSNode.hxx"
#include "StringList.hxx"
#include "Stack.hxx"
#include "MessageBox.hxx"

8
src/gui/LauncherFilterDialog.cxx
View File

@ -27,7 +27,6 @@
#include "OSystem.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "StringList.hxx"
#include "Widget.hxx"
#include "LauncherDialog.hxx"
@ -53,10 +52,9 @@ LauncherFilterDialog::LauncherFilterDialog(GuiObject* boss, const GUI::Font& fon
xpos = 10; ypos = 10;
// Types of files to show
items.clear();
items.push_back("All files", "allfiles");
items.push_back("All roms", "allroms");
items.push_back("ROMs ending with", "__EXTS");
VList::push_back(items, "All files", "allfiles");
VList::push_back(items, "All roms", "allroms");
VList::push_back(items, "ROMs ending with", "__EXTS");
myFileType =
new PopUpWidget(this, font, xpos, ypos, pwidth, lineHeight, items,
"Show: ", lwidth, kFileTypeChanged);

1
src/gui/LauncherFilterDialog.hxx
View File

@ -25,7 +25,6 @@ class DialogContainer;
class CheckboxWidget;
class PopUpWidget;
class OSystem;
class StringList;
#include "Dialog.hxx"
#include "FSNode.hxx"

1
src/gui/ListWidget.hxx
View File

@ -21,7 +21,6 @@
#define LIST_WIDGET_HXX
class GuiObject;
class StringList;
#include "Widget.hxx"
#include "Command.hxx"

7
src/gui/LoggerDialog.cxx
View File

@ -64,10 +64,9 @@ LoggerDialog::LoggerDialog(OSystem& osystem, DialogContainer& parent,
// Level of logging (how much info to print)
xpos += 20;
VariantList items;
items.clear();
items.push_back("None", "0");
items.push_back("Basic", "1");
items.push_back("Verbose", "2");
VList::push_back(items, "None", "0");
VList::push_back(items, "Basic", "1");
VList::push_back(items, "Verbose", "2");
myLogLevel =
new PopUpWidget(this, font, xpos, ypos, font.getStringWidth("Verbose"),
lineHeight, items, "Log level: ",

2
src/gui/PopUpWidget.hxx
View File

@ -24,10 +24,8 @@ class GUIObject;
#include "bspf.hxx"
#include "Array.hxx"
#include "Command.hxx"
#include "ContextMenu.hxx"
#include "StringList.hxx"
#include "Widget.hxx"

1
src/gui/RomInfoWidget.hxx
View File

@ -25,7 +25,6 @@
#include "Props.hxx"
#include "Widget.hxx"
#include "Command.hxx"
#include "StringList.hxx"
#include "Rect.hxx"
#include "bspf.hxx"

24
src/gui/SnapshotDialog.cxx
View File

@ -74,8 +74,8 @@ SnapshotDialog::SnapshotDialog(
lwidth = font.getStringWidth("Continuous snapshot interval: ");
fwidth = font.getStringWidth("internal database");
VariantList items;
items.push_back("actual ROM name", "rom");
items.push_back("internal database", "int");
VList::push_back(items, "actual ROM name", "rom");
VList::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();
items.push_back("1 second", "1");
items.push_back("2 seconds", "2");
items.push_back("3 seconds", "3");
items.push_back("4 seconds", "4");
items.push_back("5 seconds", "5");
items.push_back("6 seconds", "6");
items.push_back("7 seconds", "7");
items.push_back("8 seconds", "8");
items.push_back("9 seconds", "9");
items.push_back("10 seconds", "10");
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");
ypos += buttonHeight;
mySnapInterval =
new PopUpWidget(this, font, xpos, ypos, fwidth, lineHeight, items,

Some files were not shown because too many files have changed in this diff Show More