Remove unused deleteReaderAndWriter() method

diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 8ccd948b5cd9fef1b282e89c24b4164505031f03..8cfc2b26ac0dda68311d4c898a06b55b95cf8c0b 100644 (file)
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -43,11 +43,6 @@ CConnection::CConnection()
 CConnection::~CConnection()
 {
   if (csecurity) csecurity->destroy();
-  deleteReaderAndWriter();
-}
-
-void CConnection::deleteReaderAndWriter()
-{
   delete reader_;
   reader_ = 0;
   delete writer_;

diff --git a/common/rfb/CConnection.h b/common/rfb/CConnection.h
index 0109fe863ad1f693a54d7d8b01cf542bdad456c3..b767ede328f171dce6ac46d3fa814911d2df9965 100644 (file)
--- a/common/rfb/CConnection.h
+++ b/common/rfb/CConnection.h
@@ -101,13 +101,6 @@ namespace rfb {
 
     // Other methods
 
-    // deleteReaderAndWriter() deletes the reader and writer associated with
-    // this connection.  This may be useful if you want to delete the streams
-    // before deleting the SConnection to make sure that no attempt by the
-    // SConnection is made to read or write.
-    // XXX Do we really need this at all???
-    void deleteReaderAndWriter();
-
     CMsgReader* reader() { return reader_; }
     CMsgWriter* writer() { return writer_; }
 

diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index bfff70cfda2bc7448c275d40d32e63c1ac06dd89..cc15d7c45f74d9629ad83f5716cce89c36815c4b 100644 (file)
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -67,11 +67,6 @@ SConnection::SConnection()
 SConnection::~SConnection()
 {
   if (ssecurity) ssecurity->destroy();
-  deleteReaderAndWriter();
-}
-
-void SConnection::deleteReaderAndWriter()
-{
   delete reader_;
   reader_ = 0;
   delete writer_;

diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h
index ef1de2b3b15ddd55b642763b4f306d806af4e29d..b43cf0866420bf5c21d888d162e998f5a372f3b6 100644 (file)
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -140,13 +140,6 @@ namespace rfb {
     bool authenticated() { return (state_ == RFBSTATE_INITIALISATION ||
                                    state_ == RFBSTATE_NORMAL); }
 
-    // deleteReaderAndWriter() deletes the reader and writer associated with
-    // this connection.  This may be useful if you want to delete the streams
-    // before deleting the SConnection to make sure that no attempt by the
-    // SConnection is made to read or write.
-    // XXX Do we really need this at all???
-    void deleteReaderAndWriter();
-
     // throwConnFailedException() prints a message to the log, sends a conn
     // failed message to the client (if possible) and throws a
     // ConnFailedException.