diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-01-15 13:22:03 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-07-07 13:27:07 +0200 |
| commit | 456b2c20d096b426f28f64e9de9b9b709dd884aa (patch) | |
| tree | 020998ef597495f192d40598655fc4334eeb70eb /common/rfb | |
| parent | ca519532cecf64c690bb3ececd875ca6f7f4b2b2 (diff) | |
| download | tigervnc-456b2c20d096b426f28f64e9de9b9b709dd884aa.tar.gz tigervnc-456b2c20d096b426f28f64e9de9b9b709dd884aa.zip | |
Reduce dependencies on TransImageGetter.h
Diffstat (limited to 'common/rfb')
| -rw-r--r-- | common/rfb/Encoder.h | 3 | ||||
| -rw-r--r-- | common/rfb/HextileEncoder.cxx | 2 | ||||
| -rw-r--r-- | common/rfb/RREEncoder.cxx | 2 | ||||
| -rw-r--r-- | common/rfb/RawEncoder.cxx | 2 | ||||
| -rw-r--r-- | common/rfb/TightEncoder.cxx | 1 | ||||
| -rw-r--r-- | common/rfb/TightEncoder.h | 3 | ||||
| -rw-r--r-- | common/rfb/ZRLEEncoder.cxx | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/common/rfb/Encoder.h b/common/rfb/Encoder.h index da2c5c09..1a7935de 100644 --- 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 73f1f575..60833bdf 100644 --- 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 1b86986f..0bb2c7f9 100644 --- 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 5612cb8d..81eea8b5 100644 --- 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 9be4581e..e9568f8c 100644 --- 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 4fff0832..465d8ed6 100644 --- 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 a83d79f3..896b83b5 100644 --- 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> |