oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: unify identifier naming per updated conventions

Browse Source 
Automated with clang-tidy readability-identifier-naming (config added to
.clang-tidy) plus scripted passes, per the updated rules now documented
in CONTRIBUTING.md:

- types (class/struct/enum/alias/template params): PascalCase
- functions, variables, members: snake_case (incl. rational -> Rational)
- private/protected members: trailing underscore; static member
  variables likewise (instance_, available_themes_)
- constants and enum values: snake_case (kLinear -> k_linear,
  F32P -> f32p); ALL_CAPS reserved for macros
- macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG ->
  OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE,
  include guards -> OAK_*)
- file names: all lowercase (Current/Plugin/OliveHost/OliveClip/
  OlivePluginInstance -> current/plugin/olivehost/oliveclip/
  oliveplugininstance)
- getters share the member name sans underscore, setters set_foo()
- Qt and third-party (OpenFX) virtual overrides and framework callbacks
  keep their original names (exempt in .clang-tidy)

Manual follow-ups required where automation could not reach:
- string-based QMetaObject/SIGNAL/SLOT references updated to renamed
  methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...)
- macro bodies referencing renamed methods (OLIVE_CONFIG,
  NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*)
- self-shadowing locals renamed where signals/methods became same-named
  (size_changed, worker_count, selected_items, import param, filters)
- third_party OFX member/namespace usages restored (OFX::Host::*,
  _created, _clipPrefsDirty, createInstance, clearPersistentMessage)
- STL protocol aliases restored (const_iterator) with .clang-tidy
  ignore rules; qHash overloads restored

Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
This commit is contained in:
Mike-Solar
2026-07-19 16:10:54 +08:00
parent cb1718a103
commit bb40b4923e
1014 changed files with 44257 additions and 44220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/project/serializer/serializer220403.cpp
+151 -151
View File
@@ -29,7 +29,7 @@ namespace olive
{
ProjectSerializer220403::LoadData
ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
ProjectSerializer220403::load(Project *project, QXmlStreamReader *reader,
LoadType load_type, void *reserved) const
{
QMap<quintptr, QMap<QString, QString>> properties;
@@ -38,36 +38,36 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
LoadData load_data;
if ((load_type == kProject &&
if ((load_type == k_project &&
reader->name() == QStringLiteral("project")) ||
((load_type == kOnlyNodes &&
((load_type == k_only_nodes &&
reader->name() == QStringLiteral("nodes")) ||
(load_type == kOnlyClips &&
(load_type == k_only_clips &&
reader->name() == QStringLiteral("timeline"))) ||
(load_type == kOnlyKeyframes &&
(load_type == k_only_keyframes &&
reader->name() == QStringLiteral("keyframes")) ||
(load_type == kOnlyMarkers &&
(load_type == k_only_markers &&
reader->name() == QStringLiteral("markers"))) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("layout")) {
// Since the main window's functions have to occur in the GUI thread (and we're likely
// loading in a secondary thread), we load all necessary data into a separate struct so we
// can continue loading and queue it with the main window so it can handle the data
// appropriately in its own thread.
load_data.layout = MainWindowLayoutInfo::fromXml(
load_data.layout = MainWindowLayoutInfo::from_xml(
reader, xml_node_data.node_ptrs);
} else if (reader->name() == QStringLiteral("uuid")) {
if (project) {
project->SetUuid(
project->set_uuid(
QUuid::fromString(reader->readElementText()));
} else {
reader->skipCurrentElement();
}
} else if (reader->name() == QStringLiteral("nodes")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("node")) {
bool is_root = false;
bool is_cm = false;
@@ -106,16 +106,16 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
bool handled_elsewhere = false;
if (is_root) {
project->Initialize();
project->initialize();
node = project->root();
} else if (is_cm) {
LoadColorManager(reader, project);
load_color_manager(reader, project);
handled_elsewhere = true;
} else if (is_settings) {
LoadProjectSettings(reader, project);
load_project_settings(reader, project);
handled_elsewhere = true;
} else {
node = NodeFactory::CreateFromID(id);
node = NodeFactory::create_from_id(id);
}
if (!handled_elsewhere) {
@@ -124,7 +124,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
<< "Failed to find node with ID" << id;
reader->skipCurrentElement();
} else {
LoadNode(node, xml_node_data, reader);
load_node(node, xml_node_data, reader);
if (project) {
node->setParent(project);
} else {
@@ -139,7 +139,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
}
} else if (reader->name() == QStringLiteral("keyframes")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("node")) {
QString node_id;
XMLAttributeLoop(reader, attr)
@@ -152,13 +152,13 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
Node *n = nullptr;
if (!node_id.isEmpty()) {
n = NodeFactory::CreateFromID(node_id);
n = NodeFactory::create_from_id(node_id);
}
if (!n) {
reader->skipCurrentElement();
} else {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("input")) {
QString input_id;
XMLAttributeLoop(reader, attr)
@@ -174,7 +174,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
reader->skipCurrentElement();
} else {
while (
XMLReadNextStartElement(reader)) {
xml_read_next_start_element(reader)) {
if (reader->name() ==
QStringLiteral("element")) {
QString element_id;
@@ -193,7 +193,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
reader->skipCurrentElement();
} else {
while (
XMLReadNextStartElement(
xml_read_next_start_element(
reader)) {
if (reader->name() ==
QStringLiteral(
@@ -218,7 +218,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
->skipCurrentElement();
} else {
while (
XMLReadNextStartElement(
xml_read_next_start_element(
reader)) {
if (reader
->name() ==
@@ -236,10 +236,10 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
track_id
.toInt());
LoadKeyframe(
load_keyframe(
reader,
key,
n->GetInputDataType(
n->get_input_data_type(
input_id));
load_data
@@ -277,10 +277,10 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
}
} else if (reader->name() == QStringLiteral("markers")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("marker")) {
TimelineMarker *marker = new TimelineMarker();
LoadMarker(reader, marker);
load_marker(reader, marker);
load_data.markers.push_back(marker);
} else {
reader->skipCurrentElement();
@@ -288,7 +288,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
}
} else if (reader->name() == QStringLiteral("positions")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("context")) {
quintptr context_ptr = 0;
XMLAttributeLoop(reader, attr)
@@ -300,12 +300,12 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
}
if (context_ptr) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("node")) {
quintptr node_ptr;
Node::Position node_pos;
if (LoadPosition(reader, &node_ptr,
if (load_position(reader, &node_ptr,
&node_pos)) {
if (node_ptr) {
positions[context_ptr].insert(
@@ -332,7 +332,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
}
} else if (reader->name() == QStringLiteral("properties")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("node")) {
quintptr ptr = 0;
@@ -348,7 +348,7 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
if (ptr) {
QMap<QString, QString> properties_for_node;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
properties_for_node.insert(
reader->name().toString(),
reader->readElementText());
@@ -374,14 +374,14 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
for (auto jt = it.value().cbegin(); jt != it.value().cend(); jt++) {
Node *n = xml_node_data.node_ptrs.value(jt.key());
if (n) {
ctx->SetNodePositionInContext(n, jt.value());
ctx->set_node_position_in_context(n, jt.value());
}
}
}
}
// Make connections
PostConnect(xml_node_data);
post_connect(xml_node_data);
load_data.node_ptrs = xml_node_data.node_ptrs;
load_data.node_uuids = xml_node_data.node_uuids;
@@ -397,14 +397,14 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
// Re-enable caches and resolve tracks
const QVector<Node *> &nodes = project ? project->nodes() : load_data.nodes;
for (Node *n : nodes) {
n->SetCachesEnabled(true);
n->set_caches_enabled(true);
if (Track *t = dynamic_cast<Track *>(n)) {
for (int i = 0; i < t->InputArraySize(Track::kBlockInput); i++) {
for (int i = 0; i < t->input_array_size(Track::k_block_input); i++) {
Block *b = static_cast<Block *>(
t->GetConnectedOutput(Track::kBlockInput, i));
t->get_connected_output(Track::k_block_input, i));
if (!b->track()) {
t->AppendBlock(b);
t->append_block(b);
}
}
}
@@ -412,8 +412,8 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
// Clear duplicate label (to facilitate #2147)
if (ClipBlock *c = dynamic_cast<ClipBlock *>(n)) {
if (c->connected_viewer() &&
c->GetLabel() == c->connected_viewer()->GetLabel()) {
c->SetLabel(QString());
c->get_label() == c->connected_viewer()->get_label()) {
c->set_label(QString());
}
}
}
@@ -421,28 +421,28 @@ ProjectSerializer220403::Load(Project *project, QXmlStreamReader *reader,
return load_data;
}
void ProjectSerializer220403::LoadNode(Node *node, XMLNodeData &xml_node_data,
void ProjectSerializer220403::load_node(Node *node, XMLNodeData &xml_node_data,
QXmlStreamReader *reader) const
{
while (XMLReadNextStartElement(reader)) {
if (IsCancelled()) {
while (xml_read_next_start_element(reader)) {
if (is_cancelled()) {
return;
}
if (reader->name() == QStringLiteral("input")) {
LoadInput(node, reader, xml_node_data);
load_input(node, reader, xml_node_data);
} else if (reader->name() == QStringLiteral("ptr")) {
quintptr ptr = reader->readElementText().toULongLong();
xml_node_data.node_ptrs.insert(ptr, node);
} else if (reader->name() == QStringLiteral("label")) {
node->SetLabel(reader->readElementText());
node->set_label(reader->readElementText());
} else if (reader->name() == QStringLiteral("uuid")) {
xml_node_data.node_uuids.insert(
node, QUuid::fromString(reader->readElementText()));
} else if (reader->name() == QStringLiteral("color")) {
node->SetOverrideColor(reader->readElementText().toInt());
node->set_override_color(reader->readElementText().toInt());
} else if (reader->name() == QStringLiteral("links")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("link")) {
xml_node_data.block_links.append(
{ node, reader->readElementText().toULongLong() });
@@ -451,10 +451,10 @@ void ProjectSerializer220403::LoadNode(Node *node, XMLNodeData &xml_node_data,
}
}
} else if (reader->name() == QStringLiteral("custom")) {
LoadNodeCustom(reader, node, xml_node_data);
load_node_custom(reader, node, xml_node_data);
} else if (reader->name() == QStringLiteral("connections")) {
// Load connections
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("connection")) {
QString param_id;
int ele = -1;
@@ -470,7 +470,7 @@ void ProjectSerializer220403::LoadNode(Node *node, XMLNodeData &xml_node_data,
QString output_node_id;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("output")) {
output_node_id = reader->readElementText();
} else {
@@ -486,7 +486,7 @@ void ProjectSerializer220403::LoadNode(Node *node, XMLNodeData &xml_node_data,
}
}
} else if (reader->name() == QStringLiteral("hints")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("hint")) {
QString input;
int element = -1;
@@ -501,25 +501,25 @@ void ProjectSerializer220403::LoadNode(Node *node, XMLNodeData &xml_node_data,
}
Node::ValueHint vh;
LoadValueHint(&vh, reader);
node->SetValueHintForInput(input, vh, element);
load_value_hint(&vh, reader);
node->set_value_hint_for_input(input, vh, element);
} else {
reader->skipCurrentElement();
}
}
} else if (reader->name() == QStringLiteral("caches")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("audio")) {
node->audio_playback_cache()->SetUuid(
node->audio_playback_cache()->set_uuid(
QUuid::fromString(reader->readElementText()));
} else if (reader->name() == QStringLiteral("video")) {
node->video_frame_cache()->SetUuid(
node->video_frame_cache()->set_uuid(
QUuid::fromString(reader->readElementText()));
} else if (reader->name() == QStringLiteral("thumb")) {
node->thumbnail_cache()->SetUuid(
node->thumbnail_cache()->set_uuid(
QUuid::fromString(reader->readElementText()));
} else if (reader->name() == QStringLiteral("waveform")) {
node->waveform_cache()->SetUuid(
node->waveform_cache()->set_uuid(
QUuid::fromString(reader->readElementText()));
} else {
reader->skipCurrentElement();
@@ -533,10 +533,10 @@ void ProjectSerializer220403::LoadNode(Node *node, XMLNodeData &xml_node_data,
node->LoadFinishedEvent();
}
void ProjectSerializer220403::LoadColorManager(QXmlStreamReader *reader,
void ProjectSerializer220403::load_color_manager(QXmlStreamReader *reader,
Project *project) const
{
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("input")) {
QString id;
XMLAttributeLoop(reader, attr)
@@ -551,11 +551,11 @@ void ProjectSerializer220403::LoadColorManager(QXmlStreamReader *reader,
id == QStringLiteral("reference_space")) {
QString value;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("primary")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("standard")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() ==
QStringLiteral("track")) {
value = reader->readElementText();
@@ -596,18 +596,18 @@ void ProjectSerializer220403::LoadColorManager(QXmlStreamReader *reader,
};
int num_value = value.toInt();
value = list.at(num_value);
project->SetDefaultInputColorSpace(value);
project->set_default_input_color_space(value);
} else if (id == QStringLiteral("reference_space")) {
// Reference space
if (value == QStringLiteral("1")) {
value = OCIO::ROLE_COMPOSITING_LOG;
value = ocio::ROLE_COMPOSITING_LOG;
} else {
value = OCIO::ROLE_SCENE_LINEAR;
value = ocio::ROLE_SCENE_LINEAR;
}
project->SetColorReferenceSpace(value);
project->set_color_reference_space(value);
} else {
// Config filename
project->SetColorConfigFilename(value);
project->set_color_config_filename(value);
}
} else {
reader->skipCurrentElement();
@@ -618,10 +618,10 @@ void ProjectSerializer220403::LoadColorManager(QXmlStreamReader *reader,
}
}
void ProjectSerializer220403::LoadProjectSettings(QXmlStreamReader *reader,
void ProjectSerializer220403::load_project_settings(QXmlStreamReader *reader,
Project *project) const
{
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("input")) {
QString id;
XMLAttributeLoop(reader, attr)
@@ -635,11 +635,11 @@ void ProjectSerializer220403::LoadProjectSettings(QXmlStreamReader *reader,
id == QStringLiteral("cache_path")) {
QString value;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("primary")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("standard")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() ==
QStringLiteral("track")) {
value = reader->readElementText();
@@ -657,10 +657,10 @@ void ProjectSerializer220403::LoadProjectSettings(QXmlStreamReader *reader,
}
if (id == QStringLiteral("cache_setting")) {
project->SetCacheLocationSetting(
project->set_cache_location_setting(
static_cast<Project::CacheSetting>(value.toInt()));
} else {
project->SetCustomCachePath(value);
project->set_custom_cache_path(value);
}
} else {
reader->skipCurrentElement();
@@ -671,7 +671,7 @@ void ProjectSerializer220403::LoadProjectSettings(QXmlStreamReader *reader,
}
}
void ProjectSerializer220403::LoadInput(Node *node, QXmlStreamReader *reader,
void ProjectSerializer220403::load_input(Node *node, QXmlStreamReader *reader,
XMLNodeData &xml_node_data) const
{
if (dynamic_cast<NodeGroup *>(node)) {
@@ -697,34 +697,34 @@ void ProjectSerializer220403::LoadInput(Node *node, QXmlStreamReader *reader,
return;
}
if (!node->HasInputWithID(param_id)) {
if (!node->has_input_with_id(param_id)) {
qWarning() << "Failed to load parameter that didn't exist:" << param_id;
reader->skipCurrentElement();
return;
}
while (XMLReadNextStartElement(reader)) {
if (IsCancelled()) {
while (xml_read_next_start_element(reader)) {
if (is_cancelled()) {
return;
}
if (reader->name() == QStringLiteral("primary")) {
// Load primary immediate
LoadImmediate(reader, node, param_id, -1, xml_node_data);
load_immediate(reader, node, param_id, -1, xml_node_data);
} else if (reader->name() == QStringLiteral("subelements")) {
// Load subelements
XMLAttributeLoop(reader, attr)
{
if (attr.name() == QStringLiteral("count")) {
node->InputArrayResize(param_id, attr.value().toInt());
node->input_array_resize(param_id, attr.value().toInt());
}
}
int element_counter = 0;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("element")) {
LoadImmediate(reader, node, param_id, element_counter,
load_immediate(reader, node, param_id, element_counter,
xml_node_data);
element_counter++;
@@ -738,54 +738,54 @@ void ProjectSerializer220403::LoadInput(Node *node, QXmlStreamReader *reader,
}
}
void ProjectSerializer220403::LoadImmediate(QXmlStreamReader *reader,
void ProjectSerializer220403::load_immediate(QXmlStreamReader *reader,
Node *node, const QString &input,
int element,
XMLNodeData &xml_node_data) const
{
Q_UNUSED(xml_node_data)
NodeValue::Type data_type = node->GetInputDataType(input);
NodeValue::Type data_type = node->get_input_data_type(input);
// HACK: SubtitleParams contain the actual subtitle data, so loading/replacing it will overwrite
// the valid subtitles. We hack around it by simply skipping loading subtitles, we'll see
// if this ends up being an issue in the future.
if (data_type == NodeValue::kSubtitleParams) {
if (data_type == NodeValue::k_subtitle_params) {
reader->skipCurrentElement();
return;
}
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("standard")) {
// Load standard value
int val_index = 0;
while (XMLReadNextStartElement(reader)) {
if (IsCancelled()) {
while (xml_read_next_start_element(reader)) {
if (is_cancelled()) {
return;
}
if (reader->name() == QStringLiteral("track")) {
QVariant value_on_track;
if (data_type == NodeValue::kVideoParams) {
if (data_type == NodeValue::k_video_params) {
VideoParams vp;
vp.Load(reader);
vp.load(reader);
value_on_track = QVariant::fromValue(vp);
} else if (data_type == NodeValue::kAudioParams) {
} else if (data_type == NodeValue::k_audio_params) {
AudioParams ap =
TypeSerializer::LoadAudioParams(reader);
TypeSerializer::load_audio_params(reader);
value_on_track = QVariant::fromValue(ap);
} else {
QString value_text = reader->readElementText();
if (!value_text.isEmpty()) {
value_on_track = NodeValue::StringToValue(
value_on_track = NodeValue::string_to_value(
data_type, value_text, true);
}
}
node->SetSplitStandardValueOnTrack(input, val_index,
node->set_split_standard_value_on_track(input, val_index,
value_on_track, element);
val_index++;
@@ -794,20 +794,20 @@ void ProjectSerializer220403::LoadImmediate(QXmlStreamReader *reader,
}
}
} else if (reader->name() == QStringLiteral("keyframing") &&
node->IsInputKeyframable(input)) {
node->SetInputIsKeyframing(input, reader->readElementText().toInt(),
node->is_input_keyframable(input)) {
node->set_input_is_keyframing(input, reader->readElementText().toInt(),
element);
} else if (reader->name() == QStringLiteral("keyframes")) {
int track = 0;
while (XMLReadNextStartElement(reader)) {
if (IsCancelled()) {
while (xml_read_next_start_element(reader)) {
if (is_cancelled()) {
return;
}
if (reader->name() == QStringLiteral("track")) {
while (XMLReadNextStartElement(reader)) {
if (IsCancelled()) {
while (xml_read_next_start_element(reader)) {
if (is_cancelled()) {
return;
}
@@ -817,7 +817,7 @@ void ProjectSerializer220403::LoadImmediate(QXmlStreamReader *reader,
key->set_element(element);
key->set_track(track);
LoadKeyframe(reader, key, data_type);
load_keyframe(reader, key, data_type);
key->setParent(node);
} else {
reader->skipCurrentElement();
@@ -830,16 +830,16 @@ void ProjectSerializer220403::LoadImmediate(QXmlStreamReader *reader,
}
}
} else if (reader->name() == QStringLiteral("csinput")) {
node->SetInputProperty(input, QStringLiteral("col_input"),
node->set_input_property(input, QStringLiteral("col_input"),
reader->readElementText());
} else if (reader->name() == QStringLiteral("csdisplay")) {
node->SetInputProperty(input, QStringLiteral("col_display"),
node->set_input_property(input, QStringLiteral("col_display"),
reader->readElementText());
} else if (reader->name() == QStringLiteral("csview")) {
node->SetInputProperty(input, QStringLiteral("col_view"),
node->set_input_property(input, QStringLiteral("col_view"),
reader->readElementText());
} else if (reader->name() == QStringLiteral("cslook")) {
node->SetInputProperty(input, QStringLiteral("col_look"),
node->set_input_property(input, QStringLiteral("col_look"),
reader->readElementText());
} else {
reader->skipCurrentElement();
@@ -847,7 +847,7 @@ void ProjectSerializer220403::LoadImmediate(QXmlStreamReader *reader,
}
}
void ProjectSerializer220403::LoadKeyframe(QXmlStreamReader *reader,
void ProjectSerializer220403::load_keyframe(QXmlStreamReader *reader,
NodeKeyframe *key,
NodeValue::Type data_type) const
{
@@ -857,7 +857,7 @@ void ProjectSerializer220403::LoadKeyframe(QXmlStreamReader *reader,
XMLAttributeLoop(reader, attr)
{
if (IsCancelled()) {
if (is_cancelled()) {
return;
}
@@ -865,7 +865,7 @@ void ProjectSerializer220403::LoadKeyframe(QXmlStreamReader *reader,
key_input = attr.value().toString();
} else if (attr.name() == QStringLiteral("time")) {
key->set_time(
rational::fromString(attr.value().toString().toStdString()));
Rational::from_string(attr.value().toString().toStdString()));
} else if (attr.name() == QStringLiteral("type")) {
key->set_type_no_bezier_adj(
static_cast<NodeKeyframe::Type>(attr.value().toInt()));
@@ -881,13 +881,13 @@ void ProjectSerializer220403::LoadKeyframe(QXmlStreamReader *reader,
}
key->set_value(
NodeValue::StringToValue(data_type, reader->readElementText(), true));
NodeValue::string_to_value(data_type, reader->readElementText(), true));
key->set_bezier_control_in(key_in_handle);
key->set_bezier_control_out(key_out_handle);
}
bool ProjectSerializer220403::LoadPosition(QXmlStreamReader *reader,
bool ProjectSerializer220403::load_position(QXmlStreamReader *reader,
quintptr *node_ptr,
Node::Position *pos) const
{
@@ -904,7 +904,7 @@ bool ProjectSerializer220403::LoadPosition(QXmlStreamReader *reader,
}
}
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("x")) {
pos->position.setX(reader->readElementText().toDouble());
got_pos_x = true;
@@ -921,12 +921,12 @@ bool ProjectSerializer220403::LoadPosition(QXmlStreamReader *reader,
return got_node_ptr && got_pos_x && got_pos_y;
}
void ProjectSerializer220403::PostConnect(const XMLNodeData &xml_node_data) const
void ProjectSerializer220403::post_connect(const XMLNodeData &xml_node_data) const
{
foreach (const XMLNodeData::SerializedConnection &con,
xml_node_data.desired_connections) {
if (Node *out = xml_node_data.node_ptrs.value(con.output_node)) {
Node::ConnectEdge(out, con.input);
Node::connect_edge(out, con.input);
}
}
@@ -934,29 +934,29 @@ void ProjectSerializer220403::PostConnect(const XMLNodeData &xml_node_data) cons
Node *a = l.block;
Node *b = xml_node_data.node_ptrs.value(l.link);
Node::Link(a, b);
Node::link(a, b);
}
foreach (const XMLNodeData::GroupLink &l, xml_node_data.group_input_links) {
if (Node *input_node = xml_node_data.node_ptrs.value(l.input_node)) {
NodeInput resolved(input_node, l.input_id, l.input_element);
l.group->AddInputPassthrough(resolved, l.passthrough_id);
l.group->add_input_passthrough(resolved, l.passthrough_id);
l.group->SetInputFlag(l.passthrough_id,
l.group->set_input_flag(l.passthrough_id,
InputFlag(l.custom_flags.value()));
if (!l.custom_name.isEmpty()) {
l.group->SetInputName(l.passthrough_id, l.custom_name);
l.group->set_input_name(l.passthrough_id, l.custom_name);
}
l.group->SetInputDataType(l.passthrough_id, l.data_type);
l.group->set_input_data_type(l.passthrough_id, l.data_type);
l.group->SetDefaultValue(l.passthrough_id, l.default_val);
l.group->set_default_value(l.passthrough_id, l.default_val);
for (auto it = l.custom_properties.cbegin();
it != l.custom_properties.cend(); it++) {
l.group->SetInputProperty(l.passthrough_id, it.key(),
l.group->set_input_property(l.passthrough_id, it.key(),
it.value());
}
}
@@ -965,12 +965,12 @@ void ProjectSerializer220403::PostConnect(const XMLNodeData &xml_node_data) cons
for (auto it = xml_node_data.group_output_links.cbegin();
it != xml_node_data.group_output_links.cend(); it++) {
if (Node *output_node = xml_node_data.node_ptrs.value(it.value())) {
it.key()->SetOutputPassthrough(output_node);
it.key()->set_output_passthrough(output_node);
}
}
}
void ProjectSerializer220403::LoadNodeCustom(QXmlStreamReader *reader,
void ProjectSerializer220403::load_node_custom(QXmlStreamReader *reader,
Node *node,
XMLNodeData &xml_node_data) const
{
@@ -978,9 +978,9 @@ void ProjectSerializer220403::LoadNodeCustom(QXmlStreamReader *reader,
if (ViewerOutput *viewer = dynamic_cast<ViewerOutput *>(node)) {
Footage *footage = dynamic_cast<Footage *>(node);
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("points")) {
LoadTimelinePoints(reader, viewer);
load_timeline_points(reader, viewer);
} else if (reader->name() == QStringLiteral("timestamp") &&
footage) {
footage->set_timestamp(reader->readElementText().toLongLong());
@@ -990,24 +990,24 @@ void ProjectSerializer220403::LoadNodeCustom(QXmlStreamReader *reader,
}
} else if (Track *track = dynamic_cast<Track *>(node)) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("height")) {
track->SetTrackHeight(reader->readElementText().toDouble());
track->set_track_height(reader->readElementText().toDouble());
} else {
reader->skipCurrentElement();
}
}
} else if (NodeGroup *group = dynamic_cast<NodeGroup *>(node)) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("inputpassthroughs")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("inputpassthrough")) {
XMLNodeData::GroupLink link;
link.group = group;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("node")) {
link.input_node =
reader->readElementText().toULongLong();
@@ -1029,23 +1029,23 @@ void ProjectSerializer220403::LoadNodeCustom(QXmlStreamReader *reader,
reader->readElementText().toULongLong());
} else if (reader->name() ==
QStringLiteral("type")) {
link.data_type = NodeValue::GetDataTypeFromName(
link.data_type = NodeValue::get_data_type_from_name(
reader->readElementText());
} else if (reader->name() ==
QStringLiteral("default")) {
link.default_val = NodeValue::StringToValue(
link.default_val = NodeValue::string_to_value(
link.data_type, reader->readElementText(),
false);
} else if (reader->name() ==
QStringLiteral("properties")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() ==
QStringLiteral("property")) {
QString key;
QString value;
while (
XMLReadNextStartElement(reader)) {
xml_read_next_start_element(reader)) {
if (reader->name() ==
QStringLiteral("key")) {
key = reader->readElementText();
@@ -1090,33 +1090,33 @@ void ProjectSerializer220403::LoadNodeCustom(QXmlStreamReader *reader,
}
}
void ProjectSerializer220403::LoadTimelinePoints(QXmlStreamReader *reader,
void ProjectSerializer220403::load_timeline_points(QXmlStreamReader *reader,
ViewerOutput *viewer) const
{
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("markers")) {
LoadMarkerList(reader, viewer->GetMarkers());
load_marker_list(reader, viewer->get_markers());
} else if (reader->name() == QStringLiteral("workarea")) {
LoadWorkArea(reader, viewer->GetWorkArea());
load_work_area(reader, viewer->get_work_area());
} else {
reader->skipCurrentElement();
}
}
}
void ProjectSerializer220403::LoadMarker(QXmlStreamReader *reader,
void ProjectSerializer220403::load_marker(QXmlStreamReader *reader,
TimelineMarker *marker) const
{
rational in, out;
Rational in, out;
XMLAttributeLoop(reader, attr)
{
if (attr.name() == QStringLiteral("name")) {
marker->set_name(attr.value().toString());
} else if (attr.name() == QStringLiteral("in")) {
in = rational::fromString(attr.value().toString().toStdString());
in = Rational::from_string(attr.value().toString().toStdString());
} else if (attr.name() == QStringLiteral("out")) {
out = rational::fromString(attr.value().toString().toStdString());
out = Rational::from_string(attr.value().toString().toStdString());
} else if (attr.name() == QStringLiteral("color")) {
marker->set_color(attr.value().toInt());
}
@@ -1128,11 +1128,11 @@ void ProjectSerializer220403::LoadMarker(QXmlStreamReader *reader,
reader->skipCurrentElement();
}
void ProjectSerializer220403::LoadWorkArea(QXmlStreamReader *reader,
void ProjectSerializer220403::load_work_area(QXmlStreamReader *reader,
TimelineWorkArea *workarea) const
{
rational range_in = workarea->in();
rational range_out = workarea->out();
Rational range_in = workarea->in();
Rational range_out = workarea->out();
XMLAttributeLoop(reader, attr)
{
@@ -1140,10 +1140,10 @@ void ProjectSerializer220403::LoadWorkArea(QXmlStreamReader *reader,
workarea->set_enabled(attr.value() != QStringLiteral("0"));
} else if (attr.name() == QStringLiteral("in")) {
range_in =
rational::fromString(attr.value().toString().toStdString());
Rational::from_string(attr.value().toString().toStdString());
} else if (attr.name() == QStringLiteral("out")) {
range_out =
rational::fromString(attr.value().toString().toStdString());
Rational::from_string(attr.value().toString().toStdString());
}
}
@@ -1156,27 +1156,27 @@ void ProjectSerializer220403::LoadWorkArea(QXmlStreamReader *reader,
reader->skipCurrentElement();
}
void ProjectSerializer220403::LoadMarkerList(QXmlStreamReader *reader,
void ProjectSerializer220403::load_marker_list(QXmlStreamReader *reader,
TimelineMarkerList *markers) const
{
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("marker")) {
TimelineMarker *marker = new TimelineMarker(markers);
LoadMarker(reader, marker);
load_marker(reader, marker);
} else {
reader->skipCurrentElement();
}
}
}
void ProjectSerializer220403::LoadValueHint(Node::ValueHint *hint,
void ProjectSerializer220403::load_value_hint(Node::ValueHint *hint,
QXmlStreamReader *reader) const
{
QVector<NodeValue::Type> types;
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("types")) {
while (XMLReadNextStartElement(reader)) {
while (xml_read_next_start_element(reader)) {
if (reader->name() == QStringLiteral("type")) {
types.append(static_cast<NodeValue::Type>(
reader->readElementText().toInt()));