refactoring

2017-04-12 17:46:44 +02:00
parent 8ef492d7ae
commit 96db82e867
114 changed files with 5554 additions and 3703 deletions
@@ -4,35 +4,131 @@ namespace chatterino {
 namespace messages {

 // Image word
-Word::Word(LazyLoadedImage *image, Type type, const QString &copytext,
-           const QString &tooltip, const Link &link)
-    : image(image)
-    , text()
-    , color()
+Word::Word(LazyLoadedImage *image, Type type, const QString &copytext, const QString &tooltip,
+           const Link &link)
+    : _image(image)
+    , _text()
+    , _color()
    , _isImage(true)
-    , type(type)
-    , copyText(copytext)
-    , tooltip(tooltip)
-    , link(link)
-    , characterWidthCache()
+    , _type(type)
+    , _copyText(copytext)
+    , _tooltip(tooltip)
+    , _link(link)
+    , _characterWidthCache()
 {
    image->getWidth();  // professional segfault test
 }

 // Text word
-Word::Word(const QString &text, Type type, const QColor &color,
-           const QString &copytext, const QString &tooltip, const Link &link)
-    : image(NULL)
-    , text(text)
-    , color(color)
+Word::Word(const QString &text, Type type, const QColor &color, const QString &copytext,
+           const QString &tooltip, const Link &link)
+    : _image(NULL)
+    , _text(text)
+    , _color(color)
    , _isImage(false)
-    , type(type)
-    , copyText(copytext)
-    , tooltip(tooltip)
-    , link(link)
-    , characterWidthCache()
+    , _type(type)
+    , _copyText(copytext)
+    , _tooltip(tooltip)
+    , _link(link)
+    , _characterWidthCache()
 {
 }

+LazyLoadedImage &Word::getImage() const
+{
+    return *_image;
+}
+
+const QString &Word::getText() const
+{
+    return _text;
+}
+
+int Word::getWidth() const
+{
+    return _width;
+}
+
+int Word::getHeight() const
+{
+    return _height;
+}
+
+void Word::setSize(int width, int height)
+{
+    _width = width;
+    _height = height;
+}
+
+bool Word::isImage() const
+{
+    return _isImage;
+}
+
+bool Word::isText() const
+{
+    return !_isImage;
+}
+
+const QString &Word::getCopyText() const
+{
+    return _copyText;
+}
+
+bool Word::hasTrailingSpace() const
+{
+    return _hasTrailingSpace;
+}
+
+QFont &Word::getFont() const
+{
+    return FontManager::getInstance().getFont(_font);
+}
+
+QFontMetrics &Word::getFontMetrics() const
+{
+    return FontManager::getInstance().getFontMetrics(_font);
+}
+
+Word::Type Word::getType() const
+{
+    return _type;
+}
+
+const QString &Word::getTooltip() const
+{
+    return _tooltip;
+}
+
+const QColor &Word::getColor() const
+{
+    return _color;
+}
+
+const Link &Word::getLink() const
+{
+    return _link;
+}
+
+int Word::getXOffset() const
+{
+    return _xOffset;
+}
+
+int Word::getYOffset() const
+{
+    return _yOffset;
+}
+
+void Word::setOffset(int xOffset, int yOffset)
+{
+    _xOffset = std::max(0, xOffset);
+    _yOffset = std::max(0, yOffset);
+}
+
+std::vector<short> &Word::getCharacterWidthCache() const
+{
+    return _characterWidthCache;
+}
 }  // namespace messages
 }  // namespace chatterino