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();
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include "common/FlagsEnum.hpp"
|
||||
#include "util/QStringHash.hpp"
|
||||
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <QColor>
|
||||
#include <QTime>
|
||||
|
||||
@@ -54,10 +53,16 @@ enum class MessageFlag : int64_t {
|
||||
};
|
||||
using MessageFlags = FlagsEnum<MessageFlag>;
|
||||
|
||||
struct Message : boost::noncopyable {
|
||||
struct Message {
|
||||
Message();
|
||||
~Message();
|
||||
|
||||
Message(const Message &) = delete;
|
||||
Message &operator=(const Message &) = delete;
|
||||
|
||||
Message(Message &&) = delete;
|
||||
Message &operator=(Message &&) = delete;
|
||||
|
||||
// Making this a mutable means that we can update a messages flags,
|
||||
// while still keeping Message constant. This means that a message's flag
|
||||
// can be updated without the renderer being made aware, which might be bad.
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include "messages/MessageColor.hpp"
|
||||
#include "singletons/Fonts.hpp"
|
||||
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <pajlada/signals/signalholder.hpp>
|
||||
#include <QRect>
|
||||
#include <QString>
|
||||
@@ -158,7 +157,7 @@ enum class MessageElementFlag : int64_t {
|
||||
};
|
||||
using MessageElementFlags = FlagsEnum<MessageElementFlag>;
|
||||
|
||||
class MessageElement : boost::noncopyable
|
||||
class MessageElement
|
||||
{
|
||||
public:
|
||||
enum UpdateFlags : char {
|
||||
@@ -173,6 +172,12 @@ public:
|
||||
|
||||
virtual ~MessageElement();
|
||||
|
||||
MessageElement(const MessageElement &) = delete;
|
||||
MessageElement &operator=(const MessageElement &) = delete;
|
||||
|
||||
MessageElement(MessageElement &&) = delete;
|
||||
MessageElement &operator=(MessageElement &&) = delete;
|
||||
|
||||
MessageElement *setLink(const Link &link);
|
||||
MessageElement *setText(const QString &text);
|
||||
MessageElement *setTooltip(const QString &tooltip);
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#include "common/FlagsEnum.hpp"
|
||||
#include "messages/layouts/MessageLayoutContainer.hpp"
|
||||
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <QPixmap>
|
||||
|
||||
#include <cinttypes>
|
||||
@@ -33,12 +32,18 @@ enum class MessageLayoutFlag : uint8_t {
|
||||
};
|
||||
using MessageLayoutFlags = FlagsEnum<MessageLayoutFlag>;
|
||||
|
||||
class MessageLayout : boost::noncopyable
|
||||
class MessageLayout
|
||||
{
|
||||
public:
|
||||
MessageLayout(MessagePtr message_);
|
||||
~MessageLayout();
|
||||
|
||||
MessageLayout(const MessageLayout &) = delete;
|
||||
MessageLayout &operator=(const MessageLayout &) = delete;
|
||||
|
||||
MessageLayout(MessageLayout &&) = delete;
|
||||
MessageLayout &operator=(MessageLayout &&) = delete;
|
||||
|
||||
const Message *getMessage();
|
||||
const MessagePtr &getMessagePtr() const;
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include "common/FlagsEnum.hpp"
|
||||
#include "messages/Link.hpp"
|
||||
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <pajlada/signals/signalholder.hpp>
|
||||
#include <QPen>
|
||||
#include <QPoint>
|
||||
@@ -23,12 +22,18 @@ enum class FontStyle : uint8_t;
|
||||
enum class MessageElementFlag : int64_t;
|
||||
struct MessageColors;
|
||||
|
||||
class MessageLayoutElement : boost::noncopyable
|
||||
class MessageLayoutElement
|
||||
{
|
||||
public:
|
||||
MessageLayoutElement(MessageElement &creator_, const QSize &size);
|
||||
virtual ~MessageLayoutElement();
|
||||
|
||||
MessageLayoutElement(const MessageLayoutElement &) = delete;
|
||||
MessageLayoutElement &operator=(const MessageLayoutElement &) = delete;
|
||||
|
||||
MessageLayoutElement(MessageLayoutElement &&) = delete;
|
||||
MessageLayoutElement &operator=(MessageLayoutElement &&) = delete;
|
||||
|
||||
bool reversedNeutral = false;
|
||||
|
||||
const QRect &getRect() const;
|
||||
|
||||
Reference in New Issue
Block a user