projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Annotation: Use special type for the class, not plain int
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 9a165803fe2381fa7d0d2a40459d1199b26cd1bf..96a594c3c6ce57a07f621ce9ddf9cd439fed1acd 100644
(file)
--- 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
* 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/>.
*/
extern "C" {
*/
extern "C" {
@@
-27,6
+26,8
@@
extern "C" {
#include "annotation.hpp"
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
@@
-40,7
+41,7
@@
Annotation::Annotation(const srd_proto_data *const pdata) :
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
(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) {
const char *const *annotations = (char**)pda->ann_text;
while (*annotations) {
@@
-59,12
+60,12
@@
uint64_t Annotation::end_sample() const
return end_sample_;
}
return end_sample_;
}
-
int Annotation::format
() const
+
Annotation::Class Annotation::ann_class
() const
{
{
- return
format
_;
+ return
ann_class
_;
}
}
-const
std::
vector<QString>& Annotation::annotations() const
+const vector<QString>& Annotation::annotations() const
{
return annotations_;
}
{
return annotations_;
}