[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=2be5c7c

The following commit has been merged in the master branch:
commit 2be5c7c26fe2f447db12ba72d2763ea8456e30cd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 1 17:25:01 2013 +0000

    further fixes
---
 contact-list-widget.cpp | 2 +-
 context-menu.cpp        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index b3cbb3a..d95c532 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -216,7 +216,7 @@ void ContactListWidget::onContactListDoubleClicked(const QModelIndex& index)
     }
 
     if (index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType) {
-        Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
+        KTp::ContactPtr contact = index.data(KTp::ContactRole).value<KTp::ContactPtr>();
         Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
         startTextChannel(account, contact);
     }
diff --git a/context-menu.cpp b/context-menu.cpp
index af4cb5d..bc53c4e 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -81,7 +81,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
 
     m_currentIndex = index;
 
-    Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    KTp::ContactPtr contact = index.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     if (contact.isNull()) {
         kDebug() << "Contact is nulled";
@@ -483,7 +483,7 @@ void ContextMenu::onCreateNewGroupTriggered()
 
 void ContextMenu::onRenameGroupTriggered()
 {
-    if (m_currentIndex.data(ContactsModel::TypeRole).toUInt() != ContactsModel::GroupRowType) {
+    if (m_currentIndex.data(KTp::RowTypeRole).toUInt() != KTp::GroupRowType) {
         return;
     }
 
@@ -517,7 +517,7 @@ void ContextMenu::onRenameGroupTriggered()
 void ContextMenu::onDeleteGroupTriggered()
 {
     if (m_accountManager.isNull() ||
-        (m_currentIndex.data(ContactsModel::TypeRole).toUInt() != ContactsModel::GroupRowType)) {
+        (m_currentIndex.data(KTp::RowTypeRole).toUInt() != KTp::GroupRowType)) {
         return;
     }
 

-- 
ktp-contact-list packaging