[QTerm-cvs] SF.net SVN: qterm:[1325] trunk/qterm/src

[<si...@us...>]

Revision: 1325
          http://sourceforge.net/p/qterm/code/1325
Author:   sidos
Date:     2013-06-13 19:54:17 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
signal delayedCloseFinished is obsolete and signal connectionClosed is renamed to disconnected

Modified Paths:
--------------
    trunk/qterm/src/qtermsocket.cpp
    trunk/qterm/src/qtermtelnet.cpp
    trunk/qterm/src/qtermtelnet.h

Modified: trunk/qterm/src/qtermsocket.cpp
===================================================================
--- trunk/qterm/src/qtermsocket.cpp	2013-06-13 19:52:00 UTC (rev 1324)
+++ trunk/qterm/src/qtermsocket.cpp	2013-06-13 19:54:17 UTC (rev 1325)
@@ -51,8 +51,7 @@
 	
 	connect(m_socket, SIGNAL(connected()), this, SLOT(socketConnected()));
 	connect(m_socket, SIGNAL(hostFound()), this, SIGNAL(hostFound()));
-	connect(m_socket, SIGNAL(connectionClosed()), this, SIGNAL(connectionClosed()));
-	connect(m_socket, SIGNAL(delayedCloseFinished()), this, SIGNAL(delayedCloseFinished()));
+	connect(m_socket, SIGNAL(disconnected()), this, SIGNAL(connectionClosed()));
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
 	connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SIGNAL(error(QAbstractSocket::SocketError)));
 }
@@ -556,8 +555,7 @@
 	d_socket = new SocketPrivate();
 	connect(d_socket, SIGNAL(connected()), this, SIGNAL(connected()));
 	connect(d_socket, SIGNAL(hostFound()), this, SIGNAL(hostFound()));
-	connect(d_socket, SIGNAL(connectionClosed()), this, SIGNAL(connectionClosed()));
-	connect(d_socket, SIGNAL(delayedCloseFinished()), this, SIGNAL(delayedCloseFinished()));
+	connect(d_socket, SIGNAL(disconnected()), this, SIGNAL(connectionClosed()));
 	connect(d_socket, SIGNAL(readyRead()), this, SIGNAL(readyRead()));
 	connect(d_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SIGNAL(error(QAbstractSocket::SocketError)));
 	connect(d_socket, SIGNAL(SocketState(int)), this, SIGNAL(SocketState(int)));

Modified: trunk/qterm/src/qtermtelnet.cpp
===================================================================
--- trunk/qterm/src/qtermtelnet.cpp	2013-06-13 19:52:00 UTC (rev 1324)
+++ trunk/qterm/src/qtermtelnet.cpp	2013-06-13 19:54:17 UTC (rev 1325)
@@ -114,8 +114,6 @@
             this, SLOT(showError(QAbstractSocket::SocketError)));
     connect(socket, SIGNAL(hostFound()),
             this, SLOT(hostFound()));
-    connect(socket, SIGNAL(delayedCloseFinished()),
-            this, SLOT(delayCloseFinished()));
     connect(socket, SIGNAL(connectionClosed()),
             this, SLOT(closed()));
     connect(socket, SIGNAL(SocketState(int)),
@@ -278,16 +276,6 @@
     emit TelnetState(TSCLOSED);
 }
 /*------------------------------------------------------------------------
- * SLOT delayCloseFinished
- *------------------------------------------------------------------------
- */
-
-void Telnet::delayCloseFinished()
-{
-    bConnected = false;
-    emit TelnetState(TSCLOSEFINISH);
-}
-/*------------------------------------------------------------------------
  * SLOT hostFound
  *------------------------------------------------------------------------
  */

Modified: trunk/qterm/src/qtermtelnet.h
===================================================================
--- trunk/qterm/src/qtermtelnet.h	2013-06-13 19:52:00 UTC (rev 1324)
+++ trunk/qterm/src/qtermtelnet.h	2013-06-13 19:54:17 UTC (rev 1325)
@@ -135,7 +135,6 @@
     void socketReadyRead();
     void showError(QAbstractSocket::SocketError);
     void hostFound();
-    void delayCloseFinished();
     void closed();
 protected:
     //init structure fsm

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.