X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.hpp;h=a107e0efeed7426584cbded2169ca639ffc47288;hp=f1e2ef35975bb30d27015c64d08f51a8b25ef103;hb=f228f00ed2c11ce4c9c36e0b758132a075e251da;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index f1e2ef35..a107e0ef 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -14,17 +14,19 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_H
-#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_H
+#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
 
-#include <stdint.h>
+#include <cstdint>
+#include <vector>
 
 #include <QString>
 
+using std::vector;
+
 struct srd_proto_data;
 
 namespace pv {
@@ -33,23 +35,26 @@ namespace decode {
 
 class Annotation
 {
+public:
+	typedef uint32_t Class;
+
 public:
 	Annotation(const srd_proto_data *const pdata);
 
 	uint64_t start_sample() const;
 	uint64_t end_sample() const;
-	int format() const;
-	const std::vector<QString>& annotations() const;
+	Class ann_class() const;
+	const vector<QString>& annotations() const;
 
 private:
 	uint64_t start_sample_;
 	uint64_t end_sample_;
-	int format_;
-	std::vector<QString> annotations_;
+	Class ann_class_;
+	vector<QString> annotations_;
 };
 
 } // namespace decode
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_H
+#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP