summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-01 23:42:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-04 06:54:36 +0000
commit8c2f2e1dd77cdce9bdf63beff5a79f91adc44630 (patch)
tree033a2ebbf8d3b4ae28bf837498c4fa76458d1dee /avmedia
parent9338e4f5b1ffcba2d5b0bd8960dd8795d8909ff1 (diff)
tdf#94306 replace boost::noncopyable in ..
.. accessibility, avmedia, basctl, basic and bridges remove boost from module if not needed anymore Change-Id: I6177f8276766a0a7df1703e81bf1b448912df6e2 Reviewed-on: https://gerrit.libreoffice.org/23744 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.hxx7
-rw-r--r--avmedia/source/vlc/wrapper/EventHandler.hxx6
-rw-r--r--avmedia/source/vlc/wrapper/EventManager.hxx6
-rw-r--r--avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx6
4 files changed, 17 insertions, 8 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index af181385ece7..0d2f89dd8069 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -23,7 +23,6 @@
#include "gstplayer.hxx"
#include <com/sun/star/media/XFrameGrabber.hpp>
#include <cppuhelper/implbase.hxx>
-#include <boost/noncopyable.hpp>
namespace avmedia { namespace gstreamer {
@@ -31,11 +30,15 @@ typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo > FrameGrabber_BASE;
-class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
+class FrameGrabber : public FrameGrabber_BASE
{
GstElement *mpPipeline;
void disposePipeline();
public:
+ // noncopyable
+ FrameGrabber(const FrameGrabber&) = delete;
+ const FrameGrabber& operator=(const FrameGrabber&) =delete;
+
// static create method instead of public Ctor
static FrameGrabber* create( const OUString &rURL );
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx
index c5151987fa93..e9d8cc224294 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#include <functional>
-#include <boost/noncopyable.hpp>
#include <salhelper/thread.hxx>
#include "ThreadsafeQueue.hxx"
@@ -21,9 +20,12 @@ namespace vlc
{
namespace wrapper
{
- class EventHandler : public ::osl::Thread, private boost::noncopyable
+ class EventHandler : public ::osl::Thread
{
public:
+ EventHandler(const EventHandler&) = delete;
+ const EventHandler& operator=(const EventHandler&) = delete;
+
EventHandler();
void stop();
diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/wrapper/EventManager.hxx
index c3905fcc1a64..85939877cb42 100644
--- a/avmedia/source/vlc/wrapper/EventManager.hxx
+++ b/avmedia/source/vlc/wrapper/EventManager.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#include <functional>
-#include <boost/noncopyable.hpp>
#include "Player.hxx"
struct libvlc_event_manager_t;
@@ -24,10 +23,13 @@ namespace vlc
namespace wrapper
{
class EventHandler;
- class EventManager : private boost::noncopyable
+ class EventManager
{
public:
+ EventManager(const EventManager&) = delete;
+ const EventManager& operator=(const EventManager&) = delete;
+
static bool LoadSymbols();
typedef std::function<void()> Callback;
diff --git a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx b/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
index b5a8934ac82f..86904e669204 100644
--- a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
+++ b/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
@@ -22,7 +22,6 @@
#include <iostream>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
-#include <boost/noncopyable.hpp>
namespace avmedia
{
@@ -31,9 +30,12 @@ namespace vlc
namespace wrapper
{
template<class T>
-class ThreadsafeQueue : private boost::noncopyable
+class ThreadsafeQueue
{
public:
+ ThreadsafeQueue(const ThreadsafeQueue&) = delete;
+ const ThreadsafeQueue& operator=(const ThreadsafeQueue&) = delete;
+
ThreadsafeQueue();
void push( const T& data );