summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /avmedia
parent17d821af6bb9df93569836a92f6bed975587fc6c (diff)
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle" Except some modules have their own foo::tools namespace, so there have to use ::tools::Rectangle. This commit just moves the class from the global namespace, it does not update pre/postwin.h yet. Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2 Reviewed-on: https://gerrit.libreoffice.org/35923 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/framework/mediaplayer.cxx4
-rw-r--r--avmedia/source/opengl/oglwindow.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx6
-rw-r--r--avmedia/source/viewer/mediawindow_impl.hxx4
5 files changed, 9 insertions, 9 deletions
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 4b3a9e016c7b..881ce0760244 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -84,7 +84,7 @@ void MediaFloater::Resize()
SfxDockingWindow::Resize();
if( mpMediaWindow )
- mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+ mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
}
void MediaFloater::ToggleFloatingMode()
@@ -103,7 +103,7 @@ void MediaFloater::ToggleFloatingMode()
mpMediaWindow = new MediaWindow( this, true );
- mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+ mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
mpMediaWindow->executeMediaItem( aRestoreItem );
vcl::Window* pWindow = mpMediaWindow->getWindow();
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index fe0adab71a20..ae550ff37f84 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -188,7 +188,7 @@ IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
if(pMouseEvt)
{
const Point& rMousePos = pMouseEvt->GetPosPixel();
- const Rectangle aWinRect(m_rEventHandler.GetPosPixel(),m_rEventHandler.GetSizePixel());
+ const tools::Rectangle aWinRect(m_rEventHandler.GetPosPixel(),m_rEventHandler.GetSizePixel());
// Grab focus to the OpenGL window when mouse pointer is over it
if( aWinRect.IsInside(rMousePos) )
{
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index b204542b8833..74bb879a5233 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -122,7 +122,7 @@ Size MediaWindow::getPreferredSize() const
}
-void MediaWindow::setPosSize( const Rectangle& rNewRect )
+void MediaWindow::setPosSize( const tools::Rectangle& rNewRect )
{
mpImpl->setPosSize( rNewRect );
}
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 9802d90706ab..518b83eaf119 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -506,7 +506,7 @@ void MediaWindowImpl::onURLChanged()
}
}
-void MediaWindowImpl::setPosSize(const Rectangle& rRect)
+void MediaWindowImpl::setPosSize(const tools::Rectangle& rRect)
{
SetPosSizePixel(rRect.TopLeft(), rRect.GetSize());
}
@@ -595,7 +595,7 @@ void MediaWindowImpl::StateChanged(StateChangedType eType)
}
}
-void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
if (mxPlayerWindow.is())
mxPlayerWindow->update();
@@ -621,7 +621,7 @@ void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&
return;
const Point aBasePos(mpChildWindow->GetPosPixel());
- const Rectangle aVideoRect(aBasePos, mpChildWindow->GetSizePixel());
+ const tools::Rectangle aVideoRect(aBasePos, mpChildWindow->GetSizePixel());
if (pLogo && !pLogo->IsEmpty() && (aVideoRect.GetWidth() > 0) && (aVideoRect.GetHeight() > 0))
{
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index c179a9e55110..68fbaeb8a0d1 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -98,7 +98,7 @@ public:
void updateMediaItem( MediaItem& rItem ) const;
void executeMediaItem( const MediaItem& rItem );
- void setPosSize( const Rectangle& rRect );
+ void setPosSize( const tools::Rectangle& rRect );
void setPointer( const Pointer& rPointer );
@@ -113,7 +113,7 @@ private:
virtual void Command( const CommandEvent& rCEvt ) override;
virtual void Resize() override;
virtual void StateChanged( StateChangedType ) override;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; // const
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; // const
virtual void GetFocus() override;
// DropTargetHelper