1 files changed, 9 insertions, 9 deletions

diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h
index b7e30c6a..113811b9 100644
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -80,16 +80,16 @@ namespace rfb {
 
     // Overridden from SMsgHandler
 
-    virtual void setEncodings(int nEncodings, const rdr::S32* encodings);
+    virtual void setEncodings(int nEncodings, const int32_t* encodings);
 
     virtual void clientCutText(const char* str);
 
-    virtual void handleClipboardRequest(rdr::U32 flags);
+    virtual void handleClipboardRequest(uint32_t flags);
     virtual void handleClipboardPeek();
-    virtual void handleClipboardNotify(rdr::U32 flags);
-    virtual void handleClipboardProvide(rdr::U32 flags,
+    virtual void handleClipboardNotify(uint32_t flags);
+    virtual void handleClipboardProvide(uint32_t flags,
                                         const size_t* lengths,
-                                        const rdr::U8* const* data);
+                                        const uint8_t* const* data);
 
     virtual void supportsQEMUKeyEvent();
 
@@ -130,7 +130,7 @@ namespace rfb {
     // it responds directly to requests (stating it doesn't support any
     // synchronisation) and drops responses. Override to implement more proper
     // support.
-    virtual void fence(rdr::U32 flags, unsigned len, const char data[]);
+    virtual void fence(uint32_t flags, unsigned len, const char data[]);
 
     // enableContinuousUpdates() is called when the client wants to enable
     // or disable continuous updates, or change the active area.
@@ -177,7 +177,7 @@ namespace rfb {
     // of a SConnection to the server.  How the access rights are treated
     // is up to the derived class.
 
-    typedef rdr::U16 AccessRights;
+    typedef uint16_t AccessRights;
     static const AccessRights AccessView;           // View display contents
     static const AccessRights AccessKeyEvents;      // Send key events
     static const AccessRights AccessPtrEvents;      // Send pointer events
@@ -216,7 +216,7 @@ namespace rfb {
 
     stateEnum state() { return state_; }
 
-    rdr::S32 getPreferredEncoding() { return preferredEncoding; }
+    int32_t getPreferredEncoding() { return preferredEncoding; }
 
   protected:
     // throwConnFailedException() prints a message to the log, sends a conn
@@ -260,7 +260,7 @@ namespace rfb {
     CharArray authFailureMsg;
 
     stateEnum state_;
-    rdr::S32 preferredEncoding;
+    int32_t preferredEncoding;
     AccessRights accessRights;
 
     char* clientClipboard;