Declare virtual methods with empty body as pure virtual methods in rfb::CMsgHandler

class.

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

diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx
index 4188964c7224e3e06ed738ddf2784b287ceb1c14..65e96f3f95473a0d6ffdee247e2c7ba2465c7ee6 100644 (file)
--- a/common/rfb/CMsgHandler.cxx
+++ b/common/rfb/CMsgHandler.cxx
@@ -55,10 +55,6 @@ void CMsgHandler::setExtendedDesktopSize(int reason, int result,
   cp.screenLayout = layout;
 }
 
-void CMsgHandler::setCursor(int w, int h, const Point& hotspot, void* data, void* mask)
-{
-}
-
 void CMsgHandler::setPixelFormat(const PixelFormat& pf)
 {
   cp.setPF(pf);
@@ -69,50 +65,3 @@ void CMsgHandler::setName(const char* name)
   cp.setName(name);
 }
 
-void CMsgHandler::serverInit()
-{
-  throw Exception("CMsgHandler::serverInit called");
-}
-
-void CMsgHandler::framebufferUpdateStart()
-{
-}
-
-void CMsgHandler::framebufferUpdateEnd()
-{
-}
-
-void CMsgHandler::beginRect(const Rect& r, unsigned int encoding)
-{
-}
-
-void CMsgHandler::endRect(const Rect& r, unsigned int encoding)
-{
-}
-
-
-void CMsgHandler::setColourMapEntries(int firstColour, int nColours,
-                                      rdr::U16* rgbs)
-{
-  throw Exception("CMsgHandler::setColourMapEntries called");
-}
-
-void CMsgHandler::bell()
-{
-}
-
-void CMsgHandler::serverCutText(const char* str, rdr::U32 len)
-{
-}
-
-void CMsgHandler::fillRect(const Rect& r, Pixel pix)
-{
-}
-
-void CMsgHandler::imageRect(const Rect& r, void* pixels)
-{
-}
-
-void CMsgHandler::copyRect(const Rect& r, int srcX, int srcY)
-{
-}

diff --git a/common/rfb/CMsgHandler.h b/common/rfb/CMsgHandler.h
index 79ee86c46d3f55263ed58fa2a89fcbf6969582ce..9205ef5af936de977d563634cd040dd3a0a8b077 100644 (file)
--- a/common/rfb/CMsgHandler.h
+++ b/common/rfb/CMsgHandler.h
@@ -49,24 +49,24 @@ namespace rfb {
                                         int w, int h,
                                         const ScreenSet& layout);
     virtual void setCursor(int width, int height, const Point& hotspot,
-                           void* data, void* mask);
+                           void* data, void* mask) = 0;
     virtual void setPixelFormat(const PixelFormat& pf);
     virtual void setName(const char* name);
-    virtual void serverInit();
+    virtual void serverInit() = 0;
 
-    virtual void framebufferUpdateStart();
-    virtual void framebufferUpdateEnd();
-    virtual void beginRect(const Rect& r, unsigned int encoding);
-    virtual void endRect(const Rect& r, unsigned int encoding);
+    virtual void framebufferUpdateStart() = 0;
+    virtual void framebufferUpdateEnd() = 0;
+    virtual void beginRect(const Rect& r, unsigned int encoding) = 0;
+    virtual void endRect(const Rect& r, unsigned int encoding) = 0;
 
     virtual void setColourMapEntries(int firstColour, int nColours,
-                                    rdr::U16* rgbs);
-    virtual void bell();
-    virtual void serverCutText(const char* str, rdr::U32 len);
+                                    rdr::U16* rgbs) = 0;
+    virtual void bell() = 0;
+    virtual void serverCutText(const char* str, rdr::U32 len) = 0;
 
-    virtual void fillRect(const Rect& r, Pixel pix);
-    virtual void imageRect(const Rect& r, void* pixels);
-    virtual void copyRect(const Rect& r, int srcX, int srcY);
+    virtual void fillRect(const Rect& r, Pixel pix) = 0;
+    virtual void imageRect(const Rect& r, void* pixels) = 0;
+    virtual void copyRect(const Rect& r, int srcX, int srcY) = 0;
 
     ConnParams cp;
   };

diff --git a/win/vncviewer/CConn.h b/win/vncviewer/CConn.h
index 726a6e862ab130c35876fdd022787be321cd3611..bf7fd06a9ebf122b4c1ba0c586919142d3755c4a 100644 (file)
--- a/win/vncviewer/CConn.h
+++ b/win/vncviewer/CConn.h
@@ -97,6 +97,7 @@ namespace rfb {
       CSecurity* getCSecurity(int secType);
       void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
       void bell();
+      void framebufferUpdateStart() {}
       void framebufferUpdateEnd();
       void setDesktopSize(int w, int h);
       void setExtendedDesktopSize(int reason, int result, int w, int h,