Kaydet (Commit) 623c2b92 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

tdf#88206 Change uses of cppu::WeakImplHelper* etc.

to the variadic variants, in avmedia.

Change-Id: I7fe65771ea5e0d30c7906d0d33acdcbe9e8aa3ff
Reviewed-on: https://gerrit.libreoffice.org/16647Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst c73e3bb9
......@@ -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>
......
......@@ -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
{
......
......@@ -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:
......
......@@ -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
......
......@@ -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:
......
......@@ -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:
......
......@@ -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>
......
......@@ -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:
......
......@@ -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 >& );
......
......@@ -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:
......
......@@ -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
{
......
......@@ -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:
......
......@@ -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
......
......@@ -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 );
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
......@@ -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>
......
......@@ -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:
......
......@@ -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:
......
......@@ -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>
......
......@@ -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
{
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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:
......
......@@ -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:
......
......@@ -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
......
......@@ -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>
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment