move section click handler to list header class

Now that we have a class for the PackageViewHeader we can move the
sectionClicked slot there.

REVIEW: 129908

4 files changed, 11 insertions, 9 deletions

diff --git a/src/PackageModel/PackageViewHeader.cpp b/src/PackageModel/PackageViewHeader.cpp
index 087d69c..a625784 100644
--- a/src/PackageModel/PackageViewHeader.cpp
+++ b/src/PackageModel/PackageViewHeader.cpp
@@ -29,6 +29,8 @@
 PackageViewHeader::PackageViewHeader(QWidget *parent)
     : QHeaderView(Qt::Horizontal, parent)
 {
+    connect(this, &QHeaderView::sectionClicked,
+            this, &PackageViewHeader::onSectionClicked);
 }
 
 void PackageViewHeader::setModel(QAbstractItemModel* model)
@@ -88,6 +90,14 @@ void PackageViewHeader::modelLayoutChanged()
         sortIndicatorSection() == 0));
 }
 
+void PackageViewHeader::onSectionClicked()
+{
+    QAbstractItemModel* model = this->model();
+    if (model) {
+        static_cast<PackageProxyModel*>(model)->setSortByRelevancy(false);
+    }
+}
+
 void PackageViewHeader::toggleColumn(bool visible)
 {
     QAction *action = qobject_cast<QAction *>(sender());
diff --git a/src/PackageModel/PackageViewHeader.h b/src/PackageModel/PackageViewHeader.h
index 30adb4d..12c67f7 100644
--- a/src/PackageModel/PackageViewHeader.h
+++ b/src/PackageModel/PackageViewHeader.h
@@ -37,6 +37,7 @@ protected:
 
 private slots:
     void modelLayoutChanged();
+    void onSectionClicked();
     void toggleColumn(bool visible);
 
 private:
diff --git a/src/PackageModel/PackageWidget.cpp b/src/PackageModel/PackageWidget.cpp
index 1b4efc8..83b6e5f 100644
--- a/src/PackageModel/PackageWidget.cpp
+++ b/src/PackageModel/PackageWidget.cpp
@@ -144,8 +144,6 @@ PackageWidget::PackageWidget(QWidget *parent)
             this, SLOT(packageActivated(QModelIndex)));
     connect(m_packageView, SIGNAL(selectionEmpty()), m_detailsWidget, SLOT(hide()));
     connect(m_packageView, SIGNAL(selectionMulti()), m_detailsWidget, SLOT(emitHideButtons()));
-    connect(m_packageView->header(), SIGNAL(sectionClicked(int)),
-            this, SLOT(sectionClicked(int)));
     connect(m_searchEdit, SIGNAL(textChanged(QString)), m_searchTimer, SLOT(start()));
 
     QWidget* topWidget = new QWidget;
@@ -408,12 +406,6 @@ void PackageWidget::setSortedPackages()
     QApplication::restoreOverrideCursor();
 }
 
-void PackageWidget::sectionClicked(int section)
-{
-    Q_UNUSED(section);
-    m_proxyModel->setSortByRelevancy(false);
-}
-
 void PackageWidget::startSearch()
 {
     if (m_proxyModel->sourceModel()) {
diff --git a/src/PackageModel/PackageWidget.h b/src/PackageModel/PackageWidget.h
index 68d2e05..32372b2 100644
--- a/src/PackageModel/PackageWidget.h
+++ b/src/PackageModel/PackageWidget.h
@@ -119,7 +119,6 @@ private Q_SLOTS:
     void packageActivated(const QModelIndex &index);
     void contextMenuRequested(const QPoint &pos);
     void setSortedPackages();
-    void sectionClicked(int section);
 
     bool confirmEssentialRemoval();
     void saveState();