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/distort/wave/wavedistortnode.cpp
+33 -33
View File
@@ -24,30 +24,30 @@
namespace olive
{
const QString WaveDistortNode::kTextureInput = QStringLiteral("tex_in");
const QString WaveDistortNode::kFrequencyInput = QStringLiteral("frequency_in");
const QString WaveDistortNode::kIntensityInput = QStringLiteral("intensity_in");
const QString WaveDistortNode::kEvolutionInput = QStringLiteral("evolution_in");
const QString WaveDistortNode::kVerticalInput = QStringLiteral("vertical_in");
const QString WaveDistortNode::k_texture_input = QStringLiteral("tex_in");
const QString WaveDistortNode::k_frequency_input = QStringLiteral("frequency_in");
const QString WaveDistortNode::k_intensity_input = QStringLiteral("intensity_in");
const QString WaveDistortNode::k_evolution_input = QStringLiteral("evolution_in");
const QString WaveDistortNode::k_vertical_input = QStringLiteral("vertical_in");
#define super Node
WaveDistortNode::WaveDistortNode()
{
AddInput(kTextureInput, NodeValue::kTexture,
InputFlags(kInputFlagNotKeyframable));
add_input(k_texture_input, NodeValue::k_texture,
InputFlags(k_input_flag_not_keyframable));
AddInput(kFrequencyInput, NodeValue::kFloat, 10);
AddInput(kIntensityInput, NodeValue::kFloat, 10);
AddInput(kEvolutionInput, NodeValue::kFloat, 0);
add_input(k_frequency_input, NodeValue::k_float, 10);
add_input(k_intensity_input, NodeValue::k_float, 10);
add_input(k_evolution_input, NodeValue::k_float, 0);
AddInput(kVerticalInput, NodeValue::kCombo, false);
add_input(k_vertical_input, NodeValue::k_combo, false);
SetFlag(kVideoEffect);
SetEffectInput(kTextureInput);
set_flag(k_video_effect);
set_effect_input(k_texture_input);
}
QString WaveDistortNode::Name() const
QString WaveDistortNode::name() const
{
return tr("Wave");
}
@@ -57,48 +57,48 @@ QString WaveDistortNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.wave");
}
QVector<Node::CategoryID> WaveDistortNode::Category() const
QVector<Node::CategoryID> WaveDistortNode::category() const
{
return { kCategoryDistort };
return { k_category_distort };
}
QString WaveDistortNode::Description() const
QString WaveDistortNode::description() const
{
return tr("Distorts an image along a sine wave.");
}
void WaveDistortNode::Retranslate()
void WaveDistortNode::retranslate()
{
super::Retranslate();
super::retranslate();
SetInputName(kTextureInput, tr("Input"));
SetInputName(kFrequencyInput, tr("Frequency"));
SetInputName(kIntensityInput, tr("Intensity"));
SetInputName(kEvolutionInput, tr("Evolution"));
SetInputName(kVerticalInput, tr("Direction"));
SetComboBoxStrings(kVerticalInput, { tr("Horizontal"), tr("Vertical") });
set_input_name(k_texture_input, tr("Input"));
set_input_name(k_frequency_input, tr("Frequency"));
set_input_name(k_intensity_input, tr("Intensity"));
set_input_name(k_evolution_input, tr("Evolution"));
set_input_name(k_vertical_input, tr("Direction"));
set_combo_box_strings(k_vertical_input, { tr("Horizontal"), tr("Vertical") });
}
ShaderCode WaveDistortNode::GetShaderCode(const ShaderRequest &request) const
ShaderCode WaveDistortNode::get_shader_code(const ShaderRequest &request) const
{
Q_UNUSED(request)
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/wave.frag"));
return ShaderCode(FileFunctions::read_file_as_string(":/shaders/wave.frag"));
}
void WaveDistortNode::Value(const NodeValueRow &value,
void WaveDistortNode::value(const NodeValueRow &value,
const NodeGlobals &globals,
NodeValueTable *table) const
{
// If there's no texture, no need to run an operation
if (TexturePtr texture = value[kTextureInput].toTexture()) {
if (TexturePtr texture = value[k_texture_input].to_texture()) {
// Only run shader if at least one of flip or flop are selected
if (!qIsNull(value[kIntensityInput].toDouble())) {
table->Push(NodeValue::kTexture,
Texture::Job(texture->params(), ShaderJob(value)),
if (!qIsNull(value[k_intensity_input].to_double())) {
table->push(NodeValue::k_texture,
Texture::job(texture->params(), ShaderJob(value)),
this);
} else {
// If we're not flipping or flopping just push the texture
table->Push(value[kTextureInput]);
table->push(value[k_texture_input]);
}
}
}