MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 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

20
binding-mruby/mrb-ext/marshal.cpp
View file

@ -32,6 +32,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
#include <vector>
#include "../binding-util.h"
#include "file.h"
@ -40,7 +41,6 @@
#include <SDL_timer.h>
#include <QVector>
#include <QHash>
#include <QByteArray>
@ -110,19 +110,27 @@ struct LinkBuffer
{
/* Key: val, Value: idx in vec */
QHash<T, int> hash;
QVector<T> vec;
std::vector<T> vec;
bool contains(T value)
{
return hash.contains(value);
}
bool containsIdx(int idx)
{
if (vec.empty())
return false;
return (idx < vec.size());
}
int add(T value)
{
int idx = vec.count();
int idx = vec.size();
hash.insert(value, idx);
vec.append(value);
vec.push_back(value);
return idx;
}
@ -331,7 +339,7 @@ read_symlink(MarshalContext *ctx)
{
int idx = read_fixnum(ctx);
if (idx > ctx->symbols.vec.size()-1)
if (!ctx->symbols.containsIdx(idx))
throw Exception(Exception::ArgumentError, "bad symlink");
return ctx->symbols.lookup(idx);
@ -342,7 +350,7 @@ read_link(MarshalContext *ctx)
{
int idx = read_fixnum(ctx);
if (idx > ctx->objects.vec.size()-1)
if (!ctx->objects.containsIdx(idx))
throw Exception(Exception::ArgumentError, "dump format error (unlinked)");
return ctx->objects.lookup(idx);