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

The following commit has been merged in the master branch:
commit f5930e5b86cecc575cc351d8207abde8f2f5cfea
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 1 09:31:15 2013 +0000

    Port ContactGrid model to new roles
---
 KTp/Widgets/contact-grid-widget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index b19c423..303a869 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -30,8 +30,8 @@
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QListView>
 
+#include "types.h"
 #include <KTp/Models/contacts-list-model.h>
-#include <KTp/Models/contacts-model.h>
 #include <KTp/Models/contacts-filter-model.h>
 
 namespace KTp {
@@ -242,12 +242,12 @@ bool KTp::ContactGridWidget::hasSelection() const
 
 Tp::AccountPtr KTp::ContactGridWidget::selectedAccount() const
 {
-    return d->contactGridView->currentIndex().data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+    return d->contactGridView->currentIndex().data(KTp::AccountRole).value<Tp::AccountPtr>();
 }
 
 Tp::ContactPtr KTp::ContactGridWidget::selectedContact() const
 {
-    return d->contactGridView->currentIndex().data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+    return d->contactGridView->currentIndex().data(KTp::ContactRole).value<KTp::ContactPtr>();
 }
 
 KTp::ContactsFilterModel* KTp::ContactGridWidget::filter() const

-- 
ktp-common-internals packaging