diff --git a/Telegram/SourceFiles/codegen/emoji/generator.cpp b/Telegram/SourceFiles/codegen/emoji/generator.cpp index 6920bd28c..905045540 100644 --- a/Telegram/SourceFiles/codegen/emoji/generator.cpp +++ b/Telegram/SourceFiles/codegen/emoji/generator.cpp @@ -267,7 +267,7 @@ bool Generator::writeSource() { constexpr auto kCount = " << data_.list.size() << ";\n\ auto WorkingIndex = -1;\n\ \n\ -QVector Items;\n\ +std::vector Items;\n\ \n"; source_->popNamespace().newline().pushNamespace("internal"); source_->stream() << "\ diff --git a/Telegram/SourceFiles/ui/emoji_config.cpp b/Telegram/SourceFiles/ui/emoji_config.cpp index 1e4b0b381..a795c8343 100644 --- a/Telegram/SourceFiles/ui/emoji_config.cpp +++ b/Telegram/SourceFiles/ui/emoji_config.cpp @@ -31,7 +31,7 @@ namespace { constexpr auto kCount = 2167; auto WorkingIndex = -1; -QVector Items; +std::vector Items; } // namespace diff --git a/Telegram/SourceFiles/ui/emoji_config.h b/Telegram/SourceFiles/ui/emoji_config.h index 0f42c1c4e..f2677339e 100644 --- a/Telegram/SourceFiles/ui/emoji_config.h +++ b/Telegram/SourceFiles/ui/emoji_config.h @@ -54,6 +54,8 @@ constexpr auto kPostfix = static_cast(0xFE0F); class One { public: + One(One &&other) = default; + QString id() const { return _id; } @@ -95,9 +97,6 @@ public: } private: - One() = default; // For QVector<> to compile. - One(const One &other) = default; - One(const QString &id, uint16 x, uint16 y, bool hasPostfix, bool colorizable, EmojiPtr original) : _id(id) , _x(x) @@ -108,15 +107,14 @@ private: t_assert(!_colorizable || !colored()); } - QString _id; - uint16 _x = 0; - uint16 _y = 0; - bool _hasPostfix = false; - bool _colorizable = false; - EmojiPtr _original = nullptr; + const QString _id; + const uint16 _x = 0; + const uint16 _y = 0; + const bool _hasPostfix = false; + const bool _colorizable = false; + const EmojiPtr _original = nullptr; friend void Init(); - friend class QVector; };