Skip to content

C
core
Kaydet (Commit) 623c2b92 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

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
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 77 deletions
avmedia/source/gstreamer/gstcommon.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
avmedia/source/gstreamer/gstframegrabber.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "gstplayer.hxx" #include "gstplayer.hxx"
#include <com/sun/star/media/XFrameGrabber.hpp> #include <com/sun/star/media/XFrameGrabber.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
namespace avmedia { namespace gstreamer { namespace avmedia { namespace gstreamer {
...@@ -31,8 +31,8 @@ namespace avmedia { namespace gstreamer { ...@@ -31,8 +31,8 @@ namespace avmedia { namespace gstreamer {
// - FrameGrabber - // - FrameGrabber -
typedef ::cppu::WeakImplHelper2< ::com::sun::star::media::XFrameGrabber, typedef ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; ::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE;
class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
{ {
......
avmedia/source/gstreamer/gstmanager.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
#include "gstcommon.hxx" #include "gstcommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp" #include "com/sun/star/media/XManager.hpp"
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
namespace avmedia { namespace gstreamer { namespace avmedia { namespace gstreamer {
class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/gstreamer/gstplayer.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "gstcommon.hxx" #include "gstcommon.hxx"
#include "com/sun/star/media/XPlayer.hpp" #include "com/sun/star/media/XPlayer.hpp"
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
typedef struct _GstVideoOverlay GstVideoOverlay; typedef struct _GstVideoOverlay GstVideoOverlay;
...@@ -35,8 +35,8 @@ namespace avmedia { namespace gstreamer { ...@@ -35,8 +35,8 @@ namespace avmedia { namespace gstreamer {
// - Player - // - Player -
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
::com::sun::star::lang::XServiceInfo > GstPlayer_BASE; ::com::sun::star::lang::XServiceInfo > GstPlayer_BASE;
class Player : public ::cppu::BaseMutex, class Player : public ::cppu::BaseMutex,
public GstPlayer_BASE public GstPlayer_BASE
......
avmedia/source/gstreamer/gstwindow.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX #define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
#include "gstcommon.hxx" #include "gstcommon.hxx"
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hpp" #include "com/sun/star/media/XPlayerWindow.hpp"
...@@ -33,8 +34,8 @@ namespace avmedia { namespace gstreamer { ...@@ -33,8 +34,8 @@ namespace avmedia { namespace gstreamer {
class Player; class Player;
class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/macavf/framegrabber.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX #define INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX
#include "macavfcommon.hxx" #include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XFrameGrabber.hdl" #include "com/sun/star/media/XFrameGrabber.hdl"
...@@ -30,8 +31,8 @@ namespace avmedia { namespace macavf { ...@@ -30,8 +31,8 @@ namespace avmedia { namespace macavf {
// - FrameGrabber - // - FrameGrabber -
// ---------------- // ----------------
class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber, class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/macavf/macavfcommon.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
avmedia/source/macavf/manager.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_MANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_MACAVF_MANAGER_HXX
#include "macavfcommon.hxx" #include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hdl" #include "com/sun/star/media/XManager.hdl"
...@@ -30,8 +31,8 @@ ...@@ -30,8 +31,8 @@
namespace avmedia { namespace macavf { namespace avmedia { namespace macavf {
class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/macavf/player.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <osl/conditn.h> #include <osl/conditn.h>
#include "macavfcommon.hxx" #include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XPlayer.hdl" #include "com/sun/star/media/XPlayer.hdl"
...@@ -35,8 +36,8 @@ namespace avmedia { namespace macavf { ...@@ -35,8 +36,8 @@ namespace avmedia { namespace macavf {
class Player class Player
: public MacAVObserverHandler : public MacAVObserverHandler
, public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer, , public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
......
avmedia/source/macavf/window.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_WINDOW_HXX #define INCLUDED_AVMEDIA_SOURCE_MACAVF_WINDOW_HXX
#include "macavfcommon.hxx" #include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hdl" #include "com/sun/star/media/XPlayerWindow.hdl"
...@@ -46,8 +47,8 @@ class Player; ...@@ -46,8 +47,8 @@ class Player;
class Window class Window
: public MacAVObserverHandler : public MacAVObserverHandler
, public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, , public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/opengl/oglframegrabber.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
#define 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/lang/XServiceInfo.hpp>
#include <com/sun/star/media/XFrameGrabber.hpp> #include <com/sun/star/media/XFrameGrabber.hpp>
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
namespace avmedia { namespace ogl { namespace avmedia { namespace ogl {
typedef ::cppu::WeakImplHelper2< com::sun::star::media::XFrameGrabber, typedef ::cppu::WeakImplHelper< com::sun::star::media::XFrameGrabber,
com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; com::sun::star::lang::XServiceInfo > FrameGrabber_BASE;
class OGLFrameGrabber : public FrameGrabber_BASE class OGLFrameGrabber : public FrameGrabber_BASE
{ {
......
avmedia/source/opengl/oglmanager.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -10,15 +10,15 @@ ...@@ -10,15 +10,15 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
#define 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/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/media/XManager.hpp> #include <com/sun/star/media/XManager.hpp>
namespace avmedia { namespace ogl { namespace avmedia { namespace ogl {
class OGLManager : public ::cppu::WeakImplHelper2 < com::sun::star::media::XManager, class OGLManager : public ::cppu::WeakImplHelper< com::sun::star::media::XManager,
com::sun::star::lang::XServiceInfo > com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/opengl/oglplayer.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
#define 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 <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/media/XPlayer.hpp>
...@@ -26,8 +26,8 @@ namespace avmedia { namespace ogl { ...@@ -26,8 +26,8 @@ namespace avmedia { namespace ogl {
class OGLWindow; class OGLWindow;
typedef ::cppu::WeakComponentImplHelper2< com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< com::sun::star::media::XPlayer,
com::sun::star::lang::XServiceInfo > Player_BASE; com::sun::star::lang::XServiceInfo > Player_BASE;
class OGLPlayer : public cppu::BaseMutex, class OGLPlayer : public cppu::BaseMutex,
public Player_BASE public Player_BASE
......
avmedia/source/opengl/oglwindow.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "oglplayer.hxx" #include "oglplayer.hxx"
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/media/XPlayerWindow.hpp> #include <com/sun/star/media/XPlayerWindow.hpp>
#include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/media/ZoomLevel.hpp>
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
namespace avmedia { namespace ogl { namespace avmedia { namespace ogl {
class OGLWindow : public ::cppu::WeakImplHelper2 < com::sun::star::media::XPlayerWindow, class OGLWindow : public ::cppu::WeakImplHelper< com::sun::star::media::XPlayerWindow,
com::sun::star::lang::XServiceInfo > com::sun::star::lang::XServiceInfo >
{ {
public: public:
OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent ); OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent );
......
avmedia/source/quicktime/framegrabber.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX #define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
#include "quicktimecommon.hxx" #include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XFrameGrabber.hpp" #include "com/sun/star/media/XFrameGrabber.hpp"
...@@ -30,8 +31,8 @@ namespace avmedia { namespace quicktime { ...@@ -30,8 +31,8 @@ namespace avmedia { namespace quicktime {
// - FrameGrabber - // - FrameGrabber -
class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber, class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/quicktime/manager.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
#include "quicktimecommon.hxx" #include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp" #include "com/sun/star/media/XManager.hpp"
...@@ -30,8 +31,8 @@ ...@@ -30,8 +31,8 @@
namespace avmedia { namespace quicktime { namespace avmedia { namespace quicktime {
class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/quicktime/player.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX #define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
#include "quicktimecommon.hxx" #include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XPlayer.hpp" #include "com/sun/star/media/XPlayer.hpp"
namespace avmedia { namespace quicktime { namespace avmedia { namespace quicktime {
...@@ -32,8 +32,8 @@ namespace avmedia { namespace quicktime { ...@@ -32,8 +32,8 @@ namespace avmedia { namespace quicktime {
*/ */
class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer, class Player : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/quicktime/quicktimecommon.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
avmedia/source/quicktime/window.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX #define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
#include "quicktimecommon.hxx" #include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hpp" #include "com/sun/star/media/XPlayerWindow.hpp"
...@@ -33,8 +34,8 @@ namespace avmedia { namespace quicktime { ...@@ -33,8 +34,8 @@ namespace avmedia { namespace quicktime {
class Player; class Player;
class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/viewer/mediaevent_impl.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX #define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
#include <avmedia/mediawindow.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/XKeyListener.hpp>
#include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp>
#include <com/sun/star/awt/XMouseMotionListener.hpp> #include <com/sun/star/awt/XMouseMotionListener.hpp>
...@@ -35,10 +35,10 @@ namespace avmedia ...@@ -35,10 +35,10 @@ namespace avmedia
// - MediaEventListenersImpl - // - MediaEventListenersImpl -
class MediaEventListenersImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::awt::XKeyListener, class MediaEventListenersImpl : public ::cppu::WeakImplHelper< ::com::sun::star::awt::XKeyListener,
::com::sun::star::awt::XMouseListener, ::com::sun::star::awt::XMouseListener,
::com::sun::star::awt::XMouseMotionListener, ::com::sun::star::awt::XMouseMotionListener,
::com::sun::star::awt::XFocusListener > ::com::sun::star::awt::XFocusListener >
{ {
public: public:
......
avmedia/source/vlc/vlccommon.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
avmedia/source/vlc/vlcframegrabber.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -22,15 +22,15 @@ ...@@ -22,15 +22,15 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <com/sun/star/media/XFrameGrabber.hpp> #include <com/sun/star/media/XFrameGrabber.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include "vlccommon.hxx" #include "vlccommon.hxx"
#include "wrapper/Wrapper.hxx" #include "wrapper/Wrapper.hxx"
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
typedef ::cppu::WeakImplHelper2< ::com::sun::star::media::XFrameGrabber, typedef ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; ::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE;
class VLCFrameGrabber : public FrameGrabber_BASE class VLCFrameGrabber : public FrameGrabber_BASE
{ {
......
avmedia/source/vlc/vlcmanager.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -23,12 +23,13 @@ ...@@ -23,12 +23,13 @@
#include "vlccommon.hxx" #include "vlccommon.hxx"
#include "wrapper/Wrapper.hxx" #include "wrapper/Wrapper.hxx"
#include <memory> #include <memory>
#include <cppuhelper/implbase.hxx>
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
std::unique_ptr<wrapper::Instance> mInstance; std::unique_ptr<wrapper::Instance> mInstance;
wrapper::EventHandler mEventHandler; wrapper::EventHandler mEventHandler;
......
avmedia/source/vlc/vlcplayer.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
#include "vlccommon.hxx" #include "vlccommon.hxx"
#include <boost/shared_ptr.hpp> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/media/XPlayer.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
...@@ -34,8 +33,8 @@ ...@@ -34,8 +33,8 @@
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
::com::sun::star::lang::XServiceInfo > VLC_Base; ::com::sun::star::lang::XServiceInfo > VLC_Base;
class VLCPlayer : public ::cppu::BaseMutex, class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base public VLC_Base
......
avmedia/source/vlc/vlcwindow.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -20,13 +20,14 @@ ...@@ -20,13 +20,14 @@
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
#include "vlccommon.hxx" #include "vlccommon.hxx"
#include <cppuhelper/implbase.hxx>
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
class VLCPlayer; class VLCPlayer;
class VLCWindow : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, class VLCWindow : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
VLCPlayer& mPlayer; VLCPlayer& mPlayer;
const intptr_t mPrevWinID; const intptr_t mPrevWinID;
......
avmedia/source/win/framegrabber.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX #define INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
#include "wincommon.hxx" #include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XFrameGrabber.hpp" #include "com/sun/star/media/XFrameGrabber.hpp"
struct IMediaDet; struct IMediaDet;
...@@ -32,8 +32,8 @@ namespace avmedia { namespace win { ...@@ -32,8 +32,8 @@ namespace avmedia { namespace win {
// - FrameGrabber - // - FrameGrabber -
class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber, class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/win/manager.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
#include "wincommon.hxx" #include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp" #include "com/sun/star/media/XManager.hpp"
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
namespace avmedia { namespace win { namespace avmedia { namespace win {
class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: public:
......
avmedia/source/win/player.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "com/sun/star/media/XPlayer.hpp" #include "com/sun/star/media/XPlayer.hpp"
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
struct IGraphBuilder; struct IGraphBuilder;
...@@ -46,8 +46,8 @@ namespace avmedia { namespace win { ...@@ -46,8 +46,8 @@ namespace avmedia { namespace win {
// - Player - // - Player -
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
::com::sun::star::lang::XServiceInfo > Player_BASE; ::com::sun::star::lang::XServiceInfo > Player_BASE;
class Player : public cppu::BaseMutex, class Player : public cppu::BaseMutex,
public Player_BASE public Player_BASE
......
avmedia/source/win/wincommon.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
avmedia/source/win/window.hxx
Dosyayı görüntüle @ 623c2b92
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX #define INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
#include "wincommon.hxx" #include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.h>
#include "com/sun/star/media/XPlayerWindow.hpp" #include "com/sun/star/media/XPlayerWindow.hpp"
...@@ -35,8 +36,8 @@ namespace avmedia { namespace win { ...@@ -35,8 +36,8 @@ namespace avmedia { namespace win {
class Player; class Player;
class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {
public: 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