[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phoneblocker] frontends/blackberry/headless: Just simply connect the deleteLater() slot of the sock
From:       Laszlo Papp <lpapp () kde ! org>
Date:       2015-01-19 7:38:38
Message-ID: E1YD6v0-0006cm-L2 () scm ! kde ! org
[Download RAW message or body]

Git commit 8e0b936ca1f23e185e4a1d4d1c24c8520a89512b by Laszlo Papp.
Committed on 19/01/2015 at 07:34.
Pushed by lpapp into branch 'master'.

Just simply connect the deleteLater() slot of the socket to the disconnect

M  +1    -9    frontends/blackberry/headless/blocker.cpp
M  +0    -1    frontends/blackberry/headless/blocker.h

http://commits.kde.org/phoneblocker/8e0b936ca1f23e185e4a1d4d1c24c8520a89512b

diff --git a/frontends/blackberry/headless/blocker.cpp b/frontends/blackberry/headless/blocker.cpp
index 5dde205..87aa80b 100644
--- a/frontends/blackberry/headless/blocker.cpp
+++ b/frontends/blackberry/headless/blocker.cpp
@@ -184,7 +184,7 @@ void Blocker::listen()
 void Blocker::handleNewConnection()
 {
     m_socket = m_server.nextPendingConnection();
-    connect(m_socket, SIGNAL(disconnected()), SLOT(disconnected()));
+    connect(m_socket, SIGNAL(disconnected()), m_socket, SLOT(deleteLater()));
     connect(m_socket, SIGNAL(readyRead()), SLOT(read()));
 }
 
@@ -242,11 +242,3 @@ void Blocker::read()
         else if (ccall == 'u') unblockCall(phoneNumber);
     }
 }
-
-void Blocker::handleDisconnected()
-{
-    disconnect(m_socket, SIGNAL(disconnected()), this, SLOT(disconnected()));
-    disconnect(m_socket, SIGNAL(readyRead()), this, SLOT(readyRead()));
-    m_socket->close();
-    m_socket->deleteLater();
-}
diff --git a/frontends/blackberry/headless/blocker.h b/frontends/blackberry/headless/blocker.h
index 70fd91c..a201710 100644
--- a/frontends/blackberry/headless/blocker.h
+++ b/frontends/blackberry/headless/blocker.h
@@ -65,7 +65,6 @@ private Q_SLOTS:
     void listen();
     void handleNewConnection();
     void read();
-    void handleDisconnected();
 
 private:
     bb::system::phone::Phone m_phone;
[prev in list] [next in list] [prev in thread] [next in thread]