Renamed ListView::m_previousItem and RoutingPanel::anyPanelClosed().

diff --git a/src/ui/listview.cpp b/src/ui/listview.cpp
index 34d090c..55292f1 100644 (file)
--- a/src/ui/listview.cpp
+++ b/src/ui/listview.cpp
@@ -27,7 +27,7 @@
 
 ListView::ListView(QWidget *parent)
     : QListWidget(parent),
-      m_previousItem(0)
+      m_currentItem(0)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -60,8 +60,8 @@ void ListView::clearItemSelection()
 {
     clearSelection();
 
-    if (m_previousItem)
-        m_previousItem->setSelected(false);
+    if (m_currentItem)
+        m_currentItem->setSelected(false);
 }
 
 void ListView::clearList()
@@ -72,7 +72,7 @@ void ListView::clearList()
     m_listItems.clear();
     clear();
 
-    m_previousItem = 0;
+    m_currentItem = 0;
 }
 
 void ListView::clearUnused(const QStringList &itemIDs)
@@ -84,8 +84,8 @@ void ListView::clearUnused(const QStringList &itemIDs)
             ListItem *item = m_listItems.take(key);
             if (item) {
                 takeItem(row(item));
-                if (m_previousItem == item)
-                    m_previousItem = 0;
+                if (m_currentItem == item)
+                    m_currentItem = 0;
                 delete item;
             }
         }
@@ -164,23 +164,23 @@ ListItem *ListView::takeListItemFromView(const QString &itemID)
     return item;
 }
 
-bool ListView::listItemClicked(ListItem *item)
+bool ListView::listItemClicked(ListItem *clickedItem)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (m_previousItem == item) {
-        item->toggleSelection();
+    if (m_currentItem == clickedItem) {
+        clickedItem->toggleSelection();
     } else {
-        if (m_previousItem)
-            m_previousItem->setSelected(false);
+        if (m_currentItem)
+            m_currentItem->setSelected(false);
 
-        item->setSelected(true);
+        clickedItem->setSelected(true);
     }
-    m_previousItem = item;
+    m_currentItem = clickedItem;
 
     emit listItemSelectionChanged();
 
-    return item->isSelected();
+    return clickedItem->isSelected();
 }
 
 void ListView::listItemClicked(QListWidgetItem *item)

diff --git a/src/ui/listview.h b/src/ui/listview.h
index 821c608..6da9b6b 100644 (file)
--- a/src/ui/listview.h
+++ b/src/ui/listview.h
@@ -172,15 +172,17 @@ protected slots:
     * @brief Slot for list item clicked.
     *
     * Toggles items selection state and emits listItemClicked signal.
+    * @param clickedItem clicked ListItem
     * @return true if item was selected, false otherwise
     */
-    virtual bool listItemClicked(ListItem *item);
+    virtual bool listItemClicked(ListItem *clickedItem);
 
 private slots:
     /**
     * @brief Slot for list item clicked.
     *
     * Calls listItemClicked(ListItem *item)
+    * @param item QListWidgetItem
     */
     void listItemClicked(QListWidgetItem *item);
 
@@ -195,7 +197,7 @@ private:
 
     QList<QString> m_filteredItemIDs;       ///< List of filtered item IDs
 
-    ListItem *m_previousItem;               ///< Previously selected item
+    ListItem *m_currentItem;               ///< Previously selected item
 };
 
 #endif // LISTVIEW_H

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index a224ddd..47777de 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -344,7 +344,7 @@ void MainWindow::buildPanels()
             m_friendsListPanel, SLOT(anyPanelOpened()));
 
     connect(m_tabbedPanel, SIGNAL(panelClosed()),
-            m_routingPanel, SLOT(anyPanelClosed()));
+            m_routingPanel, SLOT(clearListsSelections()));
 }
 
 void MainWindow::buildRoutingPanel()

diff --git a/src/ui/routingpanel.cpp b/src/ui/routingpanel.cpp
index 49b611e..f730136 100644 (file)
--- a/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@ -80,7 +80,7 @@ RoutingPanel::RoutingPanel(QWidget *parent)
             this, SIGNAL(requestSearchLocation()));
 }
 
-void RoutingPanel::anyPanelClosed()
+void RoutingPanel::clearListsSelections()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -96,9 +96,7 @@ void RoutingPanel::hideEvent(QHideEvent *event)
 
     QWidget::hideEvent(event);
 
-    m_locationListView->clearItemSelection();
-    m_routeWaypointListView->clearItemSelection();
-    setRouteButtonDisabled();
+    clearListsSelections();
 }
 
 void RoutingPanel::populateLocationListView(const QList<Location> &locations)

diff --git a/src/ui/routingpanel.h b/src/ui/routingpanel.h
index 6167168..1ba979c 100644 (file)
--- a/src/ui/routingpanel.h
+++ b/src/ui/routingpanel.h
@@ -55,7 +55,7 @@ protected:
     /**
     * @brief Re-implemented from QWidget::hideEvent()
     *
-    * Clears lists' selections.
+    * Calls clearListsSelections()
     *
     * @param event
     */
@@ -66,11 +66,11 @@ protected:
  ******************************************************************************/
 private slots:
     /**
-    * @brief Called when any of the panel tabs is closed
+    * @brief Clears lists' selections.
     *
     * Does call setRouteButtonDisabled().
     */
-    void anyPanelClosed();
+    void clearListsSelections();
 
     /**
     * @brief Populates location list view.