diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-01 17:07:31 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-06 07:35:17 +0000 |
| commit | 623c2b92b90ffce8ece14cbbd2da7067e2759e99 (patch) | |
| tree | e79297e6d2dd486e67e2720c3a63d30fe6f7d7ed /avmedia/source/opengl | |
| parent | tdf#88206 replace cppu::WeakImplHelper* etc. (diff) | |
| download | core-623c2b92b90ffce8ece14cbbd2da7067e2759e99.tar.gz core-623c2b92b90ffce8ece14cbbd2da7067e2759e99.zip | |
tdf#88206 Change uses of cppu::WeakImplHelper* etc.
to the variadic variants, in avmedia.
Change-Id: I7fe65771ea5e0d30c7906d0d33acdcbe9e8aa3ff
Reviewed-on: https://gerrit.libreoffice.org/16647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia/source/opengl')
| -rw-r--r-- | avmedia/source/opengl/oglframegrabber.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglmanager.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglwindow.hxx | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx index db8a926cedd1..bcb7e22ce47d 100644 --- a/avmedia/source/opengl/oglframegrabber.hxx +++ b/avmedia/source/opengl/oglframegrabber.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX #define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XFrameGrabber.hpp> @@ -18,8 +18,8 @@ namespace avmedia { namespace ogl { -typedef ::cppu::WeakImplHelper2< com::sun::star::media::XFrameGrabber, - com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; +typedef ::cppu::WeakImplHelper< com::sun::star::media::XFrameGrabber, + com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; class OGLFrameGrabber : public FrameGrabber_BASE { diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx index d4ccf1f209a2..05dc96152aed 100644 --- a/avmedia/source/opengl/oglmanager.hxx +++ b/avmedia/source/opengl/oglmanager.hxx @@ -10,15 +10,15 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XManager.hpp> namespace avmedia { namespace ogl { -class OGLManager : public ::cppu::WeakImplHelper2 < com::sun::star::media::XManager, - com::sun::star::lang::XServiceInfo > +class OGLManager : public ::cppu::WeakImplHelper< com::sun::star::media::XManager, + com::sun::star::lang::XServiceInfo > { public: diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 605233d47f92..a8bf92dfade1 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX #define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XPlayer.hpp> @@ -26,8 +26,8 @@ namespace avmedia { namespace ogl { class OGLWindow; -typedef ::cppu::WeakComponentImplHelper2< com::sun::star::media::XPlayer, - com::sun::star::lang::XServiceInfo > Player_BASE; +typedef ::cppu::WeakComponentImplHelper< com::sun::star::media::XPlayer, + com::sun::star::lang::XServiceInfo > Player_BASE; class OGLPlayer : public cppu::BaseMutex, public Player_BASE diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index 5b0e151c9b84..97f51e685123 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -12,7 +12,7 @@ #include "oglplayer.hxx" -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XPlayerWindow.hpp> #include <com/sun/star/media/ZoomLevel.hpp> @@ -24,8 +24,8 @@ namespace avmedia { namespace ogl { -class OGLWindow : public ::cppu::WeakImplHelper2 < com::sun::star::media::XPlayerWindow, - com::sun::star::lang::XServiceInfo > +class OGLWindow : public ::cppu::WeakImplHelper< com::sun::star::media::XPlayerWindow, + com::sun::star::lang::XServiceInfo > { public: OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent ); |