Move basic data types to core library

Make it clearer what is protocol handling and what is just general
plumbing.

This is one step of several.

1 files changed, 7 insertions, 5 deletions

diff --git a/common/rfb/Decoder.cxx b/common/rfb/Decoder.cxx
index e9bc9a4f..0f1cde89 100644
--- a/common/rfb/Decoder.cxx
+++ b/common/rfb/Decoder.cxx
@@ -22,8 +22,10 @@
 #endif
 
 #include <stdio.h>
+
+#include <core/Region.h>
+
 #include <rfb/encodings.h>
-#include <rfb/Region.h>
 #include <rfb/Decoder.h>
 #include <rfb/RawDecoder.h>
 #include <rfb/CopyRectDecoder.h>
@@ -45,19 +47,19 @@ Decoder::~Decoder()
 {
 }
 
-void Decoder::getAffectedRegion(const Rect& rect,
+void Decoder::getAffectedRegion(const core::Rect& rect,
                                 const uint8_t* /*buffer*/,
                                 size_t /*buflen*/,
                                 const ServerParams& /*server*/,
-                                Region* region)
+                                core::Region* region)
 {
   region->reset(rect);
 }
 
-bool Decoder::doRectsConflict(const Rect& /*rectA*/,
+bool Decoder::doRectsConflict(const core::Rect& /*rectA*/,
                               const uint8_t* /*bufferA*/,
                               size_t /*buflenA*/,
-                              const Rect& /*rectB*/,
+                              const core::Rect& /*rectB*/,
                               const uint8_t* /*bufferB*/,
                               size_t /*buflenB*/,
                               const ServerParams& /*server*/)