Avoid redundant arguments

Remove redundant arguments where the method already has access to the
relevant variable as an object attribute.

2 files changed, 14 insertions, 14 deletions

diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index ba1d5b2b..4286c541 100644
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -285,7 +285,7 @@ void XDesktop::stop() {
 
 #ifdef HAVE_XTEST
   // Delete added keycodes
-  deleteAddedKeysyms(dpy);
+  deleteAddedKeysyms();
 #endif
 
 #ifdef HAVE_XDAMAGE
@@ -368,7 +368,7 @@ void XDesktop::pointerEvent(const Point& pos, int buttonMask) {
 }
 
 #ifdef HAVE_XTEST
-KeyCode XDesktop::XkbKeysymToKeycode(Display* dpy, KeySym keysym) {
+KeyCode XDesktop::XkbKeysymToKeycode(KeySym keysym) {
   XkbDescPtr xkb;
   XkbStateRec state;
   unsigned int mods;
@@ -401,12 +401,12 @@ KeyCode XDesktop::XkbKeysymToKeycode(Display* dpy, KeySym keysym) {
   // Shift+Tab is usually ISO_Left_Tab, but RFB hides this fact. Do
   // another attempt if we failed the initial lookup
   if ((keycode == 0) && (keysym == XK_Tab) && (mods & ShiftMask))
-    return XkbKeysymToKeycode(dpy, XK_ISO_Left_Tab);
+    return XkbKeysymToKeycode(XK_ISO_Left_Tab);
 
   return keycode;
 }
 
-KeyCode XDesktop::addKeysym(Display* dpy, KeySym keysym)
+KeyCode XDesktop::addKeysym(KeySym keysym)
 {
   int types[1];
   unsigned int key;
@@ -460,7 +460,7 @@ KeyCode XDesktop::addKeysym(Display* dpy, KeySym keysym)
   return 0;
 }
 
-void XDesktop::deleteAddedKeysyms(Display* dpy) {
+void XDesktop::deleteAddedKeysyms() {
   XkbDescPtr xkb;
   xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd);
 
@@ -476,7 +476,7 @@ void XDesktop::deleteAddedKeysyms(Display* dpy) {
   for (it = addedKeysyms.begin(); it != addedKeysyms.end(); it++) {
     if (XkbKeyNumGroups(xkb, it->second) != 0) {
       // Check if we are removing keysym we added ourself
-      if (XkbKeysymToKeycode(dpy, it->first) != it->second)
+      if (XkbKeysymToKeycode(it->first) != it->second)
         continue;
 
       XkbChangeTypesOfKey(xkb, it->second, 0, XkbGroup1Mask, nullptr, &changes);
@@ -501,19 +501,19 @@ void XDesktop::deleteAddedKeysyms(Display* dpy) {
   addedKeysyms.clear();
 }
 
-KeyCode XDesktop::keysymToKeycode(Display* dpy, KeySym keysym) {
+KeyCode XDesktop::keysymToKeycode(KeySym keysym) {
   int keycode = 0;
 
   // XKeysymToKeycode() doesn't respect state, so we have to use
   // something slightly more complex
-  keycode = XkbKeysymToKeycode(dpy, keysym);
+  keycode = XkbKeysymToKeycode(keysym);
 
   if (keycode != 0)
     return keycode;
 
   // TODO: try to further guess keycode with all possible mods as Xvnc does
 
-  keycode = addKeysym(dpy, keysym);
+  keycode = addKeysym(keysym);
 
   if (keycode == 0)
     vlog.error("Failure adding new keysym 0x%lx", keysym);
@@ -538,7 +538,7 @@ void XDesktop::keyEvent(uint32_t keysym, uint32_t xtcode, bool down) {
     if (pressedKeys.find(keysym) != pressedKeys.end())
       keycode = pressedKeys[keysym];
     else {
-      keycode = keysymToKeycode(dpy, keysym);
+      keycode = keysymToKeycode(keysym);
     }
   }
 
diff --git a/unix/x0vncserver/XDesktop.h b/unix/x0vncserver/XDesktop.h
index c707fc6b..125ddeb0 100644
--- a/unix/x0vncserver/XDesktop.h
+++ b/unix/x0vncserver/XDesktop.h
@@ -101,10 +101,10 @@ protected:
 
 protected:
 #ifdef HAVE_XTEST
-  KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym);
-  KeyCode addKeysym(Display* dpy, KeySym keysym);
-  void deleteAddedKeysyms(Display* dpy);
-  KeyCode keysymToKeycode(Display* dpy, KeySym keysym);
+  KeyCode XkbKeysymToKeycode(KeySym keysym);
+  KeyCode addKeysym(KeySym keysym);
+  void deleteAddedKeysyms();
+  KeyCode keysymToKeycode(KeySym keysym);
 #endif
 #ifdef HAVE_XFIXES
   bool setCursor();