X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=2a26169eb6cc0f14adb5a107726c40ee891838b6;hp=299380c8053b8861143f5c2f9e1bb5bb6cd86bb0;hb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2;hpb=f46e495ef1db0a4e522462ac18260f2151fa2b89

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index 299380c..2a26169 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 <http://www.gnu.org/licenses/>.
  */
 
-#include "rowdata.h"
+#include "rowdata.hpp"
 
 using std::vector;
 
@@ -26,32 +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<pv::data::decode::Annotation> &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