X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=07cc41bf3eb1f8febf04c06595d8da2f142eb7da;hb=90ca4cc8a481c6ac6fde754fbcdf6ca2f3ba2231;hp=568b1bb0ad554c6806eaf3d21b2b2fd4bafe526f;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 568b1bb..07cc41b 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -14,17 +14,20 @@
* 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 .
*/
-#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
-#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
#include
+#include
+
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
@@ -32,7 +35,7 @@ namespace decode {
class RowData
{
public:
- RowData();
+ RowData() = default;
public:
uint64_t get_max_sample() const;
@@ -41,17 +44,17 @@ public:
* Extracts sorted annotations between two period into a vector.
*/
void get_annotation_subset(
- std::vector &dest,
+ vector &dest,
uint64_t start_sample, uint64_t end_sample) const;
- void push_annotation(const Annotation &a);
+ void emplace_annotation(srd_proto_data *pdata);
private:
- std::vector annotations_;
+ vector annotations_;
};
-}
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP