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

The following commit has been merged in the master branch:
commit 923296574aa3e4d222e8724c7333b8cd57ec56de
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Sat Sep 29 03:42:55 2012 +0530

    Follow kdelibs coding style, star alignment to the right
---
 context-menu.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index e3b6e18..4d30c78 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -318,7 +318,7 @@ void ContextMenu::onShowInfoTriggered()
         return;
     }
 
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     if (item) {
         QWeakPointer<ContactInfo> contactInfoDialog = new ContactInfo(item->contact(), m_mainWidget);
         contactInfoDialog.data()->setAttribute(Qt::WA_DeleteOnClose);
@@ -333,7 +333,7 @@ void ContextMenu::onStartTextChatTriggered()
         return;
     }
 
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     if (item) {
         m_mainWidget->startTextChannel(item);
     }
@@ -346,7 +346,7 @@ void ContextMenu::onStartAudioChatTriggered()
         return;
     }
 
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     if (item) {
         m_mainWidget->startAudioChannel(item);
     }
@@ -359,7 +359,7 @@ void ContextMenu::onStartVideoChatTriggered()
         return;
     }
 
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     if (item) {
         m_mainWidget->startVideoChannel(item);
     }
@@ -372,7 +372,7 @@ void ContextMenu::onStartFileTransferTriggered()
         return;
     }
 
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     if (item) {
         m_mainWidget->startFileTransferChannel(item);
     }
@@ -385,7 +385,7 @@ void ContextMenu::onStartDesktopSharingTriggered()
         return;
     }
 
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     if (item) {
         m_mainWidget->startDesktopSharing(item);
     }
@@ -393,7 +393,7 @@ void ContextMenu::onStartDesktopSharingTriggered()
 
 void ContextMenu::onUnblockContactTriggered()
 {
-    ContactModelItem* item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *item = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     Q_ASSERT(item);
 
     Tp::ContactPtr contact = item->contact();
@@ -405,7 +405,7 @@ void ContextMenu::onUnblockContactTriggered()
 
 void ContextMenu::onAddContactToGroupTriggered()
 {
-    ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
 
     Q_ASSERT(contactItem);
     Tp::ContactPtr contact =  contactItem->contact();
@@ -529,7 +529,7 @@ void ContextMenu::onBlockContactTriggered()
 
 void ContextMenu::onDeleteContactTriggered()
 {
-    ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
 
     Q_ASSERT(contactItem);
     Tp::ContactPtr contact =  contactItem->contact();
@@ -561,7 +561,7 @@ void ContextMenu::onDeleteContactTriggered()
 
 void ContextMenu::onRerequestAuthorization()
 {
-    ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     Tp::PendingOperation *op = contactItem->contact()->manager()->requestPresenceSubscription(QList<Tp::ContactPtr>() << contactItem->contact());
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
@@ -569,7 +569,7 @@ void ContextMenu::onRerequestAuthorization()
 
 void ContextMenu::onResendAuthorization()
 {
-    ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
     Tp::PendingOperation *op = contactItem->contact()->manager()->authorizePresencePublication(QList<Tp::ContactPtr>() << contactItem->contact());
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
@@ -577,7 +577,7 @@ void ContextMenu::onResendAuthorization()
 
 void ContextMenu::onNotificationConfigureTriggered()
 {
-    ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
 
     Q_ASSERT(contactItem);
     Tp::ContactPtr contact = contactItem->contact();

-- 
ktp-contact-list packaging