juicy compiler error

This commit is contained in:
fourtf
2017-01-11 18:52:09 +01:00
parent 580a411e9d
commit 854566b57f
63 changed files with 1481 additions and 1067 deletions
+71 -35
View File
@@ -1,8 +1,8 @@
#ifndef WORD_H
#define WORD_H
#include "lazyloadedimage.h"
#include "fonts.h"
#include "lazyloadedimage.h"
#include "link.h"
#include <QRect>
@@ -16,7 +16,7 @@ public:
Misc = 1,
Text = 2,
TimestampNoSeconds = 4,
TimestampNoSeconds = 4,
TimestampWithSeconds = 8,
TwitchEmoteImage = 0x10,
@@ -27,7 +27,8 @@ public:
BttvGifEmoteText = 0x200,
FfzEmoteImage = 0x400,
FfzEmoteText = 0x800,
EmoteImages = TwitchEmoteImage | BttvEmoteImage | BttvGifEmoteImage | FfzEmoteImage,
EmoteImages = TwitchEmoteImage | BttvEmoteImage | BttvGifEmoteImage |
FfzEmoteImage,
Bits = 0x1000,
BitsAnimated = 0x2000,
@@ -41,101 +42,136 @@ public:
BadgePremium = 0x100000,
BadgeChatterino = 0x200000,
BadgeCheer = 0x400000,
Badges = BadgeStaff
| BadgeAdmin
| BadgeGlobalMod
| BadgeModerator
| BadgeTurbo
| BadgeBroadcaster
| BadgePremium
| BadgeChatterino
| BadgeCheer,
Badges = BadgeStaff | BadgeAdmin | BadgeGlobalMod | BadgeModerator |
BadgeTurbo | BadgeBroadcaster | BadgePremium |
BadgeChatterino | BadgeCheer,
Username = 0x800000,
BitsAmount = 0x1000000,
Default = TimestampNoSeconds | Badges | Username | Bits | FfzEmoteImage | BttvEmoteImage | BttvGifEmoteImage | TwitchEmoteImage | BitsAmount
Default = TimestampNoSeconds | Badges | Username | Bits |
FfzEmoteImage | BttvEmoteImage | BttvGifEmoteImage |
TwitchEmoteImage | BitsAmount
};
explicit Word(LazyLoadedImage* m_image, Type type, const QString& copytext, const QString& tooltip, const Link& link = Link());
explicit Word(const QString& m_text, Type type, const QColor& color, const QString& copytext, const QString& tooltip, const Link& link = Link());
explicit Word(LazyLoadedImage *m_image, Type type, const QString &copytext,
const QString &tooltip, const Link &link = Link());
explicit Word(const QString &m_text, Type type, const QColor &color,
const QString &copytext, const QString &tooltip,
const Link &link = Link());
LazyLoadedImage& getImage() const {
LazyLoadedImage &
getImage() const
{
return *m_image;
}
const QString& getText() const {
const QString &
getText() const
{
return m_text;
}
int width() const {
int
width() const
{
return m_width;
}
int height() const {
int
height() const
{
return m_height;
}
void setSize(int width, int height) {
void
setSize(int width, int height)
{
m_width = width;
m_height = height;
}
bool isImage() const {
bool
isImage() const
{
return m_isImage;
}
bool isText() const {
bool
isText() const
{
return !m_isImage;
}
const QString& copyText() const {
const QString &
copyText() const
{
return m_copyText;
}
bool hasTrailingSpace() const {
bool
hasTrailingSpace() const
{
return m_hasTrailingSpace;
}
QFont& getFont() const {
QFont &
getFont() const
{
return Fonts::getFont(m_font);
}
QFontMetrics& getFontMetrics() const {
QFontMetrics &
getFontMetrics() const
{
return Fonts::getFontMetrics(m_font);
}
Type type() const {
Type
type() const
{
return m_type;
}
const QString& tooltip() const {
const QString &
tooltip() const
{
return m_tooltip;
}
const QColor& color() const {
const QColor &
color() const
{
return m_color;
}
const Link& link() const {
const Link &
link() const
{
return m_link;
}
int xOffset() const {
int
xOffset() const
{
return m_xOffset;
}
int yOffset() const {
int
yOffset() const
{
return m_yOffset;
}
void setOffset(int xOffset, int yOffset) {
void
setOffset(int xOffset, int yOffset)
{
m_xOffset = std::max(0, xOffset);
m_yOffset = std::max(0, yOffset);
}
private:
LazyLoadedImage* m_image;
LazyLoadedImage *m_image;
QString m_text;
QColor m_color;
bool m_isImage;
@@ -154,4 +190,4 @@ private:
Link m_link;
};
#endif // WORD_H
#endif // WORD_H