diff --git a/src/gui/reports/ProxyModels.h b/src/gui/reports/ProxyModels.h index 4d7481783..6311afeff 100644 --- a/src/gui/reports/ProxyModels.h +++ b/src/gui/reports/ProxyModels.h @@ -28,14 +28,14 @@ enum class SortProxyModelKind Healthcheck, }; -class HibpReportSortPoxyModel : public QSortFilterProxyModel +class HibpReportSortProxyModel : public QSortFilterProxyModel { public: - HibpReportSortPoxyModel(QObject* parent) + HibpReportSortProxyModel(QObject* parent) : QSortFilterProxyModel(parent) { } - ~HibpReportSortPoxyModel() override = default; + ~HibpReportSortProxyModel() override = default; protected: bool lessThan(const QModelIndex& left, const QModelIndex& right) const override diff --git a/src/gui/reports/ReportsWidgetBase.cpp b/src/gui/reports/ReportsWidgetBase.cpp index 5a42e6bc3..02b469c66 100644 --- a/src/gui/reports/ReportsWidgetBase.cpp +++ b/src/gui/reports/ReportsWidgetBase.cpp @@ -45,7 +45,7 @@ ReportsWidgetBase::ReportsWidgetBase(QWidget* parent, SortProxyModelKind proxyMo m_modelProxy.reset(new HealthcheckReportSortProxyModel(this)); break; case SortProxyModelKind::Hibp: - m_modelProxy.reset(new HibpReportSortPoxyModel(this)); + m_modelProxy.reset(new HibpReportSortProxyModel(this)); break; } } @@ -111,7 +111,7 @@ QMenu* ReportsWidgetBase::customMenuRequestedBase() excludeAction->setObjectName("contextMenuExcludeAction"); const auto excludeGroupsAction = new QAction(icons()->icon("reports-exclude"), tr("Exclude Group(s) from reports"), this); - excludeGroupsAction->setObjectName("contextMenuxcludeGroupAction"); + excludeGroupsAction->setObjectName("contextMenuExcludeGroupAction"); bool isExcluded = false; bool isGroupExcluded = false; @@ -221,19 +221,6 @@ QList ReportsWidgetBase::getSelectedEntries() const return selectedEntries; } -QList ReportsWidgetBase::getSelectedEntries() -{ - QList selectedEntries; - for (auto index : getTableView()->selectionModel()->selectedRows()) { - auto row = m_modelProxy->mapToSource(index).row(); - auto entry = m_rowToEntry[row].second; - if (entry) { - selectedEntries << entry; - } - } - return selectedEntries; -} - void ReportsWidgetBase::expireSelectedEntries() { for (auto entry : getSelectedEntries()) { diff --git a/src/gui/reports/ReportsWidgetBase.h b/src/gui/reports/ReportsWidgetBase.h index 0ba4830ae..c0ac484a3 100644 --- a/src/gui/reports/ReportsWidgetBase.h +++ b/src/gui/reports/ReportsWidgetBase.h @@ -51,10 +51,9 @@ protected: virtual void updateWidget() = 0; QMenu* customMenuRequestedBase(); - QList getSelectedEntries() const; public slots: - QList getSelectedEntries(); + QList getSelectedEntries() const; void expireSelectedEntries(); void deleteSelectedEntries(); void emitEntryActivated(const QModelIndex& index); diff --git a/src/gui/reports/ReportsWidgetBrowserStatistics.h b/src/gui/reports/ReportsWidgetBrowserStatistics.h index 6ec8afb30..71a08a3a2 100644 --- a/src/gui/reports/ReportsWidgetBrowserStatistics.h +++ b/src/gui/reports/ReportsWidgetBrowserStatistics.h @@ -46,9 +46,6 @@ protected: void updateWidget() override; QTableView* getTableView() const override; -signals: - void entryActivated(Entry*); - public slots: void calculateBrowserStatistics(); void customMenuRequested(QPoint);