diff options
Diffstat (limited to 'win/rfb_win32/MonitorInfo.cxx')
| -rw-r--r-- | win/rfb_win32/MonitorInfo.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/win/rfb_win32/MonitorInfo.cxx b/win/rfb_win32/MonitorInfo.cxx index 5d715ef6..5b1f5533 100644 --- a/win/rfb_win32/MonitorInfo.cxx +++ b/win/rfb_win32/MonitorInfo.cxx @@ -20,10 +20,11 @@ #include <config.h> #endif +#include <core/Exception.h> +#include <core/LogWriter.h> + #include <rfb_win32/MonitorInfo.h> #include <rfb_win32/Win32Util.h> -#include <rdr/Exception.h> -#include <rfb/LogWriter.h> #ifndef min #define min(a,b) ((a)<(b)?(a):(b)) @@ -33,6 +34,7 @@ #define max(a,b) ((a)>(b)?(a):(b)) #endif +using namespace core; using namespace rfb; using namespace win32; @@ -44,7 +46,7 @@ static void fillMonitorInfo(HMONITOR monitor, MONITORINFOEXA* mi) { memset(mi, 0, sizeof(MONITORINFOEXA)); mi->cbSize = sizeof(MONITORINFOEXA); if (!GetMonitorInfo(monitor, mi)) - throw rdr::win32_error("Failed to GetMonitorInfo", GetLastError()); + throw core::win32_error("Failed to GetMonitorInfo", GetLastError()); vlog.debug("Monitor is %ld,%ld-%ld,%ld", mi->rcMonitor.left, mi->rcMonitor.top, mi->rcMonitor.right, mi->rcMonitor.bottom); vlog.debug("Work area is %ld,%ld-%ld,%ld", mi->rcWork.left, mi->rcWork.top, mi->rcWork.right, mi->rcWork.bottom); vlog.debug("Device is \"%s\"", mi->szDevice); @@ -57,7 +59,7 @@ MonitorInfo::MonitorInfo(HWND window) { HMONITOR monitor = MonitorFromWindow(window, MONITOR_DEFAULTTONEAREST); if (!monitor) - throw rdr::win32_error("Failed to get monitor", GetLastError()); + throw core::win32_error("Failed to get monitor", GetLastError()); fillMonitorInfo(monitor, this); } @@ -67,7 +69,7 @@ MonitorInfo::MonitorInfo(const RECT& r) { HMONITOR monitor = MonitorFromRect(&r, MONITOR_DEFAULTTONEAREST); if (!monitor) - throw rdr::win32_error("Failed to get monitor", GetLastError()); + throw core::win32_error("Failed to get monitor", GetLastError()); fillMonitorInfo(monitor, this); } |