[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=f720f56

The following commit has been merged in the master branch:
commit f720f56c30d888adca974929189fa98d73915a1e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Jan 24 10:40:02 2013 +0100

    Use KTp::ContactFactory in KTp::ContactGridDialog
    
    Also add a Q_ASSERT_X to KTp::ContactsListModel::data() to be
    more descriptive about the why casting Tp::ContactPtr
    to KTp::ContactPtr failed.
---
 KTp/Models/contacts-list-model.cpp  | 2 ++
 KTp/Widgets/contact-grid-dialog.cpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index 5c4aaca..4f132af 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -115,6 +115,8 @@ QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const
 
     if (row >=0 && row < d->contacts.size()) {
         const KTp::ContactPtr contact = KTp::ContactPtr::qObjectCast(d->contacts[row]);
+        Q_ASSERT_X(!contact.isNull(), "KTp::ContactListModel::data()",
+                   "Failed to cast Tp::ContactPtr to KTp::ContactPtr. Are you using KTp::ContactFactory?");
 
         switch (role) {
         case ContactsModel::IdRole:
diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index a23014a..b9c639d 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -35,6 +35,7 @@
 #include <KTp/Models/contacts-list-model.h>
 #include <KTp/Models/contacts-filter-model.h>
 #include <KTp/Widgets/contact-grid-widget.h>
+#include <KTp/contact-factory.h>
 #include <telepathy-qt4/TelepathyQt/PendingChannelRequest>
 
 
@@ -118,7 +119,7 @@ KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
                                                                                               << Tp::Connection::FeatureRoster
                                                                                               << Tp::Connection::FeatureSelfContact);
 
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
+    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
                                                                                       << Tp::Contact::FeatureAvatarData
                                                                                       << Tp::Contact::FeatureSimplePresence
                                                                                       << Tp::Contact::FeatureCapabilities);

-- 
ktp-common-internals packaging