diff --git a/src/ui/elfmodel/sectionproxymodel.h b/src/ui/elfmodel/sectionproxymodel.h --- a/src/ui/elfmodel/sectionproxymodel.h +++ b/src/ui/elfmodel/sectionproxymodel.h @@ -18,10 +18,10 @@ #ifndef SECTIONPROXYMODEL_H #define SECTIONPROXYMODEL_H -#include +#include /** Restrict the structure model to just files and sections. */ -class SectionProxyModel : public KRecursiveFilterProxyModel +class SectionProxyModel : public QSortFilterProxyModel { Q_OBJECT public: diff --git a/src/ui/elfmodel/sectionproxymodel.cpp b/src/ui/elfmodel/sectionproxymodel.cpp --- a/src/ui/elfmodel/sectionproxymodel.cpp +++ b/src/ui/elfmodel/sectionproxymodel.cpp @@ -18,8 +18,9 @@ #include "sectionproxymodel.h" #include "elfmodel.h" -SectionProxyModel::SectionProxyModel(QObject* parent): KRecursiveFilterProxyModel(parent) +SectionProxyModel::SectionProxyModel(QObject* parent): QSortFilterProxyModel(parent) { + setRecursiveFilteringEnabled(true); } SectionProxyModel::~SectionProxyModel() = default; @@ -31,5 +32,5 @@ const auto secData = sourceModel()->data(sourceIndex, ElfModel::SectionRole); if (fileData.isNull() && secData.isNull()) return false; - return KRecursiveFilterProxyModel::filterAcceptsRow(source_row, source_parent); + return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); } diff --git a/src/ui/views/elfstructureview.cpp b/src/ui/views/elfstructureview.cpp --- a/src/ui/views/elfstructureview.cpp +++ b/src/ui/views/elfstructureview.cpp @@ -21,19 +21,21 @@ #include #include -#include +#include #include ElfStructureView::ElfStructureView(QWidget* parent): QWidget(parent), ui(new Ui::ElfStructureView), - m_proxy(new KRecursiveFilterProxyModel(this)) + m_proxy(new QSortFilterProxyModel(this)) { ui->setupUi(this); ui->elfStructureView->setModel(m_proxy); ui->elfStructureView->header()->setSectionResizeMode(QHeaderView::ResizeToContents); + m_proxy->setRecursiveFilteringEnabled(true); + connect(ui->elfStructureView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ElfStructureView::selectionChanged); connect(ui->elfStructureSearchLine, &QLineEdit::textChanged, this, [this](const QString &text) { diff --git a/src/ui/views/typeview.cpp b/src/ui/views/typeview.cpp --- a/src/ui/views/typeview.cpp +++ b/src/ui/views/typeview.cpp @@ -21,19 +21,19 @@ #include #include -#include - #include #include +#include TypeView::TypeView(QWidget* parent): QWidget(parent), ui(new Ui::TypeView), m_model(new TypeModel(this)) { ui->setupUi(this); - auto proxy = new KRecursiveFilterProxyModel(this); + auto proxy = new QSortFilterProxyModel(this); + proxy->setRecursiveFilteringEnabled(true); proxy->setSourceModel(m_model); ui->typeTreeView->setModel(proxy); ui->typeTreeView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);