added another level of unneeded abstraction

This commit is contained in:
fourtf
2017-02-02 22:15:09 +01:00
parent 93660233fd
commit c6c90d9f50
10 changed files with 330 additions and 237 deletions
+2 -32
View File
@@ -54,18 +54,12 @@ public:
return displayName;
}
const std::vector<Word> &
getWords() const
std::vector<Word> &
getWords()
{
return words;
}
const std::vector<WordPart> &
getWordParts() const
{
return wordParts;
}
bool
getDisabled() const
{
@@ -78,20 +72,6 @@ public:
return id;
}
int
getHeight() const
{
return height;
}
bool layout(int width, bool enableEmoteMargins = true);
void
requestRelayout()
{
relayoutRequested = true;
}
private:
static LazyLoadedImage *badgeStaff;
static LazyLoadedImage *badgeAdmin;
@@ -113,17 +93,7 @@ private:
QString displayName = "";
QString id = "";
int height = 0;
std::vector<Word> words;
std::vector<WordPart> wordParts;
long currentLayoutWidth = -1;
bool relayoutRequested = true;
int fontGeneration = -1;
int emoteGeneration = -1;
void alignWordParts(int lineStart, int lineHeight);
static QString matchLink(const QString &string);