Remove boost::noncopyable use & boost::random dependency (#4776)
The use has been removed from the following files: * Atomic.hpp * SignalVector.hpp * Benchmark.hpp * IvrApi * LoggingChannel.hpp * Singleton.hpp * Image.hpp * PrecompiledHeader.hpp * Message.hpp * MessageElement.hpp * MessageLayout.hpp * MessageLayoutElement.hpp * Fonts.hpp (just include)
This commit is contained in:
+14
-3
@@ -3,7 +3,6 @@
|
||||
#include "common/Aliases.hpp"
|
||||
#include "common/Common.hpp"
|
||||
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <boost/variant.hpp>
|
||||
#include <pajlada/signals/signal.hpp>
|
||||
@@ -26,13 +25,19 @@ namespace detail {
|
||||
Image image;
|
||||
int duration;
|
||||
};
|
||||
class Frames : boost::noncopyable
|
||||
class Frames
|
||||
{
|
||||
public:
|
||||
Frames();
|
||||
Frames(QVector<Frame<QPixmap>> &&frames);
|
||||
~Frames();
|
||||
|
||||
Frames(const Frames &) = delete;
|
||||
Frames &operator=(const Frames &) = delete;
|
||||
|
||||
Frames(Frames &&) = delete;
|
||||
Frames &operator=(Frames &&) = delete;
|
||||
|
||||
void clear();
|
||||
bool empty() const;
|
||||
bool animated() const;
|
||||
@@ -54,7 +59,7 @@ class Image;
|
||||
using ImagePtr = std::shared_ptr<Image>;
|
||||
|
||||
/// This class is thread safe.
|
||||
class Image : public std::enable_shared_from_this<Image>, boost::noncopyable
|
||||
class Image : public std::enable_shared_from_this<Image>
|
||||
{
|
||||
public:
|
||||
// Maximum amount of RAM used by the image in bytes.
|
||||
@@ -62,6 +67,12 @@ public:
|
||||
|
||||
~Image();
|
||||
|
||||
Image(const Image &) = delete;
|
||||
Image &operator=(const Image &) = delete;
|
||||
|
||||
Image(Image &&) = delete;
|
||||
Image &operator=(Image &&) = delete;
|
||||
|
||||
static ImagePtr fromUrl(const Url &url, qreal scale = 1);
|
||||
static ImagePtr fromResourcePixmap(const QPixmap &pixmap, qreal scale = 1);
|
||||
static ImagePtr getEmpty();
|
||||
|
||||
Reference in New Issue
Block a user