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:
+32
-32
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef NODEPARAM_H
|
||||
#define NODEPARAM_H
|
||||
#ifndef OAK_NODEPARAM_H
|
||||
#define OAK_NODEPARAM_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
@@ -34,21 +34,21 @@ class NodeKeyframe;
|
||||
|
||||
enum InputFlag : uint64_t {
|
||||
/// By default, inputs are keyframable, connectable, and NOT arrays
|
||||
kInputFlagNormal = 0x0,
|
||||
kInputFlagArray = 0x1,
|
||||
kInputFlagNotKeyframable = 0x2,
|
||||
kInputFlagNotConnectable = 0x4,
|
||||
kInputFlagHidden = 0x8,
|
||||
kInputFlagIgnoreInvalidations = 0x10,
|
||||
k_input_flag_normal = 0x0,
|
||||
k_input_flag_array = 0x1,
|
||||
k_input_flag_not_keyframable = 0x2,
|
||||
k_input_flag_not_connectable = 0x4,
|
||||
k_input_flag_hidden = 0x8,
|
||||
k_input_flag_ignore_invalidations = 0x10,
|
||||
|
||||
kInputFlagStatic = kInputFlagNotKeyframable | kInputFlagNotConnectable
|
||||
k_input_flag_static = k_input_flag_not_keyframable | k_input_flag_not_connectable
|
||||
};
|
||||
|
||||
class InputFlags {
|
||||
public:
|
||||
explicit InputFlags()
|
||||
{
|
||||
f_ = kInputFlagNormal;
|
||||
f_ = k_input_flag_normal;
|
||||
}
|
||||
|
||||
explicit InputFlags(uint64_t flags)
|
||||
@@ -244,44 +244,44 @@ public:
|
||||
|
||||
QString name() const;
|
||||
|
||||
bool IsValid() const
|
||||
bool is_valid() const
|
||||
{
|
||||
return node_ && !input_.isEmpty() && element_ >= -1;
|
||||
}
|
||||
|
||||
bool IsHidden() const;
|
||||
bool is_hidden() const;
|
||||
|
||||
bool IsConnected() const;
|
||||
bool is_connected() const;
|
||||
|
||||
bool IsKeyframing() const;
|
||||
bool is_keyframing() const;
|
||||
|
||||
bool IsArray() const;
|
||||
bool is_array() const;
|
||||
|
||||
InputFlags GetFlags() const;
|
||||
InputFlags get_flags() const;
|
||||
|
||||
QString GetInputName() const;
|
||||
QString get_input_name() const;
|
||||
|
||||
Node *GetConnectedOutput() const;
|
||||
Node *get_connected_output() const;
|
||||
|
||||
NodeValue::Type GetDataType() const;
|
||||
NodeValue::Type get_data_type() const;
|
||||
|
||||
QVariant GetDefaultValue() const;
|
||||
QVariant get_default_value() const;
|
||||
|
||||
QStringList GetComboBoxStrings() const;
|
||||
QStringList get_combo_box_strings() const;
|
||||
|
||||
QVariant GetProperty(const QString &key) const;
|
||||
QHash<QString, QVariant> GetProperties() const;
|
||||
QVariant get_property(const QString &key) const;
|
||||
QHash<QString, QVariant> get_properties() const;
|
||||
|
||||
QVariant GetValueAtTime(const rational &time) const;
|
||||
QVariant get_value_at_time(const Rational &time) const;
|
||||
|
||||
NodeKeyframe *GetKeyframeAtTimeOnTrack(const rational &time,
|
||||
NodeKeyframe *get_keyframe_at_time_on_track(const Rational &time,
|
||||
int track) const;
|
||||
|
||||
QVariant GetSplitDefaultValueForTrack(int track) const;
|
||||
QVariant get_split_default_value_for_track(int track) const;
|
||||
|
||||
int GetArraySize() const;
|
||||
int get_array_size() const;
|
||||
|
||||
void Reset()
|
||||
void reset()
|
||||
{
|
||||
*this = NodeInput();
|
||||
}
|
||||
@@ -344,12 +344,12 @@ public:
|
||||
return track_;
|
||||
}
|
||||
|
||||
bool IsValid() const
|
||||
bool is_valid() const
|
||||
{
|
||||
return input_.IsValid() && track_ >= 0;
|
||||
return input_.is_valid() && track_ >= 0;
|
||||
}
|
||||
|
||||
void Reset()
|
||||
void reset()
|
||||
{
|
||||
*this = NodeKeyframeTrackReference();
|
||||
}
|
||||
@@ -368,4 +368,4 @@ uint qHash(const NodeKeyframeTrackReference &i);
|
||||
Q_DECLARE_METATYPE(olive::NodeInput)
|
||||
Q_DECLARE_METATYPE(olive::NodeKeyframeTrackReference)
|
||||
|
||||
#endif // NODEPARAM_H
|
||||
#endif // OAK_NODEPARAM_H
|
||||
|
||||
Reference in New Issue
Block a user