X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=96a594c3c6ce57a07f621ce9ddf9cd439fed1acd;hb=f228f00ed2c11ce4c9c36e0b758132a075e251da;hp=9b07efbc5f2844724fb91cbcd1dc18149e8dce60;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git
diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 9b07efb..96a594c 100644
--- a/pv/data/decode/annotation.cpp
+++ b/pv/data/decode/annotation.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
extern "C" {
@@ -25,7 +24,9 @@ extern "C" {
#include
#include
-#include "annotation.h"
+#include "annotation.hpp"
+
+using std::vector;
namespace pv {
namespace data {
@@ -40,10 +41,10 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
- format_ = pda->ann_class;
+ ann_class_ = (Class)(pda->ann_class);
const char *const *annotations = (char**)pda->ann_text;
- while(*annotations) {
+ while (*annotations) {
annotations_.push_back(QString::fromUtf8(*annotations));
annotations++;
}
@@ -59,12 +60,12 @@ uint64_t Annotation::end_sample() const
return end_sample_;
}
-int Annotation::format() const
+Annotation::Class Annotation::ann_class() const
{
- return format_;
+ return ann_class_;
}
-const std::vector& Annotation::annotations() const
+const vector& Annotation::annotations() const
{
return annotations_;
}