[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=88dcd90

The following commit has been merged in the master branch:
commit 88dcd908fed2cb7b2a4b2c7753303dfeab82eef4
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Feb 1 18:42:21 2013 +0100

    Porting+++
---
 contact-overlays.cpp |  4 ++--
 context-menu.cpp     | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 0bcdd64..0caefc5 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -114,7 +114,7 @@ void StartChannelContactOverlay::slotClicked(bool checked)
 
     if (index.isValid()) {
         Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
-        Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
+        Tp::ContactPtr contact = index.data(KTp::ContactRole).value<KTp::ContactPtr>();
         if (account && contact) {
             emit activated(account, contact);
         }
@@ -123,7 +123,7 @@ void StartChannelContactOverlay::slotClicked(bool checked)
 
 bool StartChannelContactOverlay::checkIndex(const QModelIndex& index) const
 {
-    return index.data(m_capabilityRole).toBool() && index.data(ContactsModel::TypeRole).toInt() == ContactsModel::ContactRowType;
+    return index.data(m_capabilityRole).toBool() && index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType;
 }
 
 // ------------------------------------------------------------------------
diff --git a/context-menu.cpp b/context-menu.cpp
index bc53c4e..24a1ea0 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -313,7 +313,7 @@ void ContextMenu::onRemoveContactFromGroupTriggered()
     }
 
     const QString groupName = m_currentIndex.parent().data(Qt::DisplayRole).toString();
-    Tp::ContactPtr contact =  m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact =  m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     Tp::PendingOperation *operation = contact->removeFromGroup(groupName);
 
@@ -350,7 +350,7 @@ void ContextMenu::onStartTextChatTriggered()
         return;
     }
 
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (contact && account) {
@@ -360,7 +360,7 @@ void ContextMenu::onStartTextChatTriggered()
 
 void ContextMenu::onStartAudioChatTriggered()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (contact && account) {
@@ -375,7 +375,7 @@ void ContextMenu::onStartVideoChatTriggered()
         return;
     }
 
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (contact && account) {
@@ -390,7 +390,7 @@ void ContextMenu::onStartFileTransferTriggered()
         return;
     }
 
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (contact && account) {
@@ -405,7 +405,7 @@ void ContextMenu::onStartDesktopSharingTriggered()
         return;
     }
 
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (contact && account) {
@@ -420,7 +420,7 @@ void ContextMenu::onOpenLogViewerTriggered()
       return;
     }
 
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (contact && account) {
@@ -430,7 +430,7 @@ void ContextMenu::onOpenLogViewerTriggered()
 
 void ContextMenu::onUnblockContactTriggered()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     Tp::PendingOperation *operation = contact->unblock(); //FIXME
     connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -439,7 +439,7 @@ void ContextMenu::onUnblockContactTriggered()
 
 void ContextMenu::onAddContactToGroupTriggered()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     QAction *action = qobject_cast<QAction*>(sender());
     if (!action) {
@@ -473,7 +473,7 @@ void ContextMenu::onCreateNewGroupTriggered()
                                                  &ok);
 
     if (ok) {
-	Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+        Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
         Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
 
         connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -500,7 +500,7 @@ void ContextMenu::onRenameGroupTriggered()
     if (ok && groupName != newGroupName) {
         //loop through all child indexes of m_currentIndex
         for(int i = 0; i < model->rowCount(m_currentIndex); i++) {
-            Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(KTp::ContactRole).value<Tp::ContactPtr>();
+            Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(KTp::ContactRole).value<KTp::ContactPtr>();
             Q_ASSERT(contact);
 
             Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
@@ -531,7 +531,7 @@ void ContextMenu::onDeleteGroupTriggered()
                                            i18n("Remove Group")) == KMessageBox::Continue) {
 
         for(int i = 0; i < model->rowCount(m_currentIndex); i++) {
-            Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(KTp::ContactRole).value<Tp::ContactPtr>();
+            Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(KTp::ContactRole).value<KTp::ContactPtr>();
 
             Q_ASSERT(contact);
 
@@ -552,7 +552,7 @@ void ContextMenu::onDeleteGroupTriggered()
 
 void ContextMenu::onBlockContactTriggered()
 {
-    Tp::ContactPtr contact =  m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact =  m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     Tp::PendingOperation *operation = contact->block();
     connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -561,7 +561,7 @@ void ContextMenu::onBlockContactTriggered()
 
 void ContextMenu::onDeleteContactTriggered()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     QList<Tp::ContactPtr>contactList;
     contactList.append(contact);
@@ -590,7 +590,7 @@ void ContextMenu::onDeleteContactTriggered()
 
 void ContextMenu::onRerequestAuthorization()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::PendingOperation *op = contact->manager()->requestPresenceSubscription(QList<Tp::ContactPtr>() << contact);
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
@@ -598,7 +598,7 @@ void ContextMenu::onRerequestAuthorization()
 
 void ContextMenu::onResendAuthorization()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     Tp::PendingOperation *op = contact->manager()->authorizePresencePublication(QList<Tp::ContactPtr>() << contact);
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
@@ -606,7 +606,7 @@ void ContextMenu::onResendAuthorization()
 
 void ContextMenu::onNotificationConfigureTriggered()
 {
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     KTp::NotificationConfigDialog *notificationDialog = new KTp::NotificationConfigDialog(contact, m_mainWidget);
     notificationDialog->show();

-- 
ktp-contact-list packaging