Various small fixes in file transfer related files to eliminate compilation warnings...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@563 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/rfb/SFileTransfer.cxx b/rfb/SFileTransfer.cxx
index 9161fff793e7781c640a8c4f42ddd91c43308809..0a8b40e90cfb501663c057101acfc04932cbe33d 100644 (file)
--- a/rfb/SFileTransfer.cxx
+++ b/rfb/SFileTransfer.cxx
@@ -199,6 +199,9 @@ SFileTransfer::processFileUploadData()
       }
     }
   }
+  // FIXME: For the next line, gcc says:
+  //        warning: deleting `void *' is undefined
+  //        Perhaps it should not be `void *' at all.
   delete [] pUploadData;
   return true;
 }

diff --git a/rfb/SFileTransfer.h b/rfb/SFileTransfer.h
index 62bed406ae00afce7bdfa8dbafabffb82cba40cf..51a49282516d7f549d9f3aff26a41412efe5d8f8 100644 (file)
--- a/rfb/SFileTransfer.h
+++ b/rfb/SFileTransfer.h
@@ -39,9 +39,9 @@ namespace rfb {
   {
   public:
     SFileTransfer(network::Socket *sock);
-    ~SFileTransfer();
+    virtual ~SFileTransfer();
 
-       bool processMessages(int type);
+    bool processMessages(int type);
     bool sendFileDownloadPortion();
 
   protected:

diff --git a/rfb/SFileTransferManager.cxx b/rfb/SFileTransferManager.cxx
index d8b231af398b209e2c08718dd0f54d1c06611eab..999a079bd09ff98f20ae6cdfb627078a528343a1 100644 (file)
--- a/rfb/SFileTransferManager.cxx
+++ b/rfb/SFileTransferManager.cxx
@@ -52,4 +52,4 @@ SFileTransferManager::destroy()
 {
   while(!m_lstFTObjects.empty())
     delete m_lstFTObjects.front();
-}
\ No newline at end of file
+}

diff --git a/rfb/SFileTransferManager.h b/rfb/SFileTransferManager.h
index 4ee1406e0efaf263cd874dae9af2f0691bdff24b..fe816444fb0ed53a12d55e5d37060646f1707e0d 100644 (file)
--- a/rfb/SFileTransferManager.h
+++ b/rfb/SFileTransferManager.h
@@ -36,7 +36,7 @@ namespace rfb {
   {
   public:
     SFileTransferManager();
-    ~SFileTransferManager();
+    virtual ~SFileTransferManager();
 
     virtual SFileTransfer *createObject(network::Socket *sock) = 0;
     void destroyObject(SFileTransfer *pFT);

diff --git a/rfb_win32/SFileTransferManagerWin32.h b/rfb_win32/SFileTransferManagerWin32.h
index b98de4f01aeb68b17ad32fe44becfdd9ca6c0f93..ed1f997a98e30f8d9f8315caab80f1b926d24c82 100644 (file)
--- a/rfb_win32/SFileTransferManagerWin32.h
+++ b/rfb_win32/SFileTransferManagerWin32.h
@@ -36,8 +36,8 @@ namespace rfb {
     {
     public:
       SFileTransferManagerWin32();
-      ~SFileTransferManagerWin32();  
-      
+      virtual ~SFileTransferManagerWin32();
+
       void processDownloadMsg(MSG msg);
 
       virtual SFileTransfer *createObject(network::Socket *sock);

diff --git a/rfb_win32/SFileTransferWin32.h b/rfb_win32/SFileTransferWin32.h
index f4c87ea8958f921254cf757c0460280414e15f5a..5f682a443f5b06b15363fde50fb1b38d2eb43281 100644 (file)
--- a/rfb_win32/SFileTransferWin32.h
+++ b/rfb_win32/SFileTransferWin32.h
@@ -38,7 +38,7 @@ namespace rfb {
     {
     public:
       SFileTransferWin32(network::Socket *sock);
-      ~SFileTransferWin32();
+      virtual ~SFileTransferWin32();
 
       bool processDownloadCallback();
       virtual bool initDownloadCallback();