Merge branch 'fix-warnings'

diff --cc common/rfb/CMsgWriter.h
Simple merge

diff --cc common/rfb/InputHandler.h
index 0344bc3f97f9ec62788ff60918106a5b3edfcb3c,727f69bbd6395c12cf50804cd68e7d1e4328d4ee..6c0728490136b29e14c8f21f7df5f62d42eb013d
--- 1/common/rfb/InputHandler.h
--- 2/common/rfb/InputHandler.h
+++ b/common/rfb/InputHandler.h
@@@ -31,9 -32,12 +32,13 @@@ namespace rfb 
    class InputHandler {
    public:
      virtual ~InputHandler() {}
-     virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down) {}
-     virtual void pointerEvent(const Point& pos, int buttonMask) {}
-     virtual void clientCutText(const char* str, int len) {}
 -    virtual void keyEvent(rdr::U32 __unused_attr key,
++    virtual void keyEvent(rdr::U32 __unused_attr keysym,
++                          rdr::U32 __unused_attr keycode,
+                           bool __unused_attr down) { }
+     virtual void pointerEvent(const Point& __unused_attr pos,
+                               int __unused_attr buttonMask) { }
+     virtual void clientCutText(const char* __unused_attr str,
+                                int __unused_attr len) { }
    };
  
  }

diff --cc common/rfb/SMsgWriter.h
Simple merge

diff --cc common/rfb/UserPasswdGetter.h
index 13493e4d5c71c14851b37e00cfca69d36abf75d2,aa72c1dd403f44662e1c242a36cb9b9cf1efb3e9..27775cc392c9ba5d5b2afedf0fc9d57bdf47adfb
--- 1/common/rfb/UserPasswdGetter.h
--- 2/common/rfb/UserPasswdGetter.h
+++ b/common/rfb/UserPasswdGetter.h
@@@ -24,7 -24,9 +24,9 @@@ namespace rfb 
      // dialog, getpass(), etc.  The user buffer pointer can be null, in which
      // case no user name will be retrieved.  The caller MUST delete [] the
      // result(s).
 -    virtual void getUserPasswd(char** user, char** password)=0;
 +    virtual void getUserPasswd(bool secure, char** user, char** password)=0;
+ 
+     virtual ~UserPasswdGetter() {}
    };
  }
  #endif