chatterino2
Code Issues

refactor(emojis): use std::variant and QStringView (#6714)

Browse Source
This commit is contained in:
Nerixyz
2026-01-05 21:06:42 +01:00
committed by GitHub
parent 327dc0ebcb
commit b7b592098f
8 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/emoji/Emojis.cpp
+5 -6
View File
@@ -312,10 +312,10 @@ void Emojis::loadEmojiSet()
});
}
std::vector<boost::variant<EmotePtr, QString>> Emojis::parse(
const QString &text) const
std::vector<std::variant<EmotePtr, QStringView>> Emojis::parse(
QStringView text) const
{
auto result = std::vector<boost::variant<EmotePtr, QString>>();
auto result = std::vector<std::variant<EmotePtr, QStringView>>();
QString::size_type lastParsedEmojiEndIndex = 0;
for (qsizetype i = 0; i < text.length(); ++i)
@@ -351,7 +351,7 @@ std::vector<boost::variant<EmotePtr, QString>> Emojis::parse(
{
// look in emoji->value
bool match = QStringView{emoji->value}.mid(1) ==
QStringView{text}.mid(i + 1, emojiExtraCharacters);
text.mid(i + 1, emojiExtraCharacters);
if (match)
{
@@ -367,8 +367,7 @@ std::vector<boost::variant<EmotePtr, QString>> Emojis::parse(
// This checking here relies on the fact that the nonQualified string
// always starts with the same byte as value (the unified string)
bool match = QStringView{emoji->nonQualified}.mid(1) ==
QStringView{text}.mid(
i + 1, emojiNonQualifiedExtraCharacters);
text.mid(i + 1, emojiNonQualifiedExtraCharacters);
if (match)
{
src/providers/emoji/Emojis.hpp
+5 -5
View File
@@ -3,12 +3,12 @@
#include "common/FlagsEnum.hpp"
#include "providers/emoji/EmojiStyle.hpp"
#include <boost/variant.hpp>
#include <QMap>
#include <QRegularExpression>
#include <QVector>
#include <memory>
#include <variant>
#include <vector>
namespace chatterino {
@@ -50,8 +50,8 @@ class IEmojis
public:
virtual ~IEmojis() = default;
virtual std::vector<boost::variant<EmotePtr, QString>> parse(
const QString &text) const = 0;
virtual std::vector<std::variant<EmotePtr, QStringView>> parse(
QStringView text) const = 0;
virtual const std::vector<EmojiPtr> &getEmojis() const = 0;
virtual const std::vector<QString> &getShortCodes() const = 0;
virtual QString replaceShortCodes(const QString &text) const = 0;
@@ -61,8 +61,8 @@ class Emojis : public IEmojis
{
public:
void load();
std::vector<boost::variant<EmotePtr, QString>> parse(
const QString &text) const override;
std::vector<std::variant<EmotePtr, QStringView>> parse(
QStringView text) const override;
std::vector<QString> shortCodes;
QString replaceShortCodes(const QString &text) const override;