X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=11ff7a273b6af3a2892fdfcf6c7287f2f99d12c6;hp=8311f122faa54e253b62bc11aca652d196b7c1ec;hb=20df1a39d587c284f5ee8873dc05470d6a6b11eb;hpb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp index 8311f122..11ff7a27 100644 --- a/pv/views/viewbase.cpp +++ b/pv/views/viewbase.cpp @@ -80,8 +80,8 @@ void ViewBase::clear_signalbases() for (shared_ptr signalbase : signalbases_) { disconnect(signalbase.get(), SIGNAL(samples_cleared()), this, SLOT(on_data_updated())); - disconnect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), - this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t))); + disconnect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)), + this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t))); } signalbases_.clear(); @@ -93,8 +93,8 @@ void ViewBase::add_signalbase(const shared_ptr signalbase) connect(signalbase.get(), SIGNAL(samples_cleared()), this, SLOT(on_data_updated())); - connect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), - this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t))); + connect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)), + this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t))); } #ifdef ENABLE_DECODE @@ -123,8 +123,9 @@ void ViewBase::restore_settings(QSettings &settings) (void)settings; } -void ViewBase::trigger_event(util::Timestamp location) +void ViewBase::trigger_event(int segment_id, util::Timestamp location) { + (void)segment_id; (void)location; } @@ -151,15 +152,13 @@ void ViewBase::perform_delayed_view_update() { } -void ViewBase::on_samples_added(QObject* segment, uint64_t start_sample, +void ViewBase::on_samples_added(uint64_t segment_id, uint64_t start_sample, uint64_t end_sample) { (void)start_sample; (void)end_sample; - data::Segment* s = qobject_cast(segment); - - if (s->segment_id() != current_segment_) + if (segment_id != current_segment_) return; if (!delayed_view_updater_.isActive())