Code cleanups. The most important change is that we now always use UpdateTracker's getUpdateInfo() and never call get_changed(), get_copied() and get_delta() member functions.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/common/rfb/UpdateTracker.h b/common/rfb/UpdateTracker.h
index 5b51317a..8e96d55e 100644
--- a/common/rfb/UpdateTracker.h
+++ b/common/rfb/UpdateTracker.h
@@ -33,9 +33,13 @@ namespace rfb {
     bool is_empty() const {
       return copied.is_empty() && changed.is_empty();
     }
+    // NOTE: We do not ever use UpdateInfo::numRects(), because Tight encoding
+    //       complicates computing the number of rectangles.
+    /*
     int numRects() const {
       return copied.numRects() + changed.numRects();
     }
+    */
   };
 
   class UpdateTracker {
@@ -59,7 +63,7 @@ namespace rfb {
     virtual void add_copied(const Region &dest, const Point &delta);
   protected:
     UpdateTracker* ut;
-    Region clipRect;
+    Rect clipRect;
   };
 
   class SimpleUpdateTracker : public UpdateTracker {
@@ -74,17 +78,12 @@ namespace rfb {
     virtual void subtract(const Region& region);
 
     // Fill the supplied UpdateInfo structure with update information
+    // FIXME: Provide getUpdateInfo() with no clipping, for better efficiency.
     virtual void getUpdateInfo(UpdateInfo* info, const Region& cliprgn);
 
     // Copy the contained updates to another tracker
     virtual void copyTo(UpdateTracker* to) const;
 
-
-    // Get the changed/copied regions
-    const Region& get_changed() const {return changed;}
-    const Region& get_copied() const {return copied;}
-    const Point& get_delta() const {return copy_delta;}
-
     // Move the entire update region by an offset
     void translate(const Point& p) {changed.translate(p); copied.translate(p);}