ApiBitmask::Signature::const_iterator itr;
Trace::BitmaskSig *sig = new Trace::BitmaskSig();
- Trace::BitmaskVal *values = new Trace::BitmaskVal[bsig.count()];
+ Trace::BitmaskFlag *flags = new Trace::BitmaskFlag[bsig.count()];
sig->id = id;
- sig->count = bsig.count();
- sig->values = values;
+ sig->num_flags = bsig.count();
+ sig->flags = flags;
int i = 0;
for (itr = bsig.constBegin(); itr != bsig.constEnd(); ++itr, ++i) {
- values[i].name = qstrdup(itr->first.toLocal8Bit());
- values[i].value = itr->second;
+ flags[i].name = qstrdup(itr->first.toLocal8Bit());
+ flags[i].value = itr->second;
}
return sig;
static void
deleteBitmaskSig(Trace::BitmaskSig *sig)
{
- for (int i = 0; i < sig->count; ++i) {
- delete [] sig->values[i].name;
+ for (int i = 0; i < sig->num_flags; ++i) {
+ delete [] sig->flags[i].name;
}
- delete [] sig->values;
+ delete [] sig->flags;
delete sig;
}
default:
if (type == arrayType) {
ApiArray array = var.value<ApiArray>();
- QList<QVariant> vals = array.values();
+ QVector<QVariant> vals = array.values();
writer.beginArray(vals.count());
foreach(QVariant el, vals) {
writer.beginElement();
} else if (type == bitmaskType) {
ApiBitmask bm = var.value<ApiBitmask>();
Trace::BitmaskSig *sig = createBitmaskSig(bm, ++id);
- writer.writeBitmask(*sig, bm.value());
+ writer.writeBitmask(sig, bm.value());
deleteBitmaskSig(sig);
} else if (type == structType) {
ApiStruct apiStr = var.value<ApiStruct>();
}
void SaverThread::saveFile(const QString &fileName,
- const QList<ApiTraceCall*> &calls)
+ const QVector<ApiTraceCall*> &calls)
{
m_fileName = fileName;
m_calls = calls;
for (int i = 0; i < m_calls.count(); ++i) {
ApiTraceCall *call = m_calls[i];
Trace::FunctionSig *funcSig = createFunctionSig(call, ++id);
- unsigned callNo = writer.beginEnter(*funcSig);
+ unsigned callNo = writer.beginEnter(funcSig);
{
//args
- QVariantList vars = call->arguments();
+ QVector<QVariant> vars = call->arguments();
int index = 0;
foreach(QVariant var, vars) {
writer.beginArg(index++);