Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replace QVector, QList with std::vector, std::list

Browse source 
An exception is made of TexPool, which will need a
bit more testing before transitioning to std containers.

Also replace 'int' with 'size_t' where it is used only
as an array index.
This commit is contained in:
Jonas Kulla 2013-12-26 20:18:33 +01:00
parent 8215bc7e7d
commit 231e38ae8e
16 changed files with 188 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

11
binding-mri/binding-mri.cpp
View file

@ -224,14 +224,14 @@ static void runRMXPScripts()
return;
}
int scriptCount = RARRAY_LEN(scriptArray);
size_t scriptCount = RARRAY_LEN(scriptArray);
QByteArray decodeBuffer;
decodeBuffer.resize(0x1000);
QVector<Script> encScripts(scriptCount);
std::vector<Script> encScripts(scriptCount);
for (int i = 0; i < scriptCount; ++i)
for (size_t i = 0; i < scriptCount; ++i)
{
VALUE script = rb_ary_entry(scriptArray, i);
@ -250,7 +250,7 @@ static void runRMXPScripts()
sc.unknown = FIX2UINT(scriptUnknown);
}
for (int i = 0; i < scriptCount; ++i)
for (size_t i = 0; i < scriptCount; ++i)
{
Script &sc = encScripts[i];
@ -280,7 +280,8 @@ static void runRMXPScripts()
if (result != Z_OK)
{
static char buffer[256];
snprintf(buffer, sizeof(buffer), "Error decoding script %d: '%s'",
/* FIXME: '%zu' apparently gcc only? */
snprintf(buffer, sizeof(buffer), "Error decoding script %zu: '%s'",
i, sc.name.constData());
showMsg(buffer);