[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=82a26bb

The following commit has been merged in the master branch:
commit 82a26bbaddfd898374b039038e77702575cbe1e7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Aug 8 14:33:19 2012 +0100

    Async wallet usage, using wallet-utils from common internals
    
    Also fix some pointless code when deleting accounts which used to proxy via a model.
    This should hopefully fix the crash when removing accounts
    
    REVIEW: 105926
    BUG: 303060
    BUG: 293716
---
 KTp/Models/accounts-list-model.cpp | 13 -------------
 KTp/Models/accounts-list-model.h   |  1 -
 2 files changed, 14 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index c7837bc..4a015fa 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -186,19 +186,6 @@ void AccountsListModel::addAccount(const Tp::AccountPtr &account)
     }
 }
 
-void AccountsListModel::removeAccount(const QModelIndex &index)
-{
-    if (!index.isValid()) {
-        kDebug() << "Can't remove Account: Invalid index";
-        return;
-    }
-    AccountItem *accountItem = m_accounts.at(index.row());
-
-    Q_ASSERT(accountItem);
-
-    accountItem->remove();
-}
-
 void AccountsListModel::onAccountItemRemoved()
 {
     AccountItem *item = qobject_cast<AccountItem*>(sender());
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index 1791e67..1078667 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -51,7 +51,6 @@ public:
     virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
     virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
     void addAccount(const Tp::AccountPtr &account);
-    void removeAccount(const QModelIndex &index);
 
 Q_SIGNALS:
     void setTitleForCustomPages(QString, QList<QString>);

-- 
ktp-common-internals packaging