Reduce dependencies on TransImageGetter.h

diff --git a/common/rfb/Encoder.h b/common/rfb/Encoder.h
index da2c5c09fca263c911a9123e4e84dcf3567b24c5..1a7935de19a20b5c0969f72c452ff4ee3dd6ebe2 100644 (file)
--- a/common/rfb/Encoder.h
+++ b/common/rfb/Encoder.h
@@ -21,13 +21,12 @@
 
 #include <rfb/Rect.h>
 #include <rfb/encodings.h>
-#include <rfb/TransImageGetter.h>
 #include <rfb/JpegCompressor.h>
 
 namespace rfb {
   class SMsgWriter;
   class Encoder;
-  class ImageGetter;
+  class TransImageGetter;
   typedef Encoder* (*EncoderCreateFnType)(SMsgWriter*);
 
   class Encoder {

diff --git a/common/rfb/HextileEncoder.cxx b/common/rfb/HextileEncoder.cxx
index 73f1f5751441d9b0c7631d2af1490c027a061b35..60833bdf6bb4b7eccda624518670121c763707db 100644 (file)
--- a/common/rfb/HextileEncoder.cxx
+++ b/common/rfb/HextileEncoder.cxx
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  * USA.
  */
-#include <rfb/ImageGetter.h>
+#include <rfb/TransImageGetter.h>
 #include <rfb/encodings.h>
 #include <rfb/SMsgWriter.h>
 #include <rfb/HextileEncoder.h>

diff --git a/common/rfb/RREEncoder.cxx b/common/rfb/RREEncoder.cxx
index 1b86986fe061f8cfbfeccc2fa968fbb820ba71a7..0bb2c7f9766f3637bfff6408abe8e04710e1702c 100644 (file)
--- a/common/rfb/RREEncoder.cxx
+++ b/common/rfb/RREEncoder.cxx
@@ -16,7 +16,7 @@
  * USA.
  */
 #include <rdr/OutStream.h>
-#include <rfb/ImageGetter.h>
+#include <rfb/TransImageGetter.h>
 #include <rfb/encodings.h>
 #include <rfb/SMsgWriter.h>
 #include <rfb/RREEncoder.h>

diff --git a/common/rfb/RawEncoder.cxx b/common/rfb/RawEncoder.cxx
index 5612cb8d99adad0d504736abb9c3c6221011651c..81eea8b513b38e9695797487f738ae8cdfae767a 100644 (file)
--- a/common/rfb/RawEncoder.cxx
+++ b/common/rfb/RawEncoder.cxx
@@ -16,7 +16,7 @@
  * USA.
  */
 #include <rdr/OutStream.h>
-#include <rfb/ImageGetter.h>
+#include <rfb/TransImageGetter.h>
 #include <rfb/encodings.h>
 #include <rfb/SMsgWriter.h>
 #include <rfb/RawEncoder.h>

diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx
index 9be4581e9bd0bf5fb877f2c4738656532b3141c2..e9568f8cf0a4967377602e34ae51a1f016fbaeba 100644 (file)
--- a/common/rfb/TightEncoder.cxx
+++ b/common/rfb/TightEncoder.cxx
@@ -17,6 +17,7 @@
  * USA.
  */
 #include <rdr/OutStream.h>
+#include <rfb/TransImageGetter.h>
 #include <rfb/encodings.h>
 #include <rfb/ConnParams.h>
 #include <rfb/SMsgWriter.h>

diff --git a/common/rfb/TightEncoder.h b/common/rfb/TightEncoder.h
index 4fff0832b8896eb459edf2c0b6346a33e293808a..465d8ed680d406aea5daf745af39aaaa79be7c96 100644 (file)
--- a/common/rfb/TightEncoder.h
+++ b/common/rfb/TightEncoder.h
@@ -21,7 +21,6 @@
 
 #include <rdr/MemOutStream.h>
 #include <rdr/ZlibOutStream.h>
-#include <rfb/TransImageGetter.h>
 #include <rfb/Encoder.h>
 
 // FIXME: Check if specifying extern "C" is really necessary.
@@ -32,6 +31,8 @@ extern "C" {
 
 namespace rfb {
 
+  class TransImageGetter;
+
   struct TIGHT_CONF {
     unsigned int maxRectSize, maxRectWidth;
     unsigned int monoMinRectSize;

diff --git a/common/rfb/ZRLEEncoder.cxx b/common/rfb/ZRLEEncoder.cxx
index a83d79f3b87d29ffc6190626020d532a422a6d77..896b83b585e1aca661434b7fd21b4db30a6dc142 100644 (file)
--- a/common/rfb/ZRLEEncoder.cxx
+++ b/common/rfb/ZRLEEncoder.cxx
@@ -17,7 +17,7 @@
  */
 #include <rdr/OutStream.h>
 #include <rfb/Exception.h>
-#include <rfb/ImageGetter.h>
+#include <rfb/TransImageGetter.h>
 #include <rfb/encodings.h>
 #include <rfb/ConnParams.h>
 #include <rfb/SMsgWriter.h>