Alphabetising

diff --git a/src/ui/extendedlistitem.cpp b/src/ui/extendedlistitem.cpp
index 7e0b859..6d6e1f8 100644 (file)
--- a/src/ui/extendedlistitem.cpp
+++ b/src/ui/extendedlistitem.cpp
@@ -44,6 +44,14 @@ ExtendedListItem::ExtendedListItem()
     setData(SUBITEM_STORE_INDEX, qVariantFromValue((void *) m_subItemStoreList));
 }
 
+ExtendedListItem::~ExtendedListItem()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    clearSubItems();
+    delete m_subItemStoreList;
+}
+
 void ExtendedListItem::addSubItem(const QString &text, const QPixmap &icon)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -81,17 +89,6 @@ QRect ExtendedListItem::boundingRect(const QString &text)
     return textRect;
 }
 
-void ExtendedListItem::clearSubItems()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    qDeleteAll(m_subItemStoreList->begin(), m_subItemStoreList->end());
-    m_subItemStoreList->clear();
-
-    m_expandedHeight = ITEM_MIN_HEIGHT;
-    m_normalHeight = ITEM_MIN_HEIGHT;
-}
-
 QRect ExtendedListItem::calculateExpandedTextRect(const QString &text)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -113,19 +110,22 @@ QRect ExtendedListItem::calculateExpandedTextRect(const QString &text)
     return expandedTextRect;
 }
 
-void ExtendedListItem::setSubitemTextWidth(int width)
+void ExtendedListItem::clearSubItems()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_subItemTextWidth = width;
+    qDeleteAll(m_subItemStoreList->begin(), m_subItemStoreList->end());
+    m_subItemStoreList->clear();
+
+    m_expandedHeight = ITEM_MIN_HEIGHT;
+    m_normalHeight = ITEM_MIN_HEIGHT;
 }
 
-bool ExtendedListItem::toggleSelection()
+void ExtendedListItem::setSubitemTextWidth(int width)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    setSelected(!m_selected);
-    return m_selected;
+    m_subItemTextWidth = width;
 }
 
 void ExtendedListItem::setSelected(bool selected)
@@ -142,10 +142,10 @@ void ExtendedListItem::setSelected(bool selected)
         setData(ITEM_SIZE_HINT_INDEX, QSize(ITEM_WIDTH, m_normalHeight));
 }
 
-ExtendedListItem::~ExtendedListItem()
+bool ExtendedListItem::toggleSelection()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    clearSubItems();
-    delete m_subItemStoreList;
+    setSelected(!m_selected);
+    return m_selected;
 }

diff --git a/src/ui/friendlistitem.cpp b/src/ui/friendlistitem.cpp
index c4491f2..ad48d3a 100644 (file)
--- a/src/ui/friendlistitem.cpp
+++ b/src/ui/friendlistitem.cpp
@@ -36,44 +36,16 @@ FriendListItem::FriendListItem()
     setSubitemTextWidth(SUBITEM_TEXT_MAX_WIDTH);
 }
 
-GeoCoordinate FriendListItem::coordinates() const
+FriendListItem::~FriendListItem()
 {
     qDebug() << __PRETTY_FUNCTION__;
-
-    return m_coordinates;
 }
 
-void FriendListItem::setUserData(User *user)
+GeoCoordinate FriendListItem::coordinates() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString unit;
-    double value;
-    user->distance(value, unit);
-    QString distanceText = QString::number(value) + " " + unit;
-    setData(DISTANCE_TEXT_DISPLAY_INDEX, distanceText);
-    setDistanceIcon(value, unit);
-
-    //Dummy value to get painter font metrics.
-    QPixmap p = QPixmap(ICON_WIDTH, ICON_HEIGHT);
-    QPainter painter(&p);
-    painter.setFont(NOKIA_FONT_SMALL);
-    QFontMetrics distanceTextFontMetrics = painter.fontMetrics();
-    QRect distanceRect = distanceTextFontMetrics.boundingRect(distanceText);
-
-    setData(DISTANCE_SIZE_HINT_INDEX, distanceRect);
-    setTitle(shortenText(user->name(), NAME_TEXT_MAX_WIDTH - distanceRect.width() + MARGIN,
-                        ListItem::TEXT_SIZE_NORMAL));
-    setCoordinates(user->coordinates());
-
-    if (!user->profileImage().isNull())
-        setImage(user->profileImage());
-
-    clearSubItems();
-
-    addSubItem(user->note(), QPixmap(":/res/images/envelope.png"));
-    addSubItem(user->address(), QPixmap(":/res/images/compass.png"));
-    addSubItem(user->timestamp(), QPixmap(":/res/images/clock.png"));
+    return m_coordinates;
 }
 
 void FriendListItem::setAvatarImage(const QPixmap &image)
