Replace deprecated qVariantFromValue

[pulseview.git] / pv / views / tabular_decoder / view.hpp

diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index ae2d5276de2a6a46cf54f12c9951f79a4b30a104..891c227cd8e6a6446af7b32aab7f1279483383f4 100644 (file)
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -26,7 +26,6 @@
 #include <QTableView>
 #include <QToolButton>
 
-#include "pv/globalsettings.hpp"
 #include "pv/metadata_obj.hpp"
 #include "pv/views/viewbase.hpp"
 #include "pv/data/decodesignal.hpp"
@@ -57,13 +56,14 @@ extern const char* SaveTypeNames[SaveTypeCount];
 extern const char* ViewModeNames[ViewModeCount];
 
 
-class AnnotationCollectionModel : public QAbstractTableModel, public GlobalSettingsInterface
+class AnnotationCollectionModel : public QAbstractTableModel
 {
        Q_OBJECT
 
 public:
        AnnotationCollectionModel(QObject* parent = nullptr);
 
+       int get_hierarchy_level(const Annotation* ann) const;
        QVariant data_from_ann(const Annotation* ann, int index) const;
        QVariant data(const QModelIndex& index, int role) const override;
        Qt::ItemFlags flags(const QModelIndex& index) const override;
@@ -83,8 +83,8 @@ public:
        void set_hide_hidden(bool hide_hidden);
 
        void update_annotations_without_hidden();
-
-       void on_setting_changed(const QString &key, const QVariant &value) override;
+       void update_highlighted_rows(QModelIndex first, QModelIndex last,
+               int64_t sample_num);
 
 private Q_SLOTS:
        void on_annotation_visibility_changed();
@@ -98,8 +98,9 @@ private:
        uint32_t prev_segment_;
        uint64_t prev_last_row_;
        uint64_t start_sample_, end_sample_, start_index_, end_index_;
+       int64_t highlight_sample_num_;
+       bool had_highlight_before_;
        bool hide_hidden_;
-       bool theme_is_dark_;
 };