From bb455dbcaf3d7c49653a9de19310a5111642f9f7 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 7 Feb 2025 08:24:20 +0100 Subject: [PATCH] Valgrind: Remove some dead ends Detected by Axivion plugin. Change-Id: Ieba20a8fe370b467359d5e3c0a7eea0989fca0b7 --- .../valgrind/callgrind/callgrindcallmodel.cpp | 20 ------------------- .../valgrind/callgrind/callgrindcallmodel.h | 4 ---- .../valgrind/callgrind/callgrinddatamodel.cpp | 10 ---------- .../valgrind/callgrind/callgrinddatamodel.h | 5 ----- .../valgrind/callgrind/callgrindproxymodel.h | 2 -- .../valgrind/callgrindvisualisation.cpp | 16 --------------- src/plugins/valgrind/callgrindvisualisation.h | 1 - 7 files changed, 58 deletions(-) diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp index c08256db2f1..dba3a5dcac2 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp @@ -48,26 +48,11 @@ void CallModel::setCalls(const QList &calls, const Functio endResetModel(); } -QList CallModel::calls() const -{ - return d->m_calls; -} - -const Function *CallModel::function() const -{ - return d->m_function; -} - void CallModel::setCostEvent(int event) { d->m_event = event; } -int CallModel::costEvent() const -{ - return d->m_event; -} - void CallModel::setParseData(const ParseDataPtr &data) { if (d->m_data == data) @@ -79,11 +64,6 @@ void CallModel::setParseData(const ParseDataPtr &data) d->m_data = data; } -ParseDataPtr CallModel::parseData() const -{ - return d->m_data; -} - int CallModel::rowCount(const QModelIndex &parent) const { QTC_ASSERT(!parent.isValid() || parent.model() == this, return 0); diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.h b/src/plugins/valgrind/callgrind/callgrindcallmodel.h index 2bb0225ace7..9017a75fde0 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.h @@ -28,15 +28,11 @@ class CallModel : public QAbstractItemModel /// Only one cost event column will be shown, this decides which one it is. /// By default it is the first event in the @c ParseData, i.e. 0. - int costEvent() const; void setCostEvent(int event); void setParseData(const ParseDataPtr &data); - ParseDataPtr parseData() const; void setCalls(const QList &calls, const Function *function); - QList calls() const; - const Function *function() const; int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp index 1122b2da28f..a2964df8e52 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp @@ -67,11 +67,6 @@ void DataModel::setVerboseToolTipsEnabled(bool enabled) d->m_verboseToolTips = enabled; } -bool DataModel::verboseToolTipsEnabled() const -{ - return d->m_verboseToolTips; -} - ParseDataPtr DataModel::parseData() const { return d->m_data; @@ -90,11 +85,6 @@ void DataModel::setCostEvent(int event) emit dataChanged(index(0, SelfCostColumn), index(qMax(0, rowCount() - 1), InclusiveCostColumn)); } -int DataModel::costEvent() const -{ - return d->m_event; -} - int DataModel::rowCount(const QModelIndex &parent) const { QTC_ASSERT(!parent.isValid() || parent.model() == this, return 0); diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h index 176ed9a7394..1b744ca5c4f 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.h +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h @@ -25,11 +25,6 @@ class DataModel : public QAbstractItemModel ParseDataPtr parseData() const; void setVerboseToolTipsEnabled(bool enabled); - bool verboseToolTipsEnabled() const; - - /// Only one cost event column will be shown, this decides which one it is. - /// By default it is the first event in the @c ParseData, i.e. 0. - int costEvent() const; int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/plugins/valgrind/callgrind/callgrindproxymodel.h b/src/plugins/valgrind/callgrind/callgrindproxymodel.h index b11186a6c27..9853320b1d7 100644 --- a/src/plugins/valgrind/callgrind/callgrindproxymodel.h +++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.h @@ -19,9 +19,7 @@ class DataProxyModel : public QSortFilterProxyModel void setSourceModel(QAbstractItemModel *sourceModel) override; - QString filterBaseDir() const { return m_baseDir; } const Function *filterFunction() const; - int filterMaximumRows() const { return m_maxRows; } /// Only functions with an inclusive cost ratio above this minimum will be shown in the model double minimumInclusiveCostRatio() const { return m_minimumInclusiveCostRatio; } diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp index d7c49b082b0..f8ea01a726b 100644 --- a/src/plugins/valgrind/callgrindvisualisation.cpp +++ b/src/plugins/valgrind/callgrindvisualisation.cpp @@ -58,7 +58,6 @@ class FunctionGraphicsItem : public QGraphicsRectItem void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - FunctionGraphicsTextItem *textItem() const; private: FunctionGraphicsTextItem *m_text = nullptr; @@ -139,11 +138,6 @@ FunctionGraphicsItem::FunctionGraphicsItem(const QString &text, m_text->setPos(rect().center().x(), y); } -FunctionGraphicsTextItem *FunctionGraphicsItem::textItem() const -{ - return m_text; -} - void FunctionGraphicsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { @@ -265,16 +259,6 @@ const Function *Visualization::functionForItem(QGraphicsItem *item) const return item->data(FunctionGraphicsItem::FunctionCallKey).value(); } -QGraphicsItem *Visualization::itemForFunction(const Function *function) const -{ - const QList itemList = items(); - for (QGraphicsItem *item : itemList) { - if (functionForItem(item) == function) - return item; - } - return nullptr; -} - void Visualization::setFunction(const Function *function) { d->m_model->setFilterFunction(function); diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h index fda14eef487..1823c934dea 100644 --- a/src/plugins/valgrind/callgrindvisualisation.h +++ b/src/plugins/valgrind/callgrindvisualisation.h @@ -24,7 +24,6 @@ class Visualization : public QGraphicsView void setModel(QAbstractItemModel *model); const Valgrind::Callgrind::Function *functionForItem(QGraphicsItem *item) const; - QGraphicsItem *itemForFunction(const Valgrind::Callgrind::Function *function) const; void setFunction(const Valgrind::Callgrind::Function *function); const Valgrind::Callgrind::Function *function() const;