[Development] Merge KeyboardDevice and PointerDevice classes to new class called

InputDevice. It is more accordant to scheme how are input devices handled in
the main X.Org sources.


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

1 files changed, 1 insertions, 2 deletions

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 6e4f609c..1c037053 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -122,8 +122,7 @@ private:
                                             pointer arg);
   void deferUpdate();
   ScreenPtr pScreen;
-  PointerDevice *pointerDevice;
-  KeyboardDevice *keyboardDevice;
+  InputDevice *inputDevice;
   OsTimerPtr deferredUpdateTimer, dummyTimer;
   rfb::VNCServerST* server;
   rfb::HTTPServer* httpServer;