Rename methods on DolphinFacetsWidget

Summary:
Small refactor patch to rename method names, from `ratingTerm` to `searchTerm`,
since its scope has grown bigger.

Test Plan: No behavior changes

Reviewers: #dolphin, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D26029

diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index c0b6c52438b8a63a17072b6c31459ff617d1d7f5..ea11a400f11dc900e9ab116465171b7386fc63fd 100644 (file)
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -86,7 +86,7 @@ DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     topLayout->addWidget(m_ratingSelector);
     topLayout->addWidget(m_tagsSelector);
 
-    resetOptions();
+    resetSearchTerms();
 }
 
 DolphinFacetsWidget::~DolphinFacetsWidget()
@@ -99,12 +99,12 @@ void DolphinFacetsWidget::changeEvent(QEvent *event)
         if (isEnabled()) {
             updateTagsSelector();
         } else {
-            resetOptions();
+            resetSearchTerms();
         }
     }
 }
 
-void DolphinFacetsWidget::resetOptions()
+void DolphinFacetsWidget::resetSearchTerms()
 {
     m_typeSelector->setCurrentIndex(0);
     m_dateSelector->setCurrentIndex(0);
@@ -115,7 +115,7 @@ void DolphinFacetsWidget::resetOptions()
     updateTagsMenu();
 }
 
-QString DolphinFacetsWidget::ratingTerm() const
+QString DolphinFacetsWidget::searchTerms() const
 {
     QStringList terms;
 
@@ -143,7 +143,7 @@ QString DolphinFacetsWidget::facetType() const
     return m_typeSelector->currentData().toString();
 }
 
-bool DolphinFacetsWidget::isRatingTerm(const QString& term) const
+bool DolphinFacetsWidget::isSearchTerm(const QString& term) const
 {
     const QStringList subTerms = term.split(' ', QString::SkipEmptyParts);
 
@@ -166,7 +166,7 @@ bool DolphinFacetsWidget::isRatingTerm(const QString& term) const
     return containsModified || containsRating || containsTag;
 }
 
-void DolphinFacetsWidget::setRatingTerm(const QString& term)
+void DolphinFacetsWidget::setSearchTerm(const QString& term)
 {
     // If term has sub terms, then the sub terms are always "rating" and "modified" terms.
     // If term has no sub terms, then the term itself is either a "rating" term or a "modified"

diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 5325074c6b649617a92bcd2c7ec111e879b63e59..84029c20fb4af19be6d04a326e2a1ef0c4c1355b 100644 (file)
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -52,13 +52,12 @@ public:
     explicit DolphinFacetsWidget(QWidget* parent = nullptr);
     ~DolphinFacetsWidget() override;
 
-    void resetOptions();
-
-    QString ratingTerm() const;
+    QString searchTerms() const;
     QString facetType() const;
 
-    bool isRatingTerm(const QString& term) const;
-    void setRatingTerm(const QString& term);
+    bool isSearchTerm(const QString& term) const;
+    void setSearchTerm(const QString& term);
+    void resetSearchTerms();
 
     void setFacetType(const QString& type);
 

diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp
index 4d5f8e132099810e19704c41cea636babcf00968..95efe9162a773b3951543e20786fdbb6017e951c 100644 (file)
--- a/src/search/dolphinquery.cpp
+++ b/src/search/dolphinquery.cpp
@@ -28,7 +28,7 @@
 
 namespace {
     /** Checks if a given term in the Baloo::Query::searchString() is a special search term.
-     * This is a copy of `DolphinFacetsWidget::isRatingTerm()` method.
+     * This is a copy of `DolphinFacetsWidget::isSearchTerm()` method.
      */
     bool isSearchTerm(const QString& term)
     {

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 302081d7d7450364853c19f7b90251a83d99afca..c216e171457f69f7b26092e41810e0f4468939de 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -478,7 +478,7 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
     query.addType(m_facetsWidget->facetType());
 
     QStringList queryStrings;
-    QString ratingQuery = m_facetsWidget->ratingTerm();
+    QString ratingQuery = m_facetsWidget->searchTerms();
     if (!ratingQuery.isEmpty()) {
         queryStrings << ratingQuery;
     }
@@ -523,11 +523,11 @@ void DolphinSearchBox::updateFromQuery(const DolphinQuery& query)
         m_fileNameButton->setChecked(true);
     }
 
-    m_facetsWidget->resetOptions();
+    m_facetsWidget->resetSearchTerms();
     m_facetsWidget->setFacetType(query.type());
     const QStringList searchTerms = query.searchTerms();
     for (const QString& searchTerm : searchTerms) {
-        m_facetsWidget->setRatingTerm(searchTerm);
+        m_facetsWidget->setSearchTerm(searchTerm);
     }
 
     m_startSearchTimer->stop();