[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=d0235c2

The following commit has been merged in the master branch:
commit d0235c21f11bea87a60a7747a23f6ab94092d5e5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 13 03:02:52 2013 +0000

    Revert "Supress unused kpeople rows the proxy mode"
    
    Turns out this is a really bad idea.
    Because we don't modify insertRow() signals we end up emitted signals on
    items that don't exist
    
    This reverts commit b7429ed2c840d43f020852a2d7d852c2bbf5bcfb.
---
 KTp/Models/kpeopletranslationproxy.cpp | 11 -----------
 KTp/Models/kpeopletranslationproxy.h   |  1 -
 2 files changed, 12 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index f5ecbfe..a9bce37 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -154,17 +154,6 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
     return mapToSource(proxyIndex).data(role);
 }
 
-int KPeopleTranslationProxy::rowCount(const QModelIndex &parent) const
-{
-    int realRowCount = QIdentityProxyModel::rowCount(parent);
-    if (realRowCount > 1) {
-        return realRowCount;
-    } else {
-        return 0;
-    }
-}
-
-
 QVariant KPeopleTranslationProxy::translatePresence(const QVariant &presenceName) const
 {
     if (presenceName == QLatin1String("available")) {
diff --git a/KTp/Models/kpeopletranslationproxy.h b/KTp/Models/kpeopletranslationproxy.h
index 0dc2dec..16dbd07 100644
--- a/KTp/Models/kpeopletranslationproxy.h
+++ b/KTp/Models/kpeopletranslationproxy.h
@@ -33,7 +33,6 @@ public:
     virtual ~KPeopleTranslationProxy();
 
     virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex &parent) const;
 
 private:
     QVariant translatePresence(const QVariant &presenceName) const;

-- 
ktp-common-internals packaging