X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=2a26169eb6cc0f14adb5a107726c40ee891838b6;hb=de2fc10b2b067705e623b9781a332ad8fa3f4f88;hp=9402e707503e63772c9c18a39d5ea98415ed433e;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index 9402e70..2a26169 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.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 .
*/
#include "rowdata.hpp"
@@ -26,10 +25,6 @@ namespace pv {
namespace data {
namespace decode {
-RowData::RowData()
-{
-}
-
uint64_t RowData::get_max_sample() const
{
if (annotations_.empty())
@@ -41,17 +36,17 @@ void RowData::get_annotation_subset(
vector &dest,
uint64_t start_sample, uint64_t end_sample) const
{
- for (auto i = annotations_.cbegin(); i != annotations_.cend(); 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, const Row *row)
{
- annotations_.push_back(a);
+ annotations_.emplace_back(pdata, row);
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv