diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /vcl/source/window/debugevent.cxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'vcl/source/window/debugevent.cxx')
-rw-r--r-- | vcl/source/window/debugevent.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index 9d622a91f989..b6e1cf88dc80 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -32,9 +32,9 @@ static double getRandom() return (double)rand() / RAND_MAX; } -Window *DebugEventInjector::ChooseWindow() +vcl::Window *DebugEventInjector::ChooseWindow() { - Window *pWindow, *pParent; + vcl::Window *pWindow, *pParent; if (getRandom() < 0.80 && (pWindow = Application::GetFocusWindow())) @@ -46,11 +46,11 @@ Window *DebugEventInjector::ChooseWindow() // select a top window at random long nIdx = Application::GetTopWindowCount() * getRandom(); if (!(pParent = Application::GetTopWindow( nIdx ))) - pParent = static_cast<Window *>(Application::GetAppWindow()); + pParent = static_cast<vcl::Window *>(Application::GetAppWindow()); } assert (pParent != NULL); - std::vector< Window *> aChildren; + std::vector< vcl::Window *> aChildren; pParent->CollectChildren( aChildren ); return aChildren[ aChildren.size() * getRandom() ]; @@ -77,7 +77,7 @@ static void CollectMenuItemIds( Menu *pMenu, MenuItemIds &rIds ) void DebugEventInjector::InjectMenuEvent() { - Window *pFocus = Application::GetFocusWindow(); + vcl::Window *pFocus = Application::GetFocusWindow(); if (!pFocus) return; @@ -133,7 +133,7 @@ static void InitKeyEvent( SalKeyEvent &rKeyEvent ) void DebugEventInjector::InjectTextEvent() { SalKeyEvent aKeyEvent; - Window *pWindow = ChooseWindow(); + vcl::Window *pWindow = ChooseWindow(); InitKeyEvent( aKeyEvent ); @@ -198,7 +198,7 @@ void DebugEventInjector::InjectEvent() void DebugEventInjector::InjectKeyNavEdit() { - Window *pWindow = ChooseWindow(); + vcl::Window *pWindow = ChooseWindow(); struct { double mnProb; |