diff options
Diffstat (limited to 'unix/x0vncserver/Geometry.cxx')
| -rw-r--r-- | unix/x0vncserver/Geometry.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/unix/x0vncserver/Geometry.cxx b/unix/x0vncserver/Geometry.cxx index 28e71be4..0a848cbb 100644 --- a/unix/x0vncserver/Geometry.cxx +++ b/unix/x0vncserver/Geometry.cxx @@ -26,14 +26,13 @@ #include <string.h> -#include <rfb/LogWriter.h> -#include <x0vncserver/Geometry.h> +#include <core/LogWriter.h> -using namespace rfb; +#include <x0vncserver/Geometry.h> -static LogWriter vlog("Geometry"); +static core::LogWriter vlog("Geometry"); -StringParameter Geometry::m_geometryParam("Geometry", +core::StringParameter Geometry::m_geometryParam("Geometry", "Screen area shown to VNC clients. " "Format is <width>x<height>+<offset_x>+<offset_y>, " "more information in man X, section GEOMETRY SPECIFICATIONS. " @@ -67,9 +66,9 @@ void Geometry::recalc(int fullWidth, int fullHeight) width(), height(), offsetLeft(), offsetTop()); } -Rect Geometry::parseString(const char *arg) const +core::Rect Geometry::parseString(const char* arg) const { - Rect result; // empty by default + core::Rect result; // empty by default if (arg != nullptr && strlen(arg) > 0) { int w, h; @@ -83,7 +82,7 @@ Rect Geometry::parseString(const char *arg) const x = m_fullWidth - w - x; if (sign_y[0] == '-') y = m_fullHeight - h - y; - Rect partRect(x, y, x + w, y + h); + core::Rect partRect(x, y, x + w, y + h); result = partRect.intersect(m_rect); if (result.area() <= 0) { vlog.error("Requested area is out of the desktop boundaries"); |