this commit is too big

This commit is contained in:
fourtf
2018-08-02 14:23:27 +02:00
parent 3b3c5d8d75
commit c2e2dfb577
186 changed files with 3626 additions and 2656 deletions
@@ -1,14 +1,14 @@
#pragma once
#include <QString>
#include <boost/optional.hpp>
#include <pajlada/settings/serialize.hpp>
#include "messages/Image.hpp"
#include "util/RapidjsonHelpers.hpp"
namespace chatterino {
class Image;
class ModerationAction
{
public:
@@ -17,13 +17,13 @@ public:
bool operator==(const ModerationAction &other) const;
bool isImage() const;
Image *getImage() const;
const boost::optional<ImagePtr> &getImage() const;
const QString &getLine1() const;
const QString &getLine2() const;
const QString &getAction() const;
private:
Image *image_ = nullptr;
boost::optional<ImagePtr> image_;
QString line1_;
QString line2_;
QString action_;