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

The following commit has been merged in the master branch:
commit cc5ec6c7dfa5aeb64920d8ed827f1fabaa3149dc
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Mon Nov 25 16:02:41 2013 +0100

    KTp::Contact: Get rid few condition double-checks
    
    REVIEW: 114106
    
    From 52a8b65c6c665dc04af53a2779192776069ebfe6 Mon Sep 17 00:00:00 2001
    From: Alexandr Akulich <akulichalexander at gmail.com>
    Date: Mon, 25 Nov 2013 18:19:49 +0600
    Subject: [PATCH 1/2] KTp/Contact: Get rid few condition double-checks.
---
 KTp/contact.cpp | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index 64dd49b..e94c963 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -59,57 +59,50 @@ bool KTp::Contact::textChatCapability() const
 
 bool KTp::Contact::audioCallCapability() const
 {
-    if (! manager()->connection()) {
+    if (!manager()->connection()) {
         return false;
     }
+
     Tp::ConnectionPtr connection = manager()->connection();
-    if (connection) {
-        bool contactCanStreamAudio = CapabilitiesHackPrivate::audioCalls(
-                                         capabilities(), connection->cmName());
-        bool selfCanStreamAudio = CapabilitiesHackPrivate::audioCalls(
-                                      connection->selfContact()->capabilities(), connection->cmName());
-        return contactCanStreamAudio && selfCanStreamAudio;
-    }
-    return false;
+    bool contactCanStreamAudio = CapabilitiesHackPrivate::audioCalls(
+                capabilities(), connection->cmName());
+    bool selfCanStreamAudio = CapabilitiesHackPrivate::audioCalls(
+                connection->selfContact()->capabilities(), connection->cmName());
+    return contactCanStreamAudio && selfCanStreamAudio;
 }
 
 bool KTp::Contact::videoCallCapability() const
 {
-    if (! manager()->connection()) {
+    if (!manager()->connection()) {
         return false;
     }
-    Tp::ConnectionPtr connection = manager()->connection();
-    if (connection) {
-        bool contactCanStreamVideo = CapabilitiesHackPrivate::videoCalls(
-                                         capabilities(), connection->cmName());
-        bool selfCanStreamVideo = CapabilitiesHackPrivate::videoCalls(
-                                      connection->selfContact()->capabilities(), connection->cmName());
-        return contactCanStreamVideo && selfCanStreamVideo;
-    }
 
-    return false;
+    Tp::ConnectionPtr connection = manager()->connection();
+    bool contactCanStreamVideo = CapabilitiesHackPrivate::videoCalls(
+                capabilities(), connection->cmName());
+    bool selfCanStreamVideo = CapabilitiesHackPrivate::videoCalls(
+                connection->selfContact()->capabilities(), connection->cmName());
+    return contactCanStreamVideo && selfCanStreamVideo;
 }
 
 bool KTp::Contact::fileTransferCapability()  const
 {
-    if (! manager()->connection()) {
+    if (!manager()->connection()) {
         return false;
     }
-    if (manager()->connection()) {
-        bool contactCanHandleFiles = capabilities().fileTransfers();
-        bool selfCanHandleFiles = manager()->connection()->selfContact()->capabilities().fileTransfers();
-        return contactCanHandleFiles && selfCanHandleFiles;
-    }
 
-    return false;
+    bool contactCanHandleFiles = capabilities().fileTransfers();
+    bool selfCanHandleFiles = manager()->connection()->selfContact()->capabilities().fileTransfers();
+    return contactCanHandleFiles && selfCanHandleFiles;
 }
 
 bool KTp::Contact::collaborativeEditingCapability() const
 {
-    if (! manager()->connection()) {
+    if (!manager()->connection()) {
         return false;
     }
-    const QString collab(QLatin1String("infinote"));
+
+    static const QString collab(QLatin1String("infinote"));
     bool selfCanShare = manager()->connection()->selfContact()->capabilities().streamTubes(collab);
     bool otherCanShare = capabilities().streamTubes(collab);
     return selfCanShare && otherCanShare;

-- 
ktp-common-internals packaging