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

The following commit has been merged in the master branch:
commit dc1e60242600f12765fce885e94c111a35f7c5b9
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Sat Jul 26 23:27:58 2014 +0200

    NULL to nullptr.
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/otr-manager.cpp               | 2 +-
 otr-proxy/KTpProxy/otr-message.cpp               | 6 +++---
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 4 ++--
 otr-proxy/test/otr-test.cpp                      | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/otr-proxy/KTpProxy/otr-manager.cpp b/otr-proxy/KTpProxy/otr-manager.cpp
index d370d02..cb2b347 100644
--- a/otr-proxy/KTpProxy/otr-manager.cpp
+++ b/otr-proxy/KTpProxy/otr-manager.cpp
@@ -27,7 +27,7 @@ namespace {
 
     void updateTrustLevel(Session *session, ConnContext *context)
     {
-        if(context == NULL) return;
+        if(context == nullptr) return;
 
         TrustLevel level = TrustLevel::NOT_PRIVATE;
         switch(context->msgstate) {
diff --git a/otr-proxy/KTpProxy/otr-message.cpp b/otr-proxy/KTpProxy/otr-message.cpp
index f35ab9c..497cb25 100644
--- a/otr-proxy/KTpProxy/otr-message.cpp
+++ b/otr-proxy/KTpProxy/otr-message.cpp
@@ -24,7 +24,7 @@ namespace OTR
     Message::Message()
         : dir(MessageDirection::TO_PEER)
     {
-        message << Tp::MessagePart() << Tp::MessagePart(); 
+        message << Tp::MessagePart() << Tp::MessagePart();
         setType(Tp::ChannelTextMessageTypeNormal);
     }
 
@@ -70,7 +70,7 @@ namespace OTR
 
     Tp::ChannelTextMessageType Message::type() const
     {
-        return static_cast<Tp::ChannelTextMessageType>(message[0]["message-type"].variant().toUInt(NULL));
+        return static_cast<Tp::ChannelTextMessageType>(message[0][QLatin1String("message-type")].variant().toUInt(nullptr));
     }
 
     MessageDirection Message::direction() const
@@ -95,7 +95,7 @@ namespace OTR
 
     OtrlMessageEvent Message::getOTRevent() const
     {
-        return static_cast<OtrlMessageEvent>(message[0][QLatin1String("otr-message-event")].variant().toUInt(NULL));
+        return static_cast<OtrlMessageEvent>(message[0][QLatin1String("otr-message-event")].variant().toUInt(nullptr));
     }
 
     void Message::setOTRheader(const QString &header, const QString &text)
diff --git a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
index b3d43a0..3bde745 100644
--- a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
+++ b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
@@ -230,7 +230,7 @@ void OtrProxyChannel::Adaptee::stop(const Tp::Service::ChannelProxyInterfaceOTRA
 
 void OtrProxyChannel::Adaptee::onMessageReceived(const Tp::ReceivedMessage &receivedMessage)
 {
-    const uint id = receivedMessage.header()[QLatin1String("pending-message-id")].variant().toUInt(NULL);
+    const uint id = receivedMessage.header()[QLatin1String("pending-message-id")].variant().toUInt(nullptr);
     kDebug() << "Received message: " << receivedMessage.text() << " with id: " << id;
     messages.insert(id, receivedMessage);
     Q_EMIT messageReceived(receivedMessage.parts());
@@ -238,7 +238,7 @@ void OtrProxyChannel::Adaptee::onMessageReceived(const Tp::ReceivedMessage &rece
 
 void OtrProxyChannel::Adaptee::onPendingMessageRemoved(const Tp::ReceivedMessage &receivedMessage)
 {
-    const uint id = receivedMessage.header().value(QLatin1String("pending-message-id")).variant().toUInt(NULL);
+    const uint id = receivedMessage.header().value(QLatin1String("pending-message-id")).variant().toUInt(nullptr);
     if(messages.remove(id)) {
         Q_EMIT pendingMessagesRemoved(Tp::UIntList() << id);
     } else {
diff --git a/otr-proxy/test/otr-test.cpp b/otr-proxy/test/otr-test.cpp
index 7fd70e2..2bf5f65 100644
--- a/otr-proxy/test/otr-test.cpp
+++ b/otr-proxy/test/otr-test.cpp
@@ -150,10 +150,10 @@ class OTRTest : public QObject
 };
 
 OTRTest::OTRTest()
-: aliceMan(NULL),
-    bobMan(NULL),
-    aliceEnv(NULL),
-    bobEnv(NULL)
+: aliceMan(nullptr),
+    bobMan(nullptr),
+    aliceEnv(nullptr),
+    bobEnv(nullptr)
 {
 }
 

-- 
ktp-common-internals packaging