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

The following commit has been merged in the master branch:
commit bb2f9835910c4a5f19b011aee3d141169a2d6520
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Nov 15 20:36:21 2012 +0100

    Replace tabs with spaces and fix alignment
---
 KTp/actions.cpp | 54 +++++++++++++++++++++++++++---------------------------
 KTp/actions.h   | 28 ++++++++++++++--------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/KTp/actions.cpp b/KTp/actions.cpp
index 695ad9c..879b54e 100644
--- a/KTp/actions.cpp
+++ b/KTp/actions.cpp
@@ -35,75 +35,75 @@
 using namespace KTp;
 
 Tp::PendingChannelRequest* Actions::startChat(const Tp::AccountPtr& account,
-					       const Tp::ContactPtr& contact,
-					       bool delegateToPreferredHandler)
+                                              const Tp::ContactPtr& contact,
+                                              bool delegateToPreferredHandler)
 {
     kDebug() << "Requesting text channel for" << contact->id();
 
     Tp::ChannelRequestHints hints;
     if (delegateToPreferredHandler) {
       hints.setHint(QLatin1String("org.freedesktop.Telepathy.ChannelRequest"),
-		    QLatin1String("DelegateToPreferredHandler"),
-		    QVariant(true));
+                    QLatin1String("DelegateToPreferredHandler"),
+                    QVariant(true));
     }
 
     return account->ensureTextChat(contact,
-				   QDateTime::currentDateTime(),
-				   PREFERRED_TEXT_CHAT_HANDLER,
-				   hints);
+                                   QDateTime::currentDateTime(),
+                                   PREFERRED_TEXT_CHAT_HANDLER,
+                                   hints);
 }
 
 Tp::PendingChannelRequest* Actions::startAudioCall(const Tp::AccountPtr& account,
-						    const Tp::ContactPtr& contact)
+                                                   const Tp::ContactPtr& contact)
 {
     kDebug() << "Requesting audio channel for" << contact->id();
 
     return account->ensureAudioCall(contact,
-				    QLatin1String("audio"),
-				    QDateTime::currentDateTime(),
-				    PREFERRED_AUDIO_VIDEO_HANDLER);
+                                    QLatin1String("audio"),
+                                    QDateTime::currentDateTime(),
+                                    PREFERRED_AUDIO_VIDEO_HANDLER);
 }
 
 Tp::PendingChannelRequest* Actions::startAudioVideoCall(const Tp::AccountPtr& account,
-							 const Tp::ContactPtr& contact)
+                                                        const Tp::ContactPtr& contact)
 {
     kDebug() << "Requesting audio-video channel for" << contact->id();
 
     return account->ensureAudioVideoCall(contact,
-					 QLatin1String("audio"),
-					 QLatin1String("video"),
-					 QDateTime::currentDateTime(),
-					 PREFERRED_AUDIO_VIDEO_HANDLER);
+                                         QLatin1String("audio"),
+                                         QLatin1String("video"),
+                                         QDateTime::currentDateTime(),
+                                         PREFERRED_AUDIO_VIDEO_HANDLER);
 }
 
 Tp::PendingChannelRequest* Actions::startDesktopSharing(const Tp::AccountPtr& account,
-							 const Tp::ContactPtr& contact)
+                                                        const Tp::ContactPtr& contact)
 {
     kDebug() << "Requesting stream tube for" << contact->id();
 
     return account->createStreamTube(contact,
-				     QLatin1String("rfb"),
-				     QDateTime::currentDateTime(),
-				     PREFERRED_RFB_HANDLER);
+                                     QLatin1String("rfb"),
+                                     QDateTime::currentDateTime(),
+                                     PREFERRED_RFB_HANDLER);
 }
 
 Tp::PendingChannelRequest* Actions::startFileTransfer(const Tp::AccountPtr& account,
-						       const Tp::ContactPtr& contact,
-						       const QString& filePath)
+                                                      const Tp::ContactPtr& contact,
+                                                      const QString& filePath)
 {
     kDebug() << "Requesting file transfer of" << filePath << "to" << contact->id();
 
     Tp::FileTransferChannelCreationProperties fileTransferProperties(
-		  filePath, KMimeType::findByFileContent(filePath)->name());
+                  filePath, KMimeType::findByFileContent(filePath)->name());
 
     return account->createFileTransfer(contact,
-					fileTransferProperties,
-					QDateTime::currentDateTime(),
-					PREFERRED_FILE_TRANSFER_HANDLER);
+                                       fileTransferProperties,
+                                       QDateTime::currentDateTime(),
+                                       PREFERRED_FILE_TRANSFER_HANDLER);
 }
 
 void Actions::openLogViewer(const Tp::AccountPtr& account,
-			     const Tp::ContactPtr& contact)
+                            const Tp::ContactPtr& contact)
 {
     kDebug() << "Opening logviewer for" << contact->id();
 
diff --git a/KTp/actions.h b/KTp/actions.h
index 417383f..d825bae 100644
--- a/KTp/actions.h
+++ b/KTp/actions.h
@@ -31,25 +31,25 @@ namespace KTp {
 
 namespace Actions {
 
-  KTP_EXPORT Tp::PendingChannelRequest* startChat(const Tp::AccountPtr &account,
-						  const Tp::ContactPtr &contact,
-						  bool delegateToPreferredHandler = true);
+    KTP_EXPORT Tp::PendingChannelRequest* startChat(const Tp::AccountPtr &account,
+                                                    const Tp::ContactPtr &contact,
+                                                    bool delegateToPreferredHandler = true);
 
-  KTP_EXPORT Tp::PendingChannelRequest* startAudioCall(const Tp::AccountPtr &account,
-						       const Tp::ContactPtr &contact);
+    KTP_EXPORT Tp::PendingChannelRequest* startAudioCall(const Tp::AccountPtr &account,
+                                                         const Tp::ContactPtr &contact);
 
-  KTP_EXPORT Tp::PendingChannelRequest* startAudioVideoCall(const Tp::AccountPtr &account,
-							    const Tp::ContactPtr &contact);
+    KTP_EXPORT Tp::PendingChannelRequest* startAudioVideoCall(const Tp::AccountPtr &account,
+                                                              const Tp::ContactPtr &contact);
 
-  KTP_EXPORT Tp::PendingChannelRequest* startDesktopSharing(const Tp::AccountPtr &account,
-							    const Tp::ContactPtr &contact);
+    KTP_EXPORT Tp::PendingChannelRequest* startDesktopSharing(const Tp::AccountPtr &account,
+                                                              const Tp::ContactPtr &contact);
 
-  KTP_EXPORT Tp::PendingChannelRequest* startFileTransfer(const Tp::AccountPtr &account,
-							  const Tp::ContactPtr &contact,
-							  const QString &filePath);
+    KTP_EXPORT Tp::PendingChannelRequest* startFileTransfer(const Tp::AccountPtr &account,
+                                                            const Tp::ContactPtr &contact,
+                                                            const QString &filePath);
 
-  KTP_EXPORT void openLogViewer(const Tp::AccountPtr &account,
-				const Tp::ContactPtr &contact);
+    KTP_EXPORT void openLogViewer(const Tp::AccountPtr &account,
+                                  const Tp::ContactPtr &contact);
 
 
 } /* namespace Actions */

-- 
ktp-common-internals packaging