diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /sd/source/ui/slidesorter/shell/SlideSorter.cxx | |
parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'sd/source/ui/slidesorter/shell/SlideSorter.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorter.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 3a5320fd4c54..a97135c718a2 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -50,10 +50,10 @@ namespace { class ContentWindow : public ::sd::Window { public: - ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); + ContentWindow(vcl::Window& rParent, SlideSorter& rSlideSorter); virtual ~ContentWindow(); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); - virtual void Paint(::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; virtual void MouseButtonUp (const MouseEvent& rEvent) SAL_OVERRIDE; @@ -90,7 +90,7 @@ private: ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow) + vcl::Window& rParentWindow) { ::boost::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( @@ -128,7 +128,7 @@ SlideSorter::SlideSorter ( SlideSorter::SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow) + vcl::Window& rParentWindow) : mbIsValid(false), mpSlideSorterController(), mpSlideSorterModel(), @@ -173,7 +173,7 @@ void SlideSorter::Init() sd::Window *pContentWindow (GetContentWindow()); if (pContentWindow) { - ::vcl::Window* pParentWindow = pContentWindow->GetParent(); + vcl::Window* pParentWindow = pContentWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->SetBackground(Wallpaper()); pContentWindow->SetBackground(Wallpaper()); @@ -244,7 +244,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) GetContentWindow()); } -void SlideSorter::SetupControls (::vcl::Window* ) +void SlideSorter::SetupControls (vcl::Window* ) { GetVerticalScrollBar()->Show(); } @@ -254,7 +254,7 @@ void SlideSorter::SetupListeners() sd::Window *pWindow (GetContentWindow()); if (pWindow) { - ::vcl::Window* pParentWindow = pWindow->GetParent(); + vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->AddEventListener( LINK( @@ -288,7 +288,7 @@ void SlideSorter::ReleaseListeners() controller::SlideSorterController, WindowEventHandler)); - ::vcl::Window* pParentWindow = pWindow->GetParent(); + vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), @@ -371,14 +371,14 @@ void SlideSorter::ArrangeGUIElements ( } } -bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow) +bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow) { // Stop all animations for they have been started for the old window. mpSlideSorterController->GetAnimator()->RemoveAllAnimations(); ReleaseListeners(); - ::vcl::Window *pNewWindow = NULL; + vcl::Window *pNewWindow = NULL; if (mpViewShell) { mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); @@ -436,7 +436,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) namespace { ContentWindow::ContentWindow( - ::vcl::Window& rParent, + vcl::Window& rParent, SlideSorter& rSlideSorter) : ::sd::Window(&rParent), mrSlideSorter(rSlideSorter), @@ -455,7 +455,7 @@ void ContentWindow::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction mpCurrentFunction = rpFunction; } -void ContentWindow::Paint (::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void ContentWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { mrSlideSorter.Paint(rRect); } |