X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=5ec7ee7c5337bd1cdf929f70597c26fe9defa78c;hp=863fb35e922baff17efb7aa39fcea275e26a92fe;hb=223d0c3748033130e9f11ff9af3dc29661f380e9;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 863fb35e..5ec7ee7c 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
 
 #include "trace.hpp"
 
@@ -29,7 +29,7 @@
 
 #include <QSignalMapper>
 
-#include <pv/binding/decoderoptions.hpp>
+#include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -100,21 +100,21 @@ public:
 	 * Paints the background layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
-	 **/
+	 */
 	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -191,7 +191,7 @@ private:
 
 	uint64_t decode_start_, decode_end_;
 
-	std::list< std::shared_ptr<pv::binding::DecoderOptions> >
+	std::list< std::shared_ptr<pv::binding::Decoder> >
 		bindings_;
 
 	std::list<ChannelSelector> channel_selectors_;
@@ -206,4 +206,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP