Unify Bitmask::Pair with BitmaskVal.

diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp
index 6570368e1e13885668b92e05068d78999f00e20d..b7694f46f79f5753d1c19d34f287093238e37341 100644 (file)
--- a/gui/apitracecall.cpp
+++ b/gui/apitracecall.cpp
@@ -166,11 +166,11 @@ void ApiBitmask::init(const Trace::Bitmask *bitmask)
     m_value = bitmask->value;
     for (Trace::Bitmask::Signature::const_iterator it = bitmask->sig->begin();
          it != bitmask->sig->end(); ++it) {
-        assert(it->second);
+        assert(it->value);
         QPair<QString, unsigned long long> pair;
 
-        pair.first = QString::fromStdString(it->first);
-        pair.second = it->second;
+        pair.first = QString::fromStdString(it->name);
+        pair.second = it->value;
 
         m_sig.append(pair);
     }

diff --git a/trace_model.cpp b/trace_model.cpp
index 75ad9e395560fc1a64ed45e15b397a1ac2527c47..0d2915f01926c5bd3090373d12be43906e862db7 100644 (file)
--- a/trace_model.cpp
+++ b/trace_model.cpp
@@ -258,13 +258,13 @@ public:
         const Bitmask::Signature *sig = bitmask->sig;
         bool first = true;
         for (Bitmask::Signature::const_iterator it = sig->begin(); value != 0 && it != sig->end(); ++it) {
-            if ((it->second && (value & it->second) == it->second) ||
-                (!it->second && value == 0)) {
+            if ((it->value && (value & it->value) == it->value) ||
+                (!it->value && value == 0)) {
                 if (!first) {
                     os << " | ";
                 }
-                os << literal << it->first << normal;
-                value &= ~it->second;
+                os << literal << it->name << normal;
+                value &= ~it->value;
                 first = false;
             }
         }

diff --git a/trace_model.hpp b/trace_model.hpp
index 1864b03c390615703d1c2c0377a67ed4496d4289..a942ac99cd529281269304c84e23ad7040cbae9c 100644 (file)
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -38,6 +38,8 @@
 #include <vector>
 #include <iostream>
 
+#include "trace_writer.hpp"
+
 
 namespace Trace {
 
@@ -190,8 +192,7 @@ public:
 class Bitmask : public UInt
 {
 public:
-    typedef std::pair<const char *, unsigned long long> Pair;
-    typedef std::vector<Pair> Signature;
+    typedef std::vector<BitmaskVal> Signature;
 
     Bitmask(const Signature *_sig, unsigned long long _value) : UInt(_value), sig(_sig) {}
 

diff --git a/trace_parser.cpp b/trace_parser.cpp
index e615ed7aa65bd9c4f861924cbc85ddee94483beb..17682bd2a1ebad840613ebea90ab1b6890466931 100644 (file)
--- a/trace_parser.cpp
+++ b/trace_parser.cpp
@@ -328,10 +328,10 @@ Value *Parser::parse_bitmask() {
         size_t size = read_uint();
         sig = new Bitmask::Signature(size);
         for (Bitmask::Signature::iterator it = sig->begin(); it != sig->end(); ++it) {
-            it->first = read_string();
-            it->second = read_uint();
-            if (it->second == 0 && it != sig->begin()) {
-                std::cerr << "warning: bitmask " << it->first << " is zero but is not first flag\n";
+            it->name = read_string();
+            it->value = read_uint();
+            if (it->value == 0 && it != sig->begin()) {
+                std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
             }
         }
         bitmasks[id] = sig;