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/win | |
| parent | c73e3bb925a2c08c9aea0e8e7a7e3502b68c044e (diff) | |
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/win')
| -rw-r--r-- | avmedia/source/win/framegrabber.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/win/manager.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/win/player.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/win/wincommon.hxx | 2 | ||||
| -rw-r--r-- | avmedia/source/win/window.hxx | 5 |
5 files changed, 12 insertions, 13 deletions
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx index ac62d562a027..eb8fc01918de 100644 --- a/avmedia/source/win/framegrabber.hxx +++ b/avmedia/source/win/framegrabber.hxx @@ -21,7 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX #include "wincommon.hxx" - +#include <cppuhelper/implbase.hxx> #include "com/sun/star/media/XFrameGrabber.hpp" struct IMediaDet; @@ -32,8 +32,8 @@ namespace avmedia { namespace win { // - FrameGrabber - -class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber, - ::com::sun::star::lang::XServiceInfo > +class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, + ::com::sun::star::lang::XServiceInfo > { public: diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx index 23337d47886c..88ebaaf46b47 100644 --- a/avmedia/source/win/manager.hxx +++ b/avmedia/source/win/manager.hxx @@ -21,7 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX #include "wincommon.hxx" - +#include <cppuhelper/implbase.hxx> #include "com/sun/star/media/XManager.hpp" @@ -30,8 +30,8 @@ namespace avmedia { namespace win { -class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, - ::com::sun::star::lang::XServiceInfo > +class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, + ::com::sun::star::lang::XServiceInfo > { public: diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index f8c1036c0303..481e2c36360c 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -24,7 +24,7 @@ #include "com/sun/star/media/XPlayer.hpp" -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> struct IGraphBuilder; @@ -46,8 +46,8 @@ namespace avmedia { namespace win { // - Player - -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 Player : public cppu::BaseMutex, public Player_BASE diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx index 8f4c8a923e92..e0a60640111d 100644 --- a/avmedia/source/win/wincommon.hxx +++ b/avmedia/source/win/wincommon.hxx @@ -23,8 +23,6 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <tools/stream.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx index f0f82b5b0136..ff9f434ad3b7 100644 --- a/avmedia/source/win/window.hxx +++ b/avmedia/source/win/window.hxx @@ -21,6 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX #include "wincommon.hxx" +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include "com/sun/star/media/XPlayerWindow.hpp" @@ -35,8 +36,8 @@ namespace avmedia { namespace win { class Player; -class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, - ::com::sun::star::lang::XServiceInfo > +class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, + ::com::sun::star::lang::XServiceInfo > { public: |