Renamed pv::binding::DeviceOptions and DecoderOptions to Device and Decoder

[pulseview.git] / pv / view / decodetrace.hpp

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index edf3205b530479993cd96209af523ea48eea6353..ada01db70548d34f641fb60ed0190a9b908427f9 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -29,7 +29,7 @@
 
 #include <QSignalMapper>
 
-#include <pv/prop/binding/decoderoptions.hpp>
+#include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -191,14 +191,14 @@ private:
 
        uint64_t decode_start_, decode_end_;
 
-       std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
+       std::list< std::shared_ptr<pv::binding::Decoder> >
                bindings_;
 
        std::list<ChannelSelector> channel_selectors_;
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        std::vector<data::decode::Row> visible_rows_;
-       int text_height_, row_height_;
+       int row_height_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };