[Libreoffice-commits] core.git: avmedia/source
Takeshi Abe
tabe at fixedpoint.jp
Mon Jul 6 00:35:52 PDT 2015
avmedia/source/gstreamer/gstcommon.hxx | 2 --
avmedia/source/gstreamer/gstframegrabber.hxx | 6 +++---
avmedia/source/gstreamer/gstmanager.hxx | 6 +++---
avmedia/source/gstreamer/gstplayer.hxx | 6 +++---
avmedia/source/gstreamer/gstwindow.hxx | 5 +++--
avmedia/source/macavf/framegrabber.hxx | 5 +++--
avmedia/source/macavf/macavfcommon.hxx | 2 --
avmedia/source/macavf/manager.hxx | 5 +++--
avmedia/source/macavf/player.hxx | 5 +++--
avmedia/source/macavf/window.hxx | 5 +++--
avmedia/source/opengl/oglframegrabber.hxx | 6 +++---
avmedia/source/opengl/oglmanager.hxx | 6 +++---
avmedia/source/opengl/oglplayer.hxx | 6 +++---
avmedia/source/opengl/oglwindow.hxx | 6 +++---
avmedia/source/quicktime/framegrabber.hxx | 5 +++--
avmedia/source/quicktime/manager.hxx | 5 +++--
avmedia/source/quicktime/player.hxx | 6 +++---
avmedia/source/quicktime/quicktimecommon.hxx | 2 --
avmedia/source/quicktime/window.hxx | 5 +++--
avmedia/source/viewer/mediaevent_impl.hxx | 10 +++++-----
avmedia/source/vlc/vlccommon.hxx | 2 --
avmedia/source/vlc/vlcframegrabber.hxx | 6 +++---
avmedia/source/vlc/vlcmanager.hxx | 5 +++--
avmedia/source/vlc/vlcplayer.hxx | 7 +++----
avmedia/source/vlc/vlcwindow.hxx | 5 +++--
avmedia/source/win/framegrabber.hxx | 6 +++---
avmedia/source/win/manager.hxx | 6 +++---
avmedia/source/win/player.hxx | 6 +++---
avmedia/source/win/wincommon.hxx | 2 --
avmedia/source/win/window.hxx | 5 +++--
30 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit 623c2b92b90ffce8ece14cbbd2da7067e2759e99
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Jul 1 17:07:31 2015 +0900
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 20ae748..2b9a773 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -25,8 +25,6 @@
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 6c849c8..1704d4a 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -22,7 +22,7 @@
#include "gstplayer.hxx"
#include <com/sun/star/media/XFrameGrabber.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/noncopyable.hpp>
namespace avmedia { namespace gstreamer {
@@ -31,8 +31,8 @@ namespace avmedia { namespace gstreamer {
// - FrameGrabber -
-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 FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
{
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 65af873..be7bedb 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
#include "gstcommon.hxx"
-
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp"
@@ -30,8 +30,8 @@
namespace avmedia { namespace gstreamer {
-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/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index c5fc4f6..6d18616 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -24,7 +24,7 @@
#include "gstcommon.hxx"
#include "com/sun/star/media/XPlayer.hpp"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
typedef struct _GstVideoOverlay GstVideoOverlay;
@@ -35,8 +35,8 @@ namespace avmedia { namespace gstreamer {
// - Player -
-typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo > GstPlayer_BASE;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
+ ::com::sun::star::lang::XServiceInfo > GstPlayer_BASE;
class Player : public ::cppu::BaseMutex,
public GstPlayer_BASE
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 659c4fc..224dbec 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
#include "gstcommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hpp"
@@ -33,8 +34,8 @@ namespace avmedia { namespace gstreamer {
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:
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 51792fc..37ed31a 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX
#include "macavfcommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XFrameGrabber.hdl"
@@ -30,8 +31,8 @@ namespace avmedia { namespace macavf {
// - 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/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx
index d675bc3..cac0421 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -31,8 +31,6 @@
#include <rtl/ustring.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 0e022b7..8ee10f8 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_MANAGER_HXX
#include "macavfcommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hdl"
@@ -30,8 +31,8 @@
namespace avmedia { namespace macavf {
-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/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index de68fac..450d19d 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -22,6 +22,7 @@
#include <osl/conditn.h>
#include "macavfcommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XPlayer.hdl"
@@ -35,8 +36,8 @@ namespace avmedia { namespace macavf {
class Player
: public MacAVObserverHandler
-, public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo >
+, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer,
+ ::com::sun::star::lang::XServiceInfo >
{
public:
explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 25c4b46..d96dcd4 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_WINDOW_HXX
#include "macavfcommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hdl"
@@ -46,8 +47,8 @@ class Player;
class Window
: public MacAVObserverHandler
-, public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
- ::com::sun::star::lang::XServiceInfo >
+, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
+ ::com::sun::star::lang::XServiceInfo >
{
public:
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
index db8a926..bcb7e22 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 d4ccf1f..05dc961 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 605233d..a8bf92d 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 5b0e151..97f51e6 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 );
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index d655de3..ff259ba 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
#include "quicktimecommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XFrameGrabber.hpp"
@@ -30,8 +31,8 @@ namespace avmedia { namespace quicktime {
// - 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/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index bf10d08..3b34847 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
#include "quicktimecommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp"
@@ -30,8 +31,8 @@
namespace avmedia { namespace quicktime {
-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/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 73cf13d..5f53d78 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
#include "quicktimecommon.hxx"
-
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XPlayer.hpp"
namespace avmedia { namespace quicktime {
@@ -32,8 +32,8 @@ namespace avmedia { namespace quicktime {
*/
-class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo >
+class Player : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer,
+ ::com::sun::star::lang::XServiceInfo >
{
public:
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 8c1711d..1dedfab 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -29,8 +29,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/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 84fdb4f..70edecb 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
#include "quicktimecommon.hxx"
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hpp"
@@ -33,8 +34,8 @@ namespace avmedia { namespace quicktime {
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:
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 2db8ba0..169f1f6 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
#include <avmedia/mediawindow.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/awt/XKeyListener.hpp>
#include <com/sun/star/awt/XMouseListener.hpp>
#include <com/sun/star/awt/XMouseMotionListener.hpp>
@@ -35,10 +35,10 @@ namespace avmedia
// - MediaEventListenersImpl -
- class MediaEventListenersImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::awt::XKeyListener,
- ::com::sun::star::awt::XMouseListener,
- ::com::sun::star::awt::XMouseMotionListener,
- ::com::sun::star::awt::XFocusListener >
+ class MediaEventListenersImpl : public ::cppu::WeakImplHelper< ::com::sun::star::awt::XKeyListener,
+ ::com::sun::star::awt::XMouseListener,
+ ::com::sun::star::awt::XMouseMotionListener,
+ ::com::sun::star::awt::XFocusListener >
{
public:
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index b99325b..8d7895c 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -23,8 +23,6 @@
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index d51485c..6a34fe3 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -22,15 +22,15 @@
#include <boost/shared_ptr.hpp>
#include <com/sun/star/media/XFrameGrabber.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include "vlccommon.hxx"
#include "wrapper/Wrapper.hxx"
namespace avmedia {
namespace vlc {
-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 VLCFrameGrabber : public FrameGrabber_BASE
{
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 3473e51..52d7675 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -23,12 +23,13 @@
#include "vlccommon.hxx"
#include "wrapper/Wrapper.hxx"
#include <memory>
+#include <cppuhelper/implbase.hxx>
namespace avmedia {
namespace vlc {
-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 >
{
std::unique_ptr<wrapper::Instance> mInstance;
wrapper::EventHandler mEventHandler;
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 3d88798..17725b6 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
#include "vlccommon.hxx"
-#include <boost/shared_ptr.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/media/XPlayer.hpp>
#include <cppuhelper/basemutex.hxx>
@@ -34,8 +33,8 @@
namespace avmedia {
namespace vlc {
-typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo > VLC_Base;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
+ ::com::sun::star::lang::XServiceInfo > VLC_Base;
class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index a34c0bf..6ce10c4 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -20,13 +20,14 @@
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
#include "vlccommon.hxx"
+#include <cppuhelper/implbase.hxx>
namespace avmedia {
namespace vlc {
class VLCPlayer;
-class VLCWindow : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
- ::com::sun::star::lang::XServiceInfo >
+class VLCWindow : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
+ ::com::sun::star::lang::XServiceInfo >
{
VLCPlayer& mPlayer;
const intptr_t mPrevWinID;
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index ac62d56..eb8fc01 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 23337d4..88ebaaf 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 f8c1036..481e2c3 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 8f4c8a9..e0a6064 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 f0f82b5..ff9f434 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:
More information about the Libreoffice-commits
mailing list