pajlada
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)
81 lines
1.9 KiB
C++
81 lines
1.9 KiB
C++
#pragma once
|
|
|
|
#include "util/RapidjsonHelpers.hpp"
|
|
|
|
#include <pajlada/serialize.hpp>
|
|
#include <QString>
|
|
|
|
namespace chatterino {
|
|
|
|
struct Command {
|
|
QString name;
|
|
QString func;
|
|
bool showInMsgContextMenu;
|
|
|
|
Command() = default;
|
|
explicit Command(const QString &text);
|
|
Command(const QString &name, const QString &func,
|
|
bool showInMsgContextMenu = false);
|
|
|
|
QString toString() const;
|
|
};
|
|
|
|
} // namespace chatterino
|
|
|
|
namespace pajlada {
|
|
|
|
template <>
|
|
struct Serialize<chatterino::Command> {
|
|
static rapidjson::Value get(const chatterino::Command &value,
|
|
rapidjson::Document::AllocatorType &a)
|
|
{
|
|
rapidjson::Value ret(rapidjson::kObjectType);
|
|
|
|
chatterino::rj::set(ret, "name", value.name, a);
|
|
chatterino::rj::set(ret, "func", value.func, a);
|
|
chatterino::rj::set(ret, "showInMsgContextMenu",
|
|
value.showInMsgContextMenu, a);
|
|
|
|
return ret;
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Deserialize<chatterino::Command> {
|
|
static chatterino::Command get(const rapidjson::Value &value,
|
|
bool *error = nullptr)
|
|
{
|
|
chatterino::Command command;
|
|
|
|
if (!value.IsObject())
|
|
{
|
|
PAJLADA_REPORT_ERROR(error);
|
|
return command;
|
|
}
|
|
|
|
if (!chatterino::rj::getSafe(value, "name", command.name))
|
|
{
|
|
PAJLADA_REPORT_ERROR(error);
|
|
return command;
|
|
}
|
|
if (!chatterino::rj::getSafe(value, "func", command.func))
|
|
{
|
|
PAJLADA_REPORT_ERROR(error);
|
|
return command;
|
|
}
|
|
if (!chatterino::rj::getSafe(value, "showInMsgContextMenu",
|
|
command.showInMsgContextMenu))
|
|
{
|
|
command.showInMsgContextMenu = false;
|
|
|
|
PAJLADA_REPORT_ERROR(error);
|
|
|
|
return command;
|
|
}
|
|
|
|
return command;
|
|
}
|
|
};
|
|
|
|
} // namespace pajlada
|