Remove destroy functions

These are just confusing and obfuscating. Do a normal delete of
these objects instead.

diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index ce489b1bba0d0eefa18ef0a15cef9d4edf59a503..d7a9d852fa48e0377b904ad2cd75adfae9e7384c 100644 (file)
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -49,7 +49,8 @@ CConnection::CConnection()
 CConnection::~CConnection()
 {
   setFramebuffer(NULL);
-  if (csecurity) csecurity->destroy();
+  if (csecurity)
+    delete csecurity;
   delete reader_;
   reader_ = 0;
   delete writer_;

diff --git a/common/rfb/CSecurity.h b/common/rfb/CSecurity.h
index 3fedc50815b4a15beafbce83cb74d13308577678..4bf4b38e52e10b632a697a202381e27989865cad 100644 (file)
--- a/common/rfb/CSecurity.h
+++ b/common/rfb/CSecurity.h
@@ -46,7 +46,6 @@ namespace rfb {
   public:
     virtual ~CSecurity() {}
     virtual bool processMsg(CConnection* cc)=0;
-    virtual void destroy() { delete this; }
     virtual int getType() const = 0;
     virtual const char* description() const = 0;
     virtual bool isSecure() const { return false; }

diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index 6b810559664fb57cf50ff45b46c3d39abc6cd136..ae43254d2d4a6fd0c3af1b1a4eff7434d51a66b3 100644 (file)
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -64,7 +64,8 @@ SConnection::SConnection()
 
 SConnection::~SConnection()
 {
-  if (ssecurity) ssecurity->destroy();
+  if (ssecurity)
+    delete ssecurity;
   delete reader_;
   reader_ = 0;
   delete writer_;

diff --git a/common/rfb/SSecurity.h b/common/rfb/SSecurity.h
index 6da63c3ce6a6dd3e5b2024904f4c0d26be26164f..0280574db6f5961467917d2cfe9d2d3fea32edd9 100644 (file)
--- a/common/rfb/SSecurity.h
+++ b/common/rfb/SSecurity.h
@@ -54,7 +54,6 @@ namespace rfb {
   public:
     virtual ~SSecurity() {}
     virtual bool processMsg(SConnection* sc)=0;
-    virtual void destroy() { delete this; }
     virtual int getType() const = 0;
 
     // getUserName() gets the name of the user attempting authentication.  The