Switch to unsigned parameters for ExtendedDesktopSize handler

The constants used here are unsigned so it makes more sense that
the parameters are as well.

diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx
index ce8b271f59a63d2bbf4610b27094039c8c6416ba..11c979a3020b654797ebaf68cc67eec8e4d4af38 100644 (file)
--- a/common/rfb/CMsgHandler.cxx
+++ b/common/rfb/CMsgHandler.cxx
@@ -38,13 +38,13 @@ void CMsgHandler::setDesktopSize(int width, int height)
   cp.height = height;
 }
 
-void CMsgHandler::setExtendedDesktopSize(int reason, int result,
+void CMsgHandler::setExtendedDesktopSize(unsigned reason, unsigned result,
                                          int width, int height,
                                          const ScreenSet& layout)
 {
   cp.supportsSetDesktopSize = true;
 
-  if ((reason == (signed)reasonClient) && (result != (signed)resultSuccess))
+  if ((reason == reasonClient) && (result != resultSuccess))
     return;
 
   if (!layout.validate(width, height))

diff --git a/common/rfb/CMsgHandler.h b/common/rfb/CMsgHandler.h
index 5e333d27cf7bc34216e6866a98d5f29ff12e7e28..7d2cdc207af6ec694559dda9dd4cbc2fe7c56898 100644 (file)
--- a/common/rfb/CMsgHandler.h
+++ b/common/rfb/CMsgHandler.h
@@ -46,7 +46,7 @@ namespace rfb {
     // methods to set the members of cp appropriately.
 
     virtual void setDesktopSize(int w, int h);
-    virtual void setExtendedDesktopSize(int reason, int result,
+    virtual void setExtendedDesktopSize(unsigned reason, unsigned result,
                                         int w, int h,
                                         const ScreenSet& layout);
     virtual void setCursor(int width, int height, const Point& hotspot,

diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index 5935c1777711c000b472c50651b10e9d1dc7b977..ab5c9ccc101641f5553745478b608df0258b2d4e 100644 (file)
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -313,8 +313,8 @@ void CConn::setDesktopSize(int w, int h)
 }
 
 // setExtendedDesktopSize() is a more advanced version of setDesktopSize()
-void CConn::setExtendedDesktopSize(int reason, int result, int w, int h,
-                                   const rfb::ScreenSet& layout)
+void CConn::setExtendedDesktopSize(unsigned reason, unsigned result,
+                                   int w, int h, const rfb::ScreenSet& layout)
 {
   CConnection::setExtendedDesktopSize(reason, result, w, h, layout);
 

diff --git a/vncviewer/CConn.h b/vncviewer/CConn.h
index 709ca2f80362f5462da92cbb7b84b7095aab5889..1b929373dc35d5acf97d2f04834d3c46e2db105f 100644 (file)
--- a/vncviewer/CConn.h
+++ b/vncviewer/CConn.h
@@ -51,8 +51,8 @@ public:
   void serverInit();
 
   void setDesktopSize(int w, int h);
-  void setExtendedDesktopSize(int reason, int result, int w, int h,
-                              const rfb::ScreenSet& layout);
+  void setExtendedDesktopSize(unsigned reason, unsigned result,
+                              int w, int h, const rfb::ScreenSet& layout);
 
   void setName(const char* name);