X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=aff4a26b333b68b2672af073c87b8ad5c392d406;hb=5b35d18ccf2e5a8949d1b4b37d06bf527480e547;hp=b1c256acb414878b574995f01f878b7a1298d591;hpb=21ea5e700fdde6a6eb2c0969649fcb1d8ea6d283;p=pulseview.git
diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index b1c256a..aff4a26 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -14,11 +14,10 @@
* 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 .
*/
-#include "rowdata.h"
+#include "rowdata.hpp"
using std::vector;
@@ -26,33 +25,28 @@ namespace pv {
namespace data {
namespace decode {
-RowData::RowData()
-{
-}
-
uint64_t RowData::get_max_sample() const
{
- if (_annotations.empty())
+ if (annotations_.empty())
return 0;
- return _annotations.back().end_sample();
+ return annotations_.back().end_sample();
}
void RowData::get_annotation_subset(
vector &dest,
uint64_t start_sample, uint64_t end_sample) const
{
- for (vector::const_iterator i = _annotations.begin();
- i != _annotations.end(); i++)
- if ((*i).end_sample() > start_sample &&
- (*i).start_sample() < end_sample)
- dest.push_back(*i);
+ for (const auto& annotation : annotations_)
+ if (annotation.end_sample() > start_sample &&
+ annotation.start_sample() <= end_sample)
+ dest.push_back(annotation);
}
-void RowData::push_annotation(const Annotation &a)
+void RowData::emplace_annotation(srd_proto_data *pdata)
{
- _annotations.push_back(a);
+ annotations_.emplace_back(pdata);
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv