From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 15 Sep 2017 11:03:33 +0000 (+0200)
Subject: Merge branch 'fix-warnings'
X-Git-Tag: v1.8.90~112
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9e7b4535f4f4bcebc5c272a84354c04f8e333f7c;p=tigervnc.git

Merge branch 'fix-warnings'
---

9e7b4535f4f4bcebc5c272a84354c04f8e333f7c
diff --cc common/rfb/InputHandler.h
index 0344bc3f,727f69bb..6c072849
--- a/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/UserPasswdGetter.h
index 13493e4d,aa72c1dd..27775cc3
--- a/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