Be more consistent in referring to pixel byte streams as buffers

4 files changed, 9 insertions, 9 deletions

diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index f97b0f4c..7265062d 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -443,10 +443,10 @@ void CConn::fence(rdr::U32 flags, unsigned len, const char data[])
   }
 }
 
-rdr::U8* CConn::getRawPixelsRW(const rfb::Rect& r, int* stride) {
-  return desktop->getPixelsRW(r, stride);
+rdr::U8* CConn::getRawBufferRW(const rfb::Rect& r, int* stride) {
+  return desktop->getBufferRW(r, stride);
 }
-void CConn::releaseRawPixels(const rfb::Rect& r) {
+void CConn::releaseRawBuffer(const rfb::Rect& r) {
   desktop->damageRect(r);
 }
 
diff --git a/vncviewer/CConn.h b/vncviewer/CConn.h
index 24fbbab4..33dcf4ab 100644
--- a/vncviewer/CConn.h
+++ b/vncviewer/CConn.h
@@ -67,8 +67,8 @@ public:
   void imageRect(const rfb::Rect& r, void* p);
   void copyRect(const rfb::Rect& r, int sx, int sy);
 
-  rdr::U8* getRawPixelsRW(const rfb::Rect& r, int* stride);
-  void releaseRawPixels(const rfb::Rect& r);
+  rdr::U8* getRawBufferRW(const rfb::Rect& r, int* stride);
+  void releaseRawBuffer(const rfb::Rect& r);
 
   const rfb::PixelFormat &getPreferredPF() { return fullColourPF; }
 
diff --git a/vncviewer/DesktopWindow.h b/vncviewer/DesktopWindow.h
index 78d9bf79..fefdd35b 100644
--- a/vncviewer/DesktopWindow.h
+++ b/vncviewer/DesktopWindow.h
@@ -62,8 +62,8 @@ public:
     viewport->copyRect(r, srcX, srcY);
   }
 
-  rdr::U8* getPixelsRW(const rfb::Rect& r, int* stride) {
-    return viewport->getPixelsRW(r, stride);
+  rdr::U8* getBufferRW(const rfb::Rect& r, int* stride) {
+    return viewport->getBufferRW(r, stride);
   }
   void damageRect(const rfb::Rect& r) {
     viewport->damageRect(r);
diff --git a/vncviewer/Viewport.h b/vncviewer/Viewport.h
index 748981ac..59839dcb 100644
--- a/vncviewer/Viewport.h
+++ b/vncviewer/Viewport.h
@@ -94,8 +94,8 @@ public:
     damageRect(r);
   }
 
-  rdr::U8* getPixelsRW(const rfb::Rect& r, int* stride) {
-    return frameBuffer->getPixelsRW(r, stride);
+  rdr::U8* getBufferRW(const rfb::Rect& r, int* stride) {
+    return frameBuffer->getBufferRW(r, stride);
   }
 
   void damageRect(const rfb::Rect& r) {