Search history feature reviewed.

Reviewed by: Katri Kaikkonen

diff --git a/src/ui/locationsearchpanel.cpp b/src/ui/locationsearchpanel.cpp
index 5bfd2e6..648a202 100644 (file)
--- a/src/ui/locationsearchpanel.cpp
+++ b/src/ui/locationsearchpanel.cpp
@@ -20,7 +20,6 @@
     USA.
 */
 
-#include <QPair>
 #include <QSettings>
 
 #include "avatarimage.h"
@@ -115,14 +114,14 @@ LocationSearchPanel::LocationSearchPanel(QWidget *parent)
     m_clearLocationListButton->setDisabled(true);
 
     connect(m_clearLocationListButton, SIGNAL(clicked()),
-            this, SLOT(showSearchHistoryList()));
+            this, SLOT(showSearchHistoryListView()));
 
     m_contextButtonLayout->addWidget(m_routeButton);
     m_contextButtonLayout->addWidget(searchLocationButton);
     m_contextButtonLayout->addWidget(m_clearLocationListButton);
 
     readSettings();
-    showSearchHistoryList();
+    showSearchHistoryListView();
 }
 
 LocationSearchPanel::~LocationSearchPanel()
@@ -185,12 +184,8 @@ void LocationSearchPanel::populateLocationListView(const QList<Location> &locati
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_searchHistoryListView->clearItemSelection();
-    m_searchHistoryListView->hide();
-    setHeaderText(locations.count());
     m_locationListView->clearList();
-    m_clearLocationListButton->setEnabled(true);
-    m_locationListView->show();
+    showLocationListView(locations.count());
 
     for (int i = 0; i < locations.size(); ++i) {
         LocationListItem *item = new LocationListItem();
@@ -255,7 +250,18 @@ void LocationSearchPanel::setRouteButtonDisabled()
     m_routeButton->setDisabled(m_locationListView->selectedItems().isEmpty());
 }
 
-void LocationSearchPanel::showSearchHistoryList()
+void LocationSearchPanel::showLocationListView(int locationItemsCount)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_searchHistoryListView->clearItemSelection();
+    m_searchHistoryListView->hide();
+    setHeaderText(locationItemsCount);
+    m_clearLocationListButton->setEnabled(true);
+    m_locationListView->show();
+}
+
+void LocationSearchPanel::showSearchHistoryListView()
 {
     qDebug() << __PRETTY_FUNCTION__;
 

diff --git a/src/ui/locationsearchpanel.h b/src/ui/locationsearchpanel.h
index d86190a..f01890f 100644 (file)
--- a/src/ui/locationsearchpanel.h
+++ b/src/ui/locationsearchpanel.h
@@ -107,9 +107,16 @@ private slots:
     void clearListsSelections();
 
     /**
-    * @brief Shows search history list.
+    * @brief Shows location list view.
+    *
+    * @param locationItemsCount location items count
+    */
+    void showLocationListView(int locationItemsCount);
+
+    /**
+    * @brief Shows search history list view.
     */
-    void showSearchHistoryList();
+    void showSearchHistoryListView();
 
     /**
     * @brief Populates location list view.

diff --git a/src/ui/searchhistorylistitem.cpp b/src/ui/searchhistorylistitem.cpp
index bd0aaff..53fd7a4 100644 (file)
--- a/src/ui/searchhistorylistitem.cpp
+++ b/src/ui/searchhistorylistitem.cpp
@@ -41,10 +41,7 @@ void SearchHistoryListItem::setSearchHistoryData(const QString &searchString,
     qDebug() << __PRETTY_FUNCTION__;
 
     setDateTime(dateTime);
-
-    setTitle(shortenText(searchString, ITEM_WIDTH - 3 * MARGIN,
-                            ListItem::TEXT_SIZE_NORMAL));
-
+    setTitle(shortenText(searchString, ITEM_WIDTH - 3 * MARGIN, ListItem::TEXT_SIZE_NORMAL));
     setImage(AvatarImage::create(QPixmap(":/res/images/search_history.png"), AvatarImage::Small));
 
     clearSubItems();