diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-08-31 16:43:18 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-28 09:45:23 +0200 |
| commit | 30e9f06dcfb578c894d2e5c003403bfbda57ae13 (patch) | |
| tree | ea8a713f6b83e7c77ceb64354c7f7c8c79ed028a /vcl | |
| parent | a8cd67e2690a3fd8b3d486fa6dc82a5c4a6ef17b (diff) | |
Constify vcl::Window child lookup
Also removes the function comments before the implementations,
as these are just the same as already in the header.
Change-Id: I11425dc4aa372423fcf469ab1374159ce8b180e2
Reviewed-on: https://gerrit.libreoffice.org/61035
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index ed3016ad64d2..99b1cede0a8b 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -126,11 +126,9 @@ void ImplHideSplash() pSVData->mpIntroWindow->Hide(); } -//Get next window after pChild of a pTopLevel window as -//if any intermediate layout widgets didn't exist -vcl::Window * nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild) +vcl::Window * nextLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild) { - vcl::Window *pLastChild = pChild; + const vcl::Window *pLastChild = pChild; if (isContainerWindow(*pChild)) pChild = pChild->GetWindow(GetWindowType::FirstChild); @@ -151,12 +149,12 @@ vcl::Window * nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi if (pChild && isContainerWindow(*pChild)) pChild = nextLogicalChildOfParent(pTopLevel, pChild); - return pChild; + return const_cast<vcl::Window *>(pChild); } -vcl::Window * prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild) +vcl::Window * prevLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild) { - vcl::Window *pLastChild = pChild; + const vcl::Window *pLastChild = pChild; if (isContainerWindow(*pChild)) pChild = pChild->GetWindow(GetWindowType::LastChild); @@ -177,17 +175,15 @@ vcl::Window * prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChi if (pChild && isContainerWindow(*pChild)) pChild = prevLogicalChildOfParent(pTopLevel, pChild); - return pChild; + return const_cast<vcl::Window *>(pChild); } -//Get first window of a pTopLevel window as -//if any intermediate layout widgets didn't exist -vcl::Window * firstLogicalChildOfParent(vcl::Window *pTopLevel) +vcl::Window * firstLogicalChildOfParent(const vcl::Window *pTopLevel) { - vcl::Window *pChild = pTopLevel->GetWindow(GetWindowType::FirstChild); + const vcl::Window *pChild = pTopLevel->GetWindow(GetWindowType::FirstChild); if (pChild && isContainerWindow(*pChild)) pChild = nextLogicalChildOfParent(pTopLevel, pChild); - return pChild; + return const_cast<vcl::Window *>(pChild); } void Accelerator::GenerateAutoMnemonicsOnHierarchy(vcl::Window* pWindow) |