@@ -113,7 +85,35 @@ void FriendListItem::setDistanceIcon(double value, const QString &unit)
     setData(DISTANCE_IMAGE_INDEX, distanceImage);
 }
 
-FriendListItem::~FriendListItem()
+void FriendListItem::setUserData(User *user)
 {
     qDebug() << __PRETTY_FUNCTION__;
+
+    QString unit;
+    double value;
+    user->distance(value, unit);
+    QString distanceText = QString::number(value) + " " + unit;
+    setData(DISTANCE_TEXT_DISPLAY_INDEX, distanceText);
+    setDistanceIcon(value, unit);
+
+    //Dummy value to get painter font metrics.
+    QPixmap p = QPixmap(ICON_WIDTH, ICON_HEIGHT);
+    QPainter painter(&p);
+    painter.setFont(NOKIA_FONT_SMALL);
+    QFontMetrics distanceTextFontMetrics = painter.fontMetrics();
+    QRect distanceRect = distanceTextFontMetrics.boundingRect(distanceText);
+
+    setData(DISTANCE_SIZE_HINT_INDEX, distanceRect);
+    setTitle(shortenText(user->name(), NAME_TEXT_MAX_WIDTH - distanceRect.width() + MARGIN,
+                        ListItem::TEXT_SIZE_NORMAL));
+    setCoordinates(user->coordinates());
+
+    if (!user->profileImage().isNull())
+        setImage(user->profileImage());
+
+    clearSubItems();
+
+    addSubItem(user->note(), QPixmap(":/res/images/envelope.png"));
+    addSubItem(user->address(), QPixmap(":/res/images/compass.png"));
+    addSubItem(user->timestamp(), QPixmap(":/res/images/clock.png"));
 }

diff --git a/src/ui/friendlistitem.h b/src/ui/friendlistitem.h
index 07ded37..ed16e4a 100644 (file)
--- a/src/ui/friendlistitem.h
+++ b/src/ui/friendlistitem.h
@@ -60,6 +60,13 @@ public:
     GeoCoordinate coordinates() const;
 
     /**
+    * @brief Sets avatar image for this item.
+    *
+    * @param image image
+    */
+    void setAvatarImage(const QPixmap &image);
+
+    /**
     * @brief Sets item's coordinates.
     *
     * @param coordinates GeoCoordinate
@@ -73,13 +80,6 @@ public:
     */
     void setUserData(User *user);
 
-    /**
-    * @brief Sets avatar image for this item.
-    *
-    * @param image image
-    */
-    void setAvatarImage(const QPixmap &image);
-
 private:
     /**
     * @brief Set distance icon.

diff --git a/src/ui/listitem.h b/src/ui/listitem.h
index 7c6e320..29600b0 100644 (file)
--- a/src/ui/listitem.h
+++ b/src/ui/listitem.h
@@ -48,13 +48,7 @@ public:
 /******************************************************************************
 * MEMBER FUNCTIONS AND SLOTS
 ******************************************************************************/
-    /**
-    * @brief Returns item's title.
-    *
-    * @return item's title
-    */
-    QString title() const;
-
+public:
     /**
     * @brief Sets item's image.
     *
@@ -94,6 +88,13 @@ public:
     QString shortenText(const QString &text, int textWidth, TextSize textSize);
 
     /**
+    * @brief Returns item's title.
+    *
+    * @return item's title
+    */
+    QString title() const;
+
+    /**
     * @brief Toggles selection.
     *
     * @return true if selection was toggled, false otherwise