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/widget/scope/waveform/waveform.cpp
+17 -17
View File
@@ -42,14 +42,14 @@ WaveformScope::WaveformScope(QWidget *parent)
{
}
ShaderCode WaveformScope::GenerateShaderCode()
ShaderCode WaveformScope::generate_shader_code()
{
return ShaderCode(
FileFunctions::ReadFileAsString(":/shaders/rgbwaveform.frag"),
FileFunctions::ReadFileAsString(":/shaders/rgbwaveform.vert"));
FileFunctions::read_file_as_string(":/shaders/rgbwaveform.frag"),
FileFunctions::read_file_as_string(":/shaders/rgbwaveform.vert"));
}
void WaveformScope::DrawScope(TexturePtr managed_tex, QVariant pipeline)
void WaveformScope::draw_scope(TexturePtr managed_tex, QVariant pipeline)
{
float waveform_scale = 0.80f;
@@ -57,27 +57,27 @@ void WaveformScope::DrawScope(TexturePtr managed_tex, QVariant pipeline)
ShaderJob job;
// Set viewport size
job.Insert(QStringLiteral("viewport"),
NodeValue(NodeValue::kVec2, QVector2D(width(), height())));
job.insert(QStringLiteral("viewport"),
NodeValue(NodeValue::k_vec2, QVector2D(width(), height())));
// Set luma coefficients
double luma_coeffs[3] = { 0.0f, 0.0f, 0.0f };
color_manager()->GetDefaultLumaCoefs(luma_coeffs);
job.Insert(
color_manager()->get_default_luma_coefs(luma_coeffs);
job.insert(
QStringLiteral("luma_coeffs"),
NodeValue(NodeValue::kVec3,
NodeValue(NodeValue::k_vec3,
QVector3D(luma_coeffs[0], luma_coeffs[1], luma_coeffs[2])));
// Scale of the waveform relative to the viewport surface.
job.Insert(QStringLiteral("waveform_scale"),
NodeValue(NodeValue::kFloat, waveform_scale));
job.insert(QStringLiteral("waveform_scale"),
NodeValue(NodeValue::k_float, waveform_scale));
// Insert source texture
job.Insert(QStringLiteral("ove_maintex"),
NodeValue(NodeValue::kTexture,
job.insert(QStringLiteral("ove_maintex"),
NodeValue(NodeValue::k_texture,
QVariant::fromValue(managed_tex)));
renderer()->Blit(pipeline, job, GetViewportParams());
renderer()->blit(pipeline, job, get_viewport_params());
float waveform_dim_x = ceil((width() - 1.0) * waveform_scale);
float waveform_dim_y = ceil((height() - 1.0) * waveform_scale);
@@ -109,7 +109,7 @@ void WaveformScope::DrawScope(TexturePtr managed_tex, QVariant pipeline)
waveform_end_dim_x,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y);
label = QString::number(1.0 - (i * ire_increment), 'f', 1);
font_x_offset = QtUtils::QFontMetricsWidth(font_metrics, label) + 4;
font_x_offset = QtUtils::q_font_metrics_width(font_metrics, label) + 4;
p.drawText(waveform_start_dim_x - font_x_offset,
(waveform_dim_y * (i * ire_increment)) +
@@ -120,7 +120,7 @@ void WaveformScope::DrawScope(TexturePtr managed_tex, QVariant pipeline)
p.drawLines(ire_lines);
}
void WaveformScope::DrawScopeSoftware(QPainter &p, const QImage &image)
void WaveformScope::draw_scope_software(QPainter &p, const QImage &image)
{
const float waveform_scale = 0.80f;
const int waveform_dim_x = qCeil((width() - 1.0) * waveform_scale);
@@ -203,7 +203,7 @@ void WaveformScope::DrawScopeSoftware(QPainter &p, const QImage &image)
waveform_end_dim_x,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y);
label = QString::number(1.0 - (i * ire_increment), 'f', 1);
font_x_offset = QtUtils::QFontMetricsWidth(font_metrics, label) + 4;
font_x_offset = QtUtils::q_font_metrics_width(font_metrics, label) + 4;
p.drawText(waveform_start_dim_x - font_x_offset,
(waveform_dim_y * (i * ire_increment)) +
app/widget/scope/waveform/waveform.h
+6 -6
View File
@@ -19,8 +19,8 @@
***/
#ifndef WAVEFORMSCOPE_H
#define WAVEFORMSCOPE_H
#ifndef OAK_WAVEFORMSCOPE_H
#define OAK_WAVEFORMSCOPE_H
#include "widget/scope/scopebase/scopebase.h"
@@ -35,13 +35,13 @@ public:
MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR(WaveformScope)
protected:
virtual ShaderCode GenerateShaderCode() override;
virtual ShaderCode generate_shader_code() override;
virtual void DrawScope(TexturePtr managed_tex, QVariant pipeline) override;
virtual void draw_scope(TexturePtr managed_tex, QVariant pipeline) override;
virtual void DrawScopeSoftware(QPainter &p, const QImage &image) override;
virtual void draw_scope_software(QPainter &p, const QImage &image) override;
};
}
#endif // WAVEFORMSCOPE_H
#endif // OAK_WAVEFORMSCOPE_H