diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-13 10:51:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-13 12:21:19 +0200 |
| commit | 6850e9b855d3d367ae51111e48cbdb2c28000424 (patch) | |
| tree | ef1b7a98a8cb890106ef2ea9a045c511f78b184a /vcl | |
| parent | 274c836cf82ce3929141e03a28cfb840f4c724cb (diff) | |
first step towards removing LazyDeletor
convert it from a template to a concrete class, since we only have one
use-site for it anyway
Change-Id: I7209243cc744c7ddb727d6136795d8628b91ff6f
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/helper/lazydelete.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index 2594ad47c22a..3b79b5f87565 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -33,7 +33,7 @@ LazyDeletorBase::~LazyDeletorBase() } // instantiate instance pointer for LazyDeletor<Window> -template<> LazyDeletor<vcl::Window>* LazyDeletor<vcl::Window>::s_pOneInstance = NULL; +LazyDeletor* LazyDeletor::s_pOneInstance = NULL; // a list for all LazyeDeletor<T> singletons static std::vector< LazyDeletorBase* > lcl_aDeletors; @@ -54,7 +54,7 @@ void LazyDelete::flush() } // specialized is_less function for Window -template<> bool LazyDeletor<vcl::Window>::is_less( vcl::Window* left, vcl::Window* right ) +bool LazyDeletor::is_less( vcl::Window* left, vcl::Window* right ) { return left != right && right->IsChild( left, true ); } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1b95b9a98749..4a589c38e1ce 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -578,7 +578,7 @@ void Window::dispose() Window::~Window() { // FIXME: we should kill all LazyDeletor usage. - vcl::LazyDeletor<vcl::Window>::Undelete( this ); + vcl::LazyDeletor::Undelete( this ); disposeOnce(); } @@ -1892,7 +1892,7 @@ void Window::doLazyDelete() Show( false ); SetParent( ImplGetDefaultWindow() ); } - vcl::LazyDeletor<vcl::Window>::Delete( this ); + vcl::LazyDeletor::Delete( this ); } KeyIndicatorState Window::GetIndicatorState() const |