[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=acc91df

The following commit has been merged in the master branch:
commit acc91df99a169e8528dc1ecabcc8239d3f30880b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 29 01:54:18 2013 +0000

    Remove pointless call to model index parent to count top level items
    
    BUG: 304085
    REVIEW: 110236
---
 global-presence-chooser.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 161476b..59d972d 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -92,21 +92,21 @@ QVariant PresenceModelExtended::data(const QModelIndex &index, int role) const
         const QFontMetrics fontMetrics(KGlobalSettings::generalFont());
         return QSize(0, qMax(fontMetrics.height(), (int)(KIconLoader::SizeSmall)) + 8);
     }
-    if (index.row() == rowCount(index.parent())-1) {
+    if (index.row() == rowCount(QModelIndex())-1) {
         switch(role) {
         case Qt::DisplayRole:
             return i18n("Configure Custom Presences...");
         case Qt::DecorationRole:
             return KIcon("configure");
         }
-    } else if (index.row() == rowCount(index.parent())-2) {
+    } else if (index.row() == rowCount(QModelIndex())-2) {
         switch(role) {
             case Qt::DisplayRole:
                 return i18n("Now listening to...");
             case Qt::DecorationRole:
                 return KIcon("speaker");
         }
-    } else if (m_temporaryPresence.isValid() && index.row() == rowCount(index.parent()) -3) {
+    } else if (m_temporaryPresence.isValid() && index.row() == rowCount(QModelIndex()) -3) {
         switch(role) {
         case Qt::DisplayRole:
             return m_temporaryPresence.statusMessage();

-- 
ktp-contact-list packaging