noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Store the QStrings by value instead of by pointer

Browse source
This commit is contained in:
Rasmus Karlsson 2017-01-05 16:53:13 +01:00
parent f41a541249
commit 8411d71741
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
word.cpp
View file

@ -3,26 +3,22 @@
Word::Word(LazyLoadedImage* image, Type type, const QString& copytext, const QString& tooltip)
{
this->image = image;
this->text = NULL;
m_isImage = true;
m_type = type;
m_copyText = new QString(copytext);
m_tooltip = new QString(tooltip);
m_copyText = copytext;
m_tooltip = tooltip;
}
Word::Word(const QString& text, Type type, const QString& copytext, const QString& tooltip)
{
this->image = NULL;
this->text = new QString(text);
this->text = text;
m_isImage = false;
m_type = type;
m_copyText = new QString(copytext);
m_tooltip = new QString(tooltip);
m_copyText = copytext;
m_tooltip = tooltip;
}
Word::~Word()
{
delete text;
delete m_copyText;
delete m_tooltip;
}

12
word.h
View file

@ -50,7 +50,7 @@ public:
}
QString& getText() {
return *text;
return text;
}
int width() {
@ -78,7 +78,7 @@ public:
}
QString& copyText() {
return *m_copyText;
return m_copyText;
}
bool hasTrailingSpace() {
@ -94,17 +94,17 @@ public:
}
QString& tooltip() {
return *m_tooltip;
return m_tooltip;
}
private:
LazyLoadedImage* image;
QString* text;
QString text;
bool m_isImage;
Type m_type;
QString* m_copyText;
QString* m_tooltip;
QString m_copyText;
QString m_tooltip;
int m_x;
int m_y;
int m_width;