From 04bfcdff7150178ff5d44a615b4d5263280b9fc8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 22 Apr 2017 02:25:03 +0100 Subject: [PATCH] Fix linux build with problems overriding functions --- qrenderdoc/Widgets/Extended/RDTreeWidget.cpp | 6 +++--- qrenderdoc/Widgets/Extended/RDTreeWidget.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp b/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp index a0a7f1b77..00265b2e8 100644 --- a/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp +++ b/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp @@ -125,7 +125,7 @@ public: return widget->m_headers.count(); } - bool hasChildren(const QModelIndex &parent) const + bool hasChildren(const QModelIndex &parent) const override { if(!parent.isValid()) return widget->m_root->childCount() > 0; @@ -345,7 +345,7 @@ void RDTreeWidgetItem::setWidget(RDTreeWidget *widget) void RDTreeWidgetItem::dataChanged(int role) { if(m_widget) - m_widget->dataChanged(this, role); + m_widget->itemDataChanged(this, role); } RDTreeWidgetItem *RDTreeWidgetItem::takeChild(int index) @@ -596,7 +596,7 @@ void RDTreeWidget::currentChanged(const QModelIndex ¤t, const QModelIndex QTreeView::currentChanged(current, previous); } -void RDTreeWidget::dataChanged(RDTreeWidgetItem *item, int role) +void RDTreeWidget::itemDataChanged(RDTreeWidgetItem *item, int role) { if(m_queueUpdates) { diff --git a/qrenderdoc/Widgets/Extended/RDTreeWidget.h b/qrenderdoc/Widgets/Extended/RDTreeWidget.h index cda74ede8..3a3c15bf0 100644 --- a/qrenderdoc/Widgets/Extended/RDTreeWidget.h +++ b/qrenderdoc/Widgets/Extended/RDTreeWidget.h @@ -202,7 +202,7 @@ private: void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; void setModel(QAbstractItemModel *model) override {} - void dataChanged(RDTreeWidgetItem *item, int role); + void itemDataChanged(RDTreeWidgetItem *item, int role); friend class RDTreeWidgetModel; friend class RDTreeWidgetItem;