Stop supplying flags to clipboard peek handler

The flags should always be empty anyway.

diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 396b48b3c0db1a70ab7119fd68c010162983b36a..43cd01652b9f8973c6eedadf72d5d510a36a589e 100644 (file)
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -581,7 +581,7 @@ void CConnection::handleClipboardRequest(rdr::U32 flags)
   handleClipboardRequest();
 }
 
-void CConnection::handleClipboardPeek(rdr::U32 flags)
+void CConnection::handleClipboardPeek()
 {
   if (server.clipboardFlags() & rfb::clipboardNotify)
     writer()->writeClipboardNotify(hasLocalClipboard ? rfb::clipboardUTF8 : 0);

diff --git a/common/rfb/CConnection.h b/common/rfb/CConnection.h
index 68554b59c5f28f0c8b00413a6d4694b27fdc677e..f6818628745fc1acbe3982104f316d2fa7c3d4db 100644 (file)
--- a/common/rfb/CConnection.h
+++ b/common/rfb/CConnection.h
@@ -119,7 +119,7 @@ namespace rfb {
     virtual void handleClipboardCaps(rdr::U32 flags,
                                      const rdr::U32* lengths);
     virtual void handleClipboardRequest(rdr::U32 flags);
-    virtual void handleClipboardPeek(rdr::U32 flags);
+    virtual void handleClipboardPeek();
     virtual void handleClipboardNotify(rdr::U32 flags);
     virtual void handleClipboardProvide(rdr::U32 flags,
                                         const size_t* lengths,

diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx
index 8cdfc451ff5fe2719f2715505758d080518ff194..9200e82b1448af20273d39f97bc2ec03aa49b7a9 100644 (file)
--- a/common/rfb/CMsgHandler.cxx
+++ b/common/rfb/CMsgHandler.cxx
@@ -154,7 +154,7 @@ void CMsgHandler::handleClipboardRequest(rdr::U32 flags)
 {
 }
 
-void CMsgHandler::handleClipboardPeek(rdr::U32 flags)
+void CMsgHandler::handleClipboardPeek()
 {
 }
 

diff --git a/common/rfb/CMsgHandler.h b/common/rfb/CMsgHandler.h
index 43d8df246a4f74b5ce20e4c1a8e384a74a68b39d..e358a4f421e684e8bd0ddaaaa0b060570fa73c2b 100644 (file)
--- a/common/rfb/CMsgHandler.h
+++ b/common/rfb/CMsgHandler.h
@@ -79,7 +79,7 @@ namespace rfb {
     virtual void handleClipboardCaps(rdr::U32 flags,
                                      const rdr::U32* lengths);
     virtual void handleClipboardRequest(rdr::U32 flags);
-    virtual void handleClipboardPeek(rdr::U32 flags);
+    virtual void handleClipboardPeek();
     virtual void handleClipboardNotify(rdr::U32 flags);
     virtual void handleClipboardProvide(rdr::U32 flags,
                                         const size_t* lengths,

diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx
index 1ca993aa2af117a99f6fb5e2108c0f104c30b78b..1c17558440744f1bd9d1df664852fc3655a6695c 100644 (file)
--- a/common/rfb/CMsgReader.cxx
+++ b/common/rfb/CMsgReader.cxx
@@ -390,7 +390,7 @@ bool CMsgReader::readExtendedClipboard(rdr::S32 len)
       handler->handleClipboardRequest(flags);
       break;
     case clipboardPeek:
-      handler->handleClipboardPeek(flags);
+      handler->handleClipboardPeek();
       break;
     case clipboardNotify:
       handler->handleClipboardNotify(flags);

diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index f70d21dced7478b24f371081d91c1d6754047aad..00116414c0653c53ed89984c2d7299e966c0acf1 100644 (file)
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -402,7 +402,7 @@ void SConnection::handleClipboardRequest(rdr::U32 flags)
   handleClipboardRequest();
 }
 
-void SConnection::handleClipboardPeek(rdr::U32 flags)
+void SConnection::handleClipboardPeek()
 {
   if (client.clipboardFlags() & rfb::clipboardNotify)
     writer()->writeClipboardNotify(hasLocalClipboard ? rfb::clipboardUTF8 : 0);

diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h
index 38969c221cea08d386b26c16ef08f0ee9c3dc1fc..2c3825138dab297426c4cd2a9711fddbd7c0e175 100644 (file)
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -85,7 +85,7 @@ namespace rfb {
     virtual void clientCutText(const char* str);
 
     virtual void handleClipboardRequest(rdr::U32 flags);
-    virtual void handleClipboardPeek(rdr::U32 flags);
+    virtual void handleClipboardPeek();
     virtual void handleClipboardNotify(rdr::U32 flags);
     virtual void handleClipboardProvide(rdr::U32 flags,
                                         const size_t* lengths,

diff --git a/common/rfb/SMsgHandler.cxx b/common/rfb/SMsgHandler.cxx
index 0f813178998df57437fd239ea515f606020b65da..f00b570bf2ab0e0697e01711e57947f34cdc39ef 100644 (file)
--- a/common/rfb/SMsgHandler.cxx
+++ b/common/rfb/SMsgHandler.cxx
@@ -122,7 +122,7 @@ void SMsgHandler::handleClipboardRequest(rdr::U32 flags)
 {
 }
 
-void SMsgHandler::handleClipboardPeek(rdr::U32 flags)
+void SMsgHandler::handleClipboardPeek()
 {
 }
 

diff --git a/common/rfb/SMsgHandler.h b/common/rfb/SMsgHandler.h
index b290f194b77157133ad8f0bb3d59bb38b90f9e9c..274a1c3c398218ab7ec25cd2a82b834dae0e370a 100644 (file)
--- a/common/rfb/SMsgHandler.h
+++ b/common/rfb/SMsgHandler.h
@@ -57,7 +57,7 @@ namespace rfb {
     virtual void handleClipboardCaps(rdr::U32 flags,
                                      const rdr::U32* lengths);
     virtual void handleClipboardRequest(rdr::U32 flags);
-    virtual void handleClipboardPeek(rdr::U32 flags);
+    virtual void handleClipboardPeek();
     virtual void handleClipboardNotify(rdr::U32 flags);
     virtual void handleClipboardProvide(rdr::U32 flags,
                                         const size_t* lengths,

diff --git a/common/rfb/SMsgReader.cxx b/common/rfb/SMsgReader.cxx
index e55826308cf6d4c7aa012de6dbf523345ddcbf1b..e7c78c4ef8d43efd9f074e8bb6304a6bb9acfb4f 100644 (file)
--- a/common/rfb/SMsgReader.cxx
+++ b/common/rfb/SMsgReader.cxx
@@ -429,7 +429,7 @@ bool SMsgReader::readExtendedClipboard(rdr::S32 len)
       handler->handleClipboardRequest(flags);
       break;
     case clipboardPeek:
-      handler->handleClipboardPeek(flags);
+      handler->handleClipboardPeek();
       break;
     case clipboardNotify:
       handler->handleClipboardNotify(flags);