[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=69578b3

The following commit has been merged in the master branch:
commit 69578b39b82938673ea5533ce0d24dc9d4188f82
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sun Jul 19 15:00:56 2009 +0000

    Rough and ready port to TpQt4 0.1.8.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=999268
---
 KTp/Models/accounts-list-model.cpp |  6 +++---
 KTp/Models/accounts-list-model.h   | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index d62aa78..1ae396f 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -25,7 +25,7 @@
 #include <kcategorizedsortfilterproxymodel.h>
 #include <kdebug.h>
 
-#include <TelepathyQt4/Client/Account>
+#include <TelepathyQt4/Account>
 
 AccountsListModel::AccountsListModel(QObject *parent)
  : QAbstractListModel(parent)
@@ -87,9 +87,9 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
     return data;
 }
 
-void AccountsListModel::addAccount(Telepathy::Client::Account *account)
+void AccountsListModel::addAccount(Tp::AccountPtr account)
 {
-    kDebug() << "Creating a new AccountItem from account:" << account;
+    kDebug() << "Creating a new AccountItem from account:" << account.data();
     // Check if the account is already in the model.
     bool found = false;
 
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index f4f0e81..d46eac5 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -23,13 +23,9 @@
 
 #include <QtCore/QAbstractListModel>
 
-class AccountItem;
+#include <TelepathyQt4/Account>
 
-namespace Telepathy {
-    namespace Client {
-        class Account;
-    }
-}
+class AccountItem;
 
 class AccountsListModel : public QAbstractListModel
 {
@@ -41,7 +37,7 @@ public:
     virtual ~AccountsListModel();
     virtual int rowCount(const QModelIndex &index) const;
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    void addAccount(Telepathy::Client::Account *account);
+    void addAccount(Tp::AccountPtr account);
 
 private Q_SLOTS:
     void onAccountItemReady();

-- 
ktp-common-internals packaging