style: unify identifier naming per updated conventions
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:
@@ -24,20 +24,20 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
const QString TrigonometryNode::kMethodIn = QStringLiteral("method_in");
|
||||
const QString TrigonometryNode::kXIn = QStringLiteral("x_in");
|
||||
const QString TrigonometryNode::k_method_in = QStringLiteral("method_in");
|
||||
const QString TrigonometryNode::k_x_in = QStringLiteral("x_in");
|
||||
|
||||
#define super Node
|
||||
|
||||
TrigonometryNode::TrigonometryNode()
|
||||
{
|
||||
AddInput(kMethodIn, NodeValue::kCombo,
|
||||
InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
|
||||
add_input(k_method_in, NodeValue::k_combo,
|
||||
InputFlags(k_input_flag_not_connectable | k_input_flag_not_keyframable));
|
||||
|
||||
AddInput(kXIn, NodeValue::kFloat, 0.0);
|
||||
add_input(k_x_in, NodeValue::k_float, 0.0);
|
||||
}
|
||||
|
||||
QString TrigonometryNode::Name() const
|
||||
QString TrigonometryNode::name() const
|
||||
{
|
||||
return tr("Trigonometry");
|
||||
}
|
||||
@@ -47,19 +47,19 @@ QString TrigonometryNode::id() const
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.trigonometry");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> TrigonometryNode::Category() const
|
||||
QVector<Node::CategoryID> TrigonometryNode::category() const
|
||||
{
|
||||
return { kCategoryMath };
|
||||
return { k_category_math };
|
||||
}
|
||||
|
||||
QString TrigonometryNode::Description() const
|
||||
QString TrigonometryNode::description() const
|
||||
{
|
||||
return tr("Perform a trigonometry operation on a value.");
|
||||
}
|
||||
|
||||
void TrigonometryNode::Retranslate()
|
||||
void TrigonometryNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::retranslate();
|
||||
|
||||
QStringList strings = { tr("Sine"),
|
||||
tr("Cosine"),
|
||||
@@ -71,50 +71,50 @@ void TrigonometryNode::Retranslate()
|
||||
tr("Hyperbolic Cosine"),
|
||||
tr("Hyperbolic Tangent") };
|
||||
|
||||
SetComboBoxStrings(kMethodIn, strings);
|
||||
set_combo_box_strings(k_method_in, strings);
|
||||
|
||||
SetInputName(kMethodIn, tr("Method"));
|
||||
set_input_name(k_method_in, tr("Method"));
|
||||
|
||||
SetInputName(kXIn, tr("Value"));
|
||||
set_input_name(k_x_in, tr("Value"));
|
||||
}
|
||||
|
||||
void TrigonometryNode::Value(const NodeValueRow &value,
|
||||
void TrigonometryNode::value(const NodeValueRow &value,
|
||||
const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
double x = value[kXIn].toDouble();
|
||||
double x = value[k_x_in].to_double();
|
||||
|
||||
switch (static_cast<Operation>(GetStandardValue(kMethodIn).toInt())) {
|
||||
case kOpSine:
|
||||
switch (static_cast<Operation>(get_standard_value(k_method_in).toInt())) {
|
||||
case k_op_sine:
|
||||
x = std::sin(x);
|
||||
break;
|
||||
case kOpCosine:
|
||||
case k_op_cosine:
|
||||
x = std::cos(x);
|
||||
break;
|
||||
case kOpTangent:
|
||||
case k_op_tangent:
|
||||
x = std::tan(x);
|
||||
break;
|
||||
case kOpArcSine:
|
||||
case k_op_arc_sine:
|
||||
x = std::asin(x);
|
||||
break;
|
||||
case kOpArcCosine:
|
||||
case k_op_arc_cosine:
|
||||
x = std::acos(x);
|
||||
break;
|
||||
case kOpArcTangent:
|
||||
case k_op_arc_tangent:
|
||||
x = std::atan(x);
|
||||
break;
|
||||
case kOpHypSine:
|
||||
case k_op_hyp_sine:
|
||||
x = std::sinh(x);
|
||||
break;
|
||||
case kOpHypCosine:
|
||||
case k_op_hyp_cosine:
|
||||
x = std::cosh(x);
|
||||
break;
|
||||
case kOpHypTangent:
|
||||
case k_op_hyp_tangent:
|
||||
x = std::tanh(x);
|
||||
break;
|
||||
}
|
||||
|
||||
table->Push(NodeValue::kFloat, x, this);
|
||||
table->push(NodeValue::k_float, x, this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TRIGNODE_H
|
||||
#define TRIGNODE_H
|
||||
#ifndef OAK_TRIGNODE_H
|
||||
#define OAK_TRIGNODE_H
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
@@ -34,33 +34,33 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(TrigonometryNode)
|
||||
|
||||
virtual QString Name() const override;
|
||||
virtual QString name() const override;
|
||||
virtual QString id() const override;
|
||||
virtual QVector<CategoryID> Category() const override;
|
||||
virtual QString Description() const override;
|
||||
virtual QVector<CategoryID> category() const override;
|
||||
virtual QString description() const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
static const QString kMethodIn;
|
||||
static const QString kXIn;
|
||||
static const QString k_method_in;
|
||||
static const QString k_x_in;
|
||||
|
||||
private:
|
||||
enum Operation {
|
||||
kOpSine,
|
||||
kOpCosine,
|
||||
kOpTangent,
|
||||
kOpArcSine,
|
||||
kOpArcCosine,
|
||||
kOpArcTangent,
|
||||
kOpHypSine,
|
||||
kOpHypCosine,
|
||||
kOpHypTangent
|
||||
k_op_sine,
|
||||
k_op_cosine,
|
||||
k_op_tangent,
|
||||
k_op_arc_sine,
|
||||
k_op_arc_cosine,
|
||||
k_op_arc_tangent,
|
||||
k_op_hyp_sine,
|
||||
k_op_hyp_cosine,
|
||||
k_op_hyp_tangent
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // TRIGNODE_H
|
||||
#endif // OAK_TRIGNODE_H
|
||||
|
||||
Reference in New Issue
Block a user