Remove redundant Region::copyFrom()

We already have an assignment operator, so no need for this method.

diff --git a/common/rfb/EncodeManager.cxx b/common/rfb/EncodeManager.cxx
index 4f6ad5a253e44444f2bb93c3f381b6ca07b5d1ac..0ceec8fd4a41dbea924481a332f643779911a433 100644 (file)
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -255,7 +255,7 @@ void EncodeManager::writeUpdate(const UpdateInfo& ui, const PixelBuffer* pb,
 
     prepareEncoders();
 
-    changed.copyFrom(ui.changed);
+    changed = ui.changed;
 
     /*
      * We need to render the cursor seperately as it has its own

diff --git a/common/rfb/Region.cxx b/common/rfb/Region.cxx
index 995f8c5b9da8a1c9e78cdd802e028ade4486baef..c17c5d48f0233d4842deef3816c56979f3e751a3 100644 (file)
--- a/common/rfb/Region.cxx
+++ b/common/rfb/Region.cxx
@@ -143,10 +143,6 @@ void rfb::Region::setExtentsAndOrderedRects(const ShortRect* extents,
   }
 }
 
-void rfb::Region::copyFrom(const rfb::Region& r) {
-  XUnionRegion(r.xrgn, r.xrgn, xrgn);
-}
-
 void rfb::Region::assign_intersect(const rfb::Region& r) {
   XIntersectRegion(xrgn, r.xrgn, xrgn);
 }

diff --git a/common/rfb/Region.h b/common/rfb/Region.h
index 9337556939e4702cb400ceabf3cd38cc3e47fde8..9e53d36273d4565ed70b786937ae5859c056824d 100644 (file)
--- a/common/rfb/Region.h
+++ b/common/rfb/Region.h
@@ -52,7 +52,6 @@ namespace rfb {
     void setOrderedRects(const std::vector<Rect>& rects);
     void setExtentsAndOrderedRects(const ShortRect* extents, int nRects,
                                    const ShortRect* rects);
-    void copyFrom(const Region& r);
 
     void assign_intersect(const Region& r);
     void assign_union(const Region& r);

diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 924f724b362308e40a261f10814f8a8e5850064e..0b79dc10de81090056ea71219f7f8b54051d3f21 100644 (file)
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -996,7 +996,7 @@ void VNCSConnectionST::writeDataUpdate()
   if (!ui.copied.is_empty() && !damagedCursorRegion.is_empty()) {
     Region bogusCopiedCursor;
 
-    bogusCopiedCursor.copyFrom(damagedCursorRegion);
+    bogusCopiedCursor = damagedCursorRegion;
     bogusCopiedCursor.translate(ui.copy_delta);
     bogusCopiedCursor.assign_intersect(server->pb->getRect());
     if (!ui.copied.intersect(bogusCopiedCursor).is_empty()) {