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/helper | |
| 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/helper')
| -rw-r--r-- | vcl/source/helper/lazydelete.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index abf06ff0d4a9..7ce8d1a56c11 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -33,7 +33,7 @@ LazyDeletorBase::~LazyDeletorBase() } // instantiate instance pointers for LazyDeletor<Window,Menu> -template<> LazyDeletor<Window>* LazyDeletor<Window>::s_pOneInstance = NULL; +template<> LazyDeletor<vcl::Window>* LazyDeletor<vcl::Window>::s_pOneInstance = NULL; template<> LazyDeletor<Menu>* LazyDeletor<Menu>::s_pOneInstance = NULL; // a list for all LazyeDeletor<T> singletons @@ -55,7 +55,7 @@ void LazyDelete::flush() } // specialized is_less function for Window -template<> bool LazyDeletor<Window>::is_less( Window* left, Window* right ) +template<> bool LazyDeletor<vcl::Window>::is_less( vcl::Window* left, vcl::Window* right ) { return left != right && right->IsChild( left, true ); } |