juicy compiler error
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#ifndef MESSAGE_H
|
||||
#define MESSAGE_H
|
||||
|
||||
#include "channel.h"
|
||||
#include "word.h"
|
||||
#include "wordpart.h"
|
||||
#include "channel.h"
|
||||
|
||||
#include <IrcMessage>
|
||||
#include <QVector>
|
||||
@@ -12,72 +12,106 @@
|
||||
class Message
|
||||
{
|
||||
public:
|
||||
Message(const QString& text);
|
||||
Message(const IrcPrivateMessage& ircMessage, const Channel& Channel, bool enablePingSound = true,
|
||||
bool isReceivedWhisper = false, bool isSentWhisper = false, bool includeChannel = false);
|
||||
Message(const QString &text);
|
||||
Message(const IrcPrivateMessage &ircMessage, const Channel &Channel,
|
||||
bool enablePingSound = true, bool isReceivedWhisper = false,
|
||||
bool isSentWhisper = false, bool includeChannel = false);
|
||||
|
||||
~Message() {
|
||||
~Message()
|
||||
{
|
||||
if (m_wordParts != NULL) {
|
||||
delete m_wordParts;
|
||||
}
|
||||
}
|
||||
|
||||
bool canHighlightTab() const {
|
||||
bool
|
||||
canHighlightTab() const
|
||||
{
|
||||
return m_highlightTab;
|
||||
}
|
||||
|
||||
const QString& timeoutUser() const {
|
||||
const QString &
|
||||
timeoutUser() const
|
||||
{
|
||||
return m_timeoutUser;
|
||||
}
|
||||
|
||||
int timeoutCount() const {
|
||||
int
|
||||
timeoutCount() const
|
||||
{
|
||||
return m_timeoutCount;
|
||||
}
|
||||
|
||||
const QString& userName() const {
|
||||
const QString &
|
||||
userName() const
|
||||
{
|
||||
return m_userName;
|
||||
}
|
||||
|
||||
const QString& displayName() const {
|
||||
const QString &
|
||||
displayName() const
|
||||
{
|
||||
return m_displayName;
|
||||
}
|
||||
|
||||
const std::vector<Word> words() const {
|
||||
const std::vector<Word>
|
||||
words() const
|
||||
{
|
||||
return m_words;
|
||||
}
|
||||
|
||||
const std::list<WordPart> wordParts() const {
|
||||
const std::list<WordPart>
|
||||
wordParts() const
|
||||
{
|
||||
return *m_wordParts;
|
||||
}
|
||||
|
||||
bool disabled() const {
|
||||
bool
|
||||
disabled() const
|
||||
{
|
||||
return m_disabled;
|
||||
}
|
||||
|
||||
const QString& id() const {
|
||||
const QString &
|
||||
id() const
|
||||
{
|
||||
return m_id;
|
||||
}
|
||||
|
||||
int height() const {
|
||||
int
|
||||
height() const
|
||||
{
|
||||
return m_height;
|
||||
}
|
||||
|
||||
bool layout(int width, bool enableEmoteMargins = true);
|
||||
|
||||
void requestRelayout() { m_relayoutRequested = true; }
|
||||
void requestTextRecalculation() { m_recalculateText = true; }
|
||||
void requestImageRecalculation() { m_recalculateImages = true; }
|
||||
void
|
||||
requestRelayout()
|
||||
{
|
||||
m_relayoutRequested = true;
|
||||
}
|
||||
void
|
||||
requestTextRecalculation()
|
||||
{
|
||||
m_recalculateText = true;
|
||||
}
|
||||
void
|
||||
requestImageRecalculation()
|
||||
{
|
||||
m_recalculateImages = true;
|
||||
}
|
||||
|
||||
private:
|
||||
static LazyLoadedImage* badgeStaff;
|
||||
static LazyLoadedImage* badgeAdmin;
|
||||
static LazyLoadedImage* badgeGlobalmod;
|
||||
static LazyLoadedImage* badgeModerator;
|
||||
static LazyLoadedImage* badgeTurbo;
|
||||
static LazyLoadedImage* badgeBroadcaster;
|
||||
static LazyLoadedImage* badgePremium;
|
||||
static LazyLoadedImage *badgeStaff;
|
||||
static LazyLoadedImage *badgeAdmin;
|
||||
static LazyLoadedImage *badgeGlobalmod;
|
||||
static LazyLoadedImage *badgeModerator;
|
||||
static LazyLoadedImage *badgeTurbo;
|
||||
static LazyLoadedImage *badgeBroadcaster;
|
||||
static LazyLoadedImage *badgePremium;
|
||||
|
||||
static QRegularExpression* cheerRegex;
|
||||
static QRegularExpression *cheerRegex;
|
||||
|
||||
bool m_highlightTab = false;
|
||||
QString m_timeoutUser = "";
|
||||
@@ -92,16 +126,18 @@ private:
|
||||
int m_height = 0;
|
||||
|
||||
std::vector<Word> m_words;
|
||||
std::list<WordPart>* m_wordParts;
|
||||
std::list<WordPart> *m_wordParts;
|
||||
|
||||
long m_currentLayoutWidth = -1;
|
||||
bool m_relayoutRequested = true;
|
||||
bool m_recalculateText = true;
|
||||
bool m_recalculateImages = true;
|
||||
|
||||
static QString matchLink(const QString& string);
|
||||
static QString matchLink(const QString &string);
|
||||
|
||||
static bool sortTwitchEmotes(const std::pair<long int, LazyLoadedImage*>& a, const std::pair<long int, LazyLoadedImage*>& b);
|
||||
static bool sortTwitchEmotes(
|
||||
const std::pair<long int, LazyLoadedImage *> &a,
|
||||
const std::pair<long int, LazyLoadedImage *> &b);
|
||||
};
|
||||
|
||||
#endif // MESSAGE_H
|
||||
#endif // MESSAGE_H
|
||||
|
||||
Reference in New Issue
Block a user