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

Use BSPF-defined datatypes where appropriate. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3083 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-17 14:17:19 +00:00
parent d5a470cbcc
commit 3a04afcf96
25 changed files with 99 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cheat/CheatCodeDialog.cxx
View File

@ -131,7 +131,7 @@ void CheatCodeDialog::saveConfig()
{
// Inspect checkboxes for enable/disable codes
const CheatList& list = instance().cheat().list();
for(unsigned int i = 0; i < myCheatList->getList().size(); ++i)
for(uInt32 i = 0; i < myCheatList->getList().size(); ++i)
{
if(myCheatList->getState(i))
list[i]->enable();

10
src/cheat/CheatManager.cxx
View File

@ -47,7 +47,7 @@ bool CheatManager::add(const string& name, const string& code,
return false;
// Delete duplicate entries
for(unsigned int i = 0; i < myCheatList.size(); i++)
for(uInt32 i = 0; i < myCheatList.size(); i++)
{
if(myCheatList[i]->name() == name || myCheatList[i]->code() == code)
{
@ -74,7 +74,7 @@ bool CheatManager::add(const string& name, const string& code,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CheatManager::remove(int idx)
{
if((unsigned int)idx < myCheatList.size())
if((uInt32)idx < myCheatList.size())
{
// This will also remove it from the per-frame list (if applicable)
myCheatList[idx]->disable();
@ -89,7 +89,7 @@ void CheatManager::addPerFrame(const string& name, const string& code, bool enab
{
// The actual cheat will always be in the main list; we look there first
shared_ptr<Cheat> cheat;
for(unsigned int i = 0; i < myCheatList.size(); i++)
for(uInt32 i = 0; i < myCheatList.size(); i++)
{
if(myCheatList[i]->name() == name || myCheatList[i]->code() == code)
{
@ -100,7 +100,7 @@ void CheatManager::addPerFrame(const string& name, const string& code, bool enab
// Make sure there are no duplicates
bool found = false;
unsigned int i;
uInt32 i;
for(i = 0; i < myPerFrameList.size(); i++)
{
if(myPerFrameList[i]->code() == cheat->code())
@ -309,7 +309,7 @@ void CheatManager::loadCheats(const string& md5sum)
void CheatManager::saveCheats(const string& md5sum)
{
ostringstream cheats;
for(unsigned int i = 0; i < myCheatList.size(); i++)
for(uInt32 i = 0; i < myCheatList.size(); i++)
{
cheats << myCheatList[i]->name() << ":"
<< myCheatList[i]->code() << ":"

2
src/common/FrameBufferSDL2.cxx
View File

@ -300,7 +300,7 @@ void FrameBufferSDL2::setWindowIcon()
for(uInt32 i = 0; i < ncols; i++)
{
unsigned char code;
uInt8 code;
char color[32];
uInt32 col;

6
src/common/Variant.hxx
View File

@ -49,8 +49,8 @@ class Variant
Variant(const string& s) : data(s) { }
Variant(const char* s) : data(s) { }
Variant(int i) { buf().str(""); buf() << i; data = buf().str(); }
Variant(unsigned int i) { buf().str(""); buf() << i; data = buf().str(); }
Variant(Int32 i) { buf().str(""); buf() << i; data = buf().str(); }
Variant(uInt32 i) { buf().str(""); buf() << i; data = buf().str(); }
Variant(float f) { buf().str(""); buf() << f; data = buf().str(); }
Variant(double d) { buf().str(""); buf() << d; data = buf().str(); }
Variant(bool b) { buf().str(""); buf() << b; data = buf().str(); }
@ -59,7 +59,7 @@ class Variant
// Conversion methods
const string& toString() const { return data; }
const char* toCString() const { return data.c_str(); }
const int toInt() const { return atoi(data.c_str()); }
const Int32 toInt() const { return atoi(data.c_str()); }
const float toFloat() const { return atof(data.c_str()); }
const bool toBool() const { return data == "1" || data == "true"; }
const GUI::Size toSize() const { return GUI::Size(data); }

2
src/debugger/DebuggerParser.cxx
View File

@ -290,7 +290,7 @@ int DebuggerParser::decipher_arg(const string& str)
string DebuggerParser::showWatches()
{
ostringstream buf;
for(unsigned int i = 0; i < watches.size(); i++)
for(uInt32 i = 0; i < watches.size(); i++)
{
if(watches[i] != "")
{

2
src/debugger/TIADebug.cxx
View File

@ -326,7 +326,7 @@ bool TIADebug::priorityPF(int newVal)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIADebug::collision(int collID, int newVal)
{
unsigned int mask = 1 << collID;
uInt32 mask = 1 << collID;
if(newVal > -1)
{

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

@ -108,7 +108,7 @@ void AudioWidget::loadConfig()
// AUDF0/1
alist.clear(); vlist.clear(); changed.clear();
for(unsigned int i = 0; i < 2; i++)
for(uInt32 i = 0; i < 2; i++)
{
alist.push_back(i);
vlist.push_back(state.aud[i]);
@ -118,7 +118,7 @@ void AudioWidget::loadConfig()
// AUDC0/1
alist.clear(); vlist.clear(); changed.clear();
for(unsigned int i = 2; i < 4; i++)
for(uInt32 i = 2; i < 4; i++)
{
alist.push_back(i-2);
vlist.push_back(state.aud[i]);
@ -128,7 +128,7 @@ void AudioWidget::loadConfig()
// AUDV0/1
alist.clear(); vlist.clear(); changed.clear();
for(unsigned int i = 4; i < 6; i++)
for(uInt32 i = 4; i < 6; i++)
{
alist.push_back(i-4);
vlist.push_back(state.aud[i]);

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

@ -299,7 +299,7 @@ void CpuWidget::loadConfig()
// Update the PS register booleans
changed.clear();
for(unsigned int i = 0; i < state.PSbits.size(); ++i)
for(uInt32 i = 0; i < state.PSbits.size(); ++i)
changed.push_back(state.PSbits[i] != oldstate.PSbits[i]);
myPSRegister->setState(state.PSbits, changed);

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

@ -428,7 +428,7 @@ string RamWidget::doCompare(const string& str)
for(uInt32 i = 0; i < state.rport.size(); ++i)
mySearchState.push_back(false);
for(unsigned int i = 0; i < mySearchAddr.size(); ++i)
for(uInt32 i = 0; i < mySearchAddr.size(); ++i)
{
if(comparitiveSearch)
{

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

@ -254,7 +254,7 @@ void RiotWidget::loadConfig()
{
#define IO_REGS_UPDATE(bits, s_bits) \
changed.clear(); \
for(unsigned int i = 0; i < state.s_bits.size(); ++i) \
for(uInt32 i = 0; i < state.s_bits.size(); ++i) \
changed.push_back(state.s_bits[i] != oldstate.s_bits[i]); \
bits->setState(state.s_bits, changed);

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

@ -99,10 +99,10 @@ TiaWidget::TiaWidget(GuiObject* boss, const GUI::Font& lfont,
// Finally, add all 15 collision bits
xpos += 2 * fontWidth + 5;
unsigned int collX = xpos, collY = ypos, idx = 0;
for(unsigned int row = 0; row < 5; ++row)
uInt32 collX = xpos, collY = ypos, idx = 0;
for(uInt32 row = 0; row < 5; ++row)
{
for(unsigned int col = 0; col < 5 - row; ++col)
for(uInt32 col = 0; col < 5 - row; ++col)
{
myCollision[idx] = new CheckboxWidget(boss, lfont, collX, collY,
"", kCheckActionCmd);
@ -124,7 +124,7 @@ TiaWidget::TiaWidget(GuiObject* boss, const GUI::Font& lfont,
// Strobe buttons
////////////////////////////
ButtonWidget* b;
unsigned int buttonX, buttonY, buttonW;
uInt32 buttonX, buttonY, buttonW;
buttonX = collX + 20*fontWidth; buttonY = ypos;
buttonW = 7 * fontWidth;
b = new ButtonWidget(boss, lfont, buttonX, buttonY, buttonW, lineHeight,
@ -814,7 +814,7 @@ void TiaWidget::loadConfig()
// Color registers
alist.clear(); vlist.clear(); changed.clear();
for(unsigned int i = 0; i < 4; i++)
for(uInt32 i = 0; i < 4; i++)
{
alist.push_back(i);
vlist.push_back(state.coluRegs[i]);

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

@ -60,7 +60,7 @@ void TogglePixelWidget::setState(const BoolArray& state)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TogglePixelWidget::setIntState(int value, bool swap)
{
unsigned int size = _rows * _cols;
uInt32 size = _rows * _cols;
_swapBits = swap;
// Create array of required size
@ -76,7 +76,7 @@ void TogglePixelWidget::setIntState(int value, bool swap)
//
// Swap on means reverse of swap off! Sorry if this is
// confusing.
for(unsigned int i = 0; i < size; ++i)
for(uInt32 i = 0; i < size; ++i)
{
bool bitIsSet = value & (1 << i);
if(_swapBits)
@ -92,9 +92,9 @@ void TogglePixelWidget::setIntState(int value, bool swap)
int TogglePixelWidget::getIntState()
{
// Construct int based on current state and swap
unsigned int value = 0, size = (int)_stateList.size();
uInt32 value = 0, size = (int)_stateList.size();
for(unsigned int i = 0; i < size; ++i)
for(uInt32 i = 0; i < size; ++i)
{
if(_stateList[i])
{

4
src/emucore/FBSurface.cxx
View File

@ -185,7 +185,7 @@ void FBSurface::frameRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h,
break;
case kDashLine:
unsigned int i, skip, lwidth = 1;
uInt32 i, skip, lwidth = 1;
for(i = x, skip = 1; i < x+w-1; i=i+lwidth+1, ++skip)
{
@ -214,7 +214,7 @@ void FBSurface::drawString(const GUI::Font& font, const string& s,
int deltax, bool useEllipsis)
{
const int leftX = x, rightX = x + w;
unsigned int i;
uInt32 i;
int width = font.getStringWidth(s);
string str;

94
src/emucore/MD5.cxx
View File

@ -46,16 +46,14 @@
*/
// Setup the types used by the MD5 routines
typedef unsigned char* POINTER;
typedef uInt16 UINT2;
typedef uInt32 UINT4;
typedef uInt8* POINTER;
// MD5 context.
typedef struct
{
UINT4 state[4]; /* state (ABCD) */
UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */
uInt32 state[4]; /* state (ABCD) */
uInt32 count[2]; /* number of bits, modulo 2^64 (lsb first) */
uInt8 buffer[64]; /* input buffer */
} MD5_CTX;
// Constants for MD5Transform routine.
@ -77,15 +75,15 @@ typedef struct
#define S44 21
static void MD5Init(MD5_CTX*);
static void MD5Update(MD5_CTX*, const unsigned char*, unsigned int);
static void MD5Final(unsigned char[16], MD5_CTX*);
static void MD5Transform(UINT4 [4], const unsigned char [64]);
static void Encode(unsigned char*, UINT4*, unsigned int);
static void Decode(UINT4*, const unsigned char*, unsigned int);
static void MD5_memcpy(POINTER, POINTER, unsigned int);
static void MD5_memset(POINTER, int, unsigned int);
static void MD5Update(MD5_CTX*, const uInt8*, uInt32);
static void MD5Final(uInt8[16], MD5_CTX*);
static void MD5Transform(uInt32 [4], const uInt8 [64]);
static void Encode(uInt8*, uInt32*, uInt32);
static void Decode(uInt32*, const uInt8*, uInt32);
static void MD5_memcpy(POINTER, POINTER, uInt32);
static void MD5_memset(POINTER, int, uInt32);
static unsigned char PADDING[64] = {
static uInt8 PADDING[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@ -103,22 +101,22 @@ static unsigned char PADDING[64] = {
// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
// Rotation is separate from addition to prevent recomputation.
#define FF(a, b, c, d, x, s, ac) { \
(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) += F ((b), (c), (d)) + (x) + (uInt32)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define GG(a, b, c, d, x, s, ac) { \
(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) += G ((b), (c), (d)) + (x) + (uInt32)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define HH(a, b, c, d, x, s, ac) { \
(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) += H ((b), (c), (d)) + (x) + (uInt32)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define II(a, b, c, d, x, s, ac) { \
(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) += I ((b), (c), (d)) + (x) + (uInt32)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
@ -137,19 +135,19 @@ static void MD5Init(MD5_CTX* context)
// MD5 block update operation. Continues an MD5 message-digest
// operation, processing another message block, and updating the
// context.
static void MD5Update(MD5_CTX* context, const unsigned char* input,
unsigned int inputLen)
static void MD5Update(MD5_CTX* context, const uInt8* input,
uInt32 inputLen)
{
unsigned int i, index, partLen;
uInt32 i, index, partLen;
/* Compute number of bytes mod 64 */
index = (unsigned int)((context->count[0] >> 3) & 0x3F);
index = (uInt32)((context->count[0] >> 3) & 0x3F);
/* Update number of bits */
if ((context->count[0] += ((UINT4)inputLen << 3))
< ((UINT4)inputLen << 3))
if ((context->count[0] += ((uInt32)inputLen << 3))
< ((uInt32)inputLen << 3))
context->count[1]++;
context->count[1] += ((UINT4)inputLen >> 29);
context->count[1] += ((uInt32)inputLen >> 29);
partLen = 64 - index;
@ -172,16 +170,16 @@ static void MD5Update(MD5_CTX* context, const unsigned char* input,
// MD5 finalization. Ends an MD5 message-digest operation, writing the
// the message digest and zeroizing the context.
static void MD5Final(unsigned char digest[16], MD5_CTX* context)
static void MD5Final(uInt8 digest[16], MD5_CTX* context)
{
unsigned char bits[8];
unsigned int index, padLen;
uInt8 bits[8];
uInt32 index, padLen;
/* Save number of bits */
Encode (bits, context->count, 8);
/* Pad out to 56 mod 64. */
index = (unsigned int)((context->count[0] >> 3) & 0x3f);
index = (uInt32)((context->count[0] >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index);
MD5Update (context, PADDING, padLen);
@ -195,9 +193,9 @@ static void MD5Final(unsigned char digest[16], MD5_CTX* context)
}
// MD5 basic transformation. Transforms state based on block.
static void MD5Transform(UINT4 state[4], const unsigned char block[64])
static void MD5Transform(uInt32 state[4], const uInt8 block[64])
{
UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
uInt32 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
Decode (x, block, 64);
@ -282,44 +280,44 @@ static void MD5Transform(UINT4 state[4], const unsigned char block[64])
MD5_memset ((POINTER)x, 0, sizeof (x));
}
// Encodes input (UINT4) into output (unsigned char). Assumes len is
// Encodes input (uInt32) into output (uInt8). Assumes len is
// a multiple of 4.
static void Encode(unsigned char* output, UINT4* input, unsigned int len)
static void Encode(uInt8* output, uInt32* input, uInt32 len)
{
unsigned int i, j;
uInt32 i, j;
for (i = 0, j = 0; j < len; i++, j += 4) {
output[j] = (unsigned char)(input[i] & 0xff);
output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
output[j] = (uInt8)(input[i] & 0xff);
output[j+1] = (uInt8)((input[i] >> 8) & 0xff);
output[j+2] = (uInt8)((input[i] >> 16) & 0xff);
output[j+3] = (uInt8)((input[i] >> 24) & 0xff);
}
}
// Decodes input (unsigned char) into output (UINT4). Assumes len is
// Decodes input (uInt8) into output (uInt32). Assumes len is
// a multiple of 4.
static void Decode(UINT4* output, const unsigned char* input, unsigned int len)
static void Decode(uInt32* output, const uInt8* input, uInt32 len)
{
unsigned int i, j;
uInt32 i, j;
for (i = 0, j = 0; j < len; i++, j += 4)
output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
(((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
output[i] = ((uInt32)input[j]) | (((uInt32)input[j+1]) << 8) |
(((uInt32)input[j+2]) << 16) | (((uInt32)input[j+3]) << 24);
}
// Note: Replace "for loop" with standard memcpy if possible.
static void MD5_memcpy(POINTER output, POINTER input, unsigned int len)
static void MD5_memcpy(POINTER output, POINTER input, uInt32 len)
{
unsigned int i;
uInt32 i;
for (i = 0; i < len; i++)
output[i] = input[i];
}
// Note: Replace "for loop" with standard memset if possible.
static void MD5_memset(POINTER output, int value, unsigned int len)
static void MD5_memset(POINTER output, int value, uInt32 len)
{
unsigned int i;
uInt32 i;
for (i = 0; i < len; i++)
((char *)output)[i] = (char)value;
@ -330,7 +328,7 @@ string MD5(const uInt8* buffer, uInt32 length)
{
char hex[] = "0123456789abcdef";
MD5_CTX context;
unsigned char md5[16];
uInt8 md5[16];
MD5Init(&context);
MD5Update(&context, buffer, length);

8
src/emucore/MT24LC256.hxx
View File

@ -107,10 +107,10 @@ class MT24LC256
bool myDataChanged;
// Required for I2C functionality
int jpee_mdat, jpee_sdat, jpee_mclk;
int jpee_sizemask, jpee_pagemask, jpee_smallmode, jpee_logmode;
int jpee_pptr, jpee_state, jpee_nb;
unsigned int jpee_address, jpee_ad_known;
Int32 jpee_mdat, jpee_sdat, jpee_mclk;
Int32 jpee_sizemask, jpee_pagemask, jpee_smallmode, jpee_logmode;
Int32 jpee_pptr, jpee_state, jpee_nb;
uInt32 jpee_address, jpee_ad_known;
uInt8 jpee_packet[70];
private:

8
src/emucore/Settings.cxx
View File

@ -546,7 +546,7 @@ void Settings::saveConfig()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int Settings::getInternalPos(const string& key) const
{
for(unsigned int i = 0; i < myInternalSettings.size(); ++i)
for(uInt32 i = 0; i < myInternalSettings.size(); ++i)
if(myInternalSettings[i].key == key)
return i;
@ -556,7 +556,7 @@ int Settings::getInternalPos(const string& key) const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int Settings::getExternalPos(const string& key) const
{
for(unsigned int i = 0; i < myExternalSettings.size(); ++i)
for(uInt32 i = 0; i < myExternalSettings.size(); ++i)
if(myExternalSettings[i].key == key)
return i;
@ -576,7 +576,7 @@ int Settings::setInternal(const string& key, const Variant& value,
}
else
{
for(unsigned int i = 0; i < myInternalSettings.size(); ++i)
for(uInt32 i = 0; i < myInternalSettings.size(); ++i)
{
if(myInternalSettings[i].key == key)
{
@ -631,7 +631,7 @@ int Settings::setExternal(const string& key, const Variant& value,
}
else
{
for(unsigned int i = 0; i < myExternalSettings.size(); ++i)
for(uInt32 i = 0; i < myExternalSettings.size(); ++i)
{
if(myExternalSettings[i].key == key)
{

4
src/gui/ContextMenu.cxx
View File

@ -136,7 +136,7 @@ void ContextMenu::setSelected(const Variant& tag, const Variant& defaultTag)
{
if(tag != "") // indicates that the defaultTag should be used instead
{
for(unsigned int item = 0; item < _entries.size(); ++item)
for(uInt32 item = 0; item < _entries.size(); ++item)
{
if(BSPF_equalsIgnoreCase(_entries[item].second.toString(), tag.toString()))
{
@ -147,7 +147,7 @@ void ContextMenu::setSelected(const Variant& tag, const Variant& defaultTag)
}
// If we get this far, the value wasn't found; use the default value
for(unsigned int item = 0; item < _entries.size(); ++item)
for(uInt32 item = 0; item < _entries.size(); ++item)
{
if(BSPF_equalsIgnoreCase(_entries[item].second.toString(), defaultTag.toString()))
{

2
src/gui/EditTextWidget.cxx
View File

@ -55,7 +55,7 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount)
x += _editScrollOffset;
int width = 0;
unsigned int i;
uInt32 i;
for (i = 0; i < _editString.size(); ++i)
{

8
src/gui/InputTextDialog.cxx
View File

@ -67,7 +67,7 @@ void InputTextDialog::initialize(const GUI::Font& lfont, const GUI::Font& nfont,
const int fontWidth = lfont.getMaxCharWidth(),
fontHeight = lfont.getFontHeight(),
lineHeight = lfont.getLineHeight();
unsigned int xpos, ypos, i, lwidth = 0, maxIdx = 0;
uInt32 xpos, ypos, i, lwidth = 0, maxIdx = 0;
WidgetArray wid;
// Calculate real dimensions
@ -163,7 +163,7 @@ void InputTextDialog::setTitle(const string& title)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const string& InputTextDialog::getResult(int idx)
{
if((unsigned int)idx < myInput.size())
if((uInt32)idx < myInput.size())
return myInput[idx]->getText();
else
return EmptyString;
@ -172,14 +172,14 @@ const string& InputTextDialog::getResult(int idx)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void InputTextDialog::setText(const string& str, int idx)
{
if((unsigned int)idx < myInput.size())
if((uInt32)idx < myInput.size())
myInput[idx]->setText(str);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void InputTextDialog::setFocus(int idx)
{
if((unsigned int)idx < myInput.size())
if((uInt32)idx < myInput.size())
Dialog::setFocus(getFocusList()[idx]);
}

2
src/gui/PopUpWidget.cxx
View File

@ -28,7 +28,7 @@
#define UP_DOWN_BOX_HEIGHT 10
// Little up/down arrow
static unsigned int up_down_arrows[8] = {
static uInt32 up_down_arrows[8] = {
0x00000000,
0x00001000,
0x00011100,

2
src/gui/RomAuditDialog.cxx
View File

@ -134,7 +134,7 @@ void RomAuditDialog::auditRoms()
// Create a entry for the GameList for each file
Properties props;
int renamed = 0, notfound = 0;
for(unsigned int idx = 0; idx < files.size(); idx++)
for(uInt32 idx = 0; idx < files.size(); idx++)
{
string extension;
if(files[idx].isFile() &&

4
src/gui/ScrollBarWidget.cxx
View File

@ -33,7 +33,7 @@
#define UP_DOWN_BOX_HEIGHT 18
// Up arrow
static unsigned int up_arrow[8] = {
static uInt32 up_arrow[8] = {
0x00011000,
0x00011000,
0x00111100,
@ -45,7 +45,7 @@ static unsigned int up_arrow[8] = {
};
// Down arrow
static unsigned int down_arrow[8] = {
static uInt32 down_arrow[8] = {
0x11111111,
0x11111111,
0x01111110,

2
src/gui/TabWidget.cxx
View File

@ -135,7 +135,7 @@ void TabWidget::updateActiveTab()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TabWidget::activateTabs()
{
for(unsigned int i = 0; i <_tabs.size(); ++i)
for(uInt32 i = 0; i <_tabs.size(); ++i)
sendCommand(kTabChangedCmd, i-1, _id);
}

6
src/gui/Widget.cxx
View File

@ -397,7 +397,7 @@ void ButtonWidget::drawWidget(bool hilite)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/* 8x8 checkbox bitmap */
static unsigned int checked_img_active[8] =
static uInt32 checked_img_active[8] =
{
0x11111111,
0x11111111,
@ -409,7 +409,7 @@ static unsigned int checked_img_active[8] =
0x11111111
};
static unsigned int checked_img_inactive[8] =
static uInt32 checked_img_inactive[8] =
{
0x11111111,
0x11111111,
@ -421,7 +421,7 @@ static unsigned int checked_img_inactive[8] =
0x11111111
};
static unsigned int checked_img_circle[8] =
static uInt32 checked_img_circle[8] =
{
0x00011000,
0x01111110,

2
src/macosx/SettingsMACOSX.cxx
View File

@ -44,7 +44,7 @@ void SettingsMACOSX::loadConfig()
// Read key/value pairs from the plist file
const SettingsArray& settings = getInternalSettings();
for(unsigned int i = 0; i < settings.size(); ++i)
for(uInt32 i = 0; i < settings.size(); ++i)
{
prefsGetString(settings[i].key.c_str(), cvalue, 4090);
if(cvalue[0] != 0)