032f290767
This change enforces strict include grouping using IncludeCategories
In addition to adding this to the .clang-format file and applying it in the tests/src and src directories, I also did the following small changes:
In ChatterSet.hpp, I changed lrucache to a <>include
In Irc2.hpp, I change common/SignalVector.hpp to a "project-include"
In AttachedWindow.cpp, NativeMessaging.cpp, WindowsHelper.hpp, BaseWindow.cpp, and StreamerMode.cpp, I disabled clang-format for the windows-includes
In WindowDescriptors.hpp, I added the missing vector include. It was previously not needed because the include was handled by another file that was previously included first.
clang-format minimum version has been bumped, so Ubuntu version used in the check-formatting job has been bumped to 22.04 (which is the latest LTS)
72 lines
1.8 KiB
C++
72 lines
1.8 KiB
C++
#pragma once
|
|
|
|
#include "util/RapidjsonHelpers.hpp"
|
|
#include "util/RapidJsonSerializeQString.hpp"
|
|
|
|
#include <boost/optional.hpp>
|
|
#include <pajlada/serialize.hpp>
|
|
#include <QColor>
|
|
#include <QString>
|
|
|
|
namespace chatterino {
|
|
|
|
// UserData defines a set of data that is defined for a unique user
|
|
// It can contain things like optional replacement color for the user, a unique alias
|
|
// or a user note that should be displayed with the user
|
|
// Replacement fields should be optional, where none denotes that the field should not be updated for the user
|
|
struct UserData {
|
|
boost::optional<QColor> color{boost::none};
|
|
|
|
// TODO: User note?
|
|
};
|
|
|
|
} // namespace chatterino
|
|
|
|
namespace pajlada {
|
|
|
|
template <>
|
|
struct Serialize<chatterino::UserData> {
|
|
static rapidjson::Value get(const chatterino::UserData &value,
|
|
rapidjson::Document::AllocatorType &a)
|
|
{
|
|
rapidjson::Value obj;
|
|
obj.SetObject();
|
|
if (value.color)
|
|
{
|
|
const auto &color = *value.color;
|
|
chatterino::rj::set(obj, "color",
|
|
color.name().toUtf8().toStdString(), a);
|
|
}
|
|
return obj;
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Deserialize<chatterino::UserData> {
|
|
static chatterino::UserData get(const rapidjson::Value &value,
|
|
bool *error = nullptr)
|
|
{
|
|
if (!value.IsObject())
|
|
{
|
|
PAJLADA_REPORT_ERROR(error)
|
|
return chatterino::UserData{};
|
|
}
|
|
|
|
chatterino::UserData user;
|
|
|
|
QString colorString;
|
|
if (chatterino::rj::getSafe(value, "color", colorString))
|
|
{
|
|
QColor color(colorString);
|
|
if (color.isValid())
|
|
{
|
|
user.color = color;
|
|
}
|
|
}
|
|
|
|
return user;
|
|
}
|
|
};
|
|
|
|
} // namespace pajlada
|