Merge branch 'master' of github.com:fourtf/chatterino2

2017-03-11 11:38:56 +01:00
parent 46f432890f 181fb69a44
commit 0ace6d2bc8
23 changed files with 536 additions and 116 deletions
@@ -65,6 +65,9 @@ public:
                  ButtonTimeout
    };

+    Word()
+    {
+    }
    explicit Word(LazyLoadedImage *image, Type getType, const QString &copytext,
                  const QString &getTooltip, const Link &getLink = Link());
    explicit Word(const QString &text, Type getType, const QColor &getColor,
@@ -182,7 +185,7 @@ public:
    }

    std::vector<short> &
-    getCharacterWidthCache()
+    getCharacterWidthCache() const
    {
        return this->characterWidthCache;
    }
@@ -206,7 +209,7 @@ private:
    Fonts::Type font = Fonts::Medium;
    Link link;

-    std::vector<short> characterWidthCache;
+    mutable std::vector<short> characterWidthCache;
 };

 }  // namespace messages