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:
+25
-25
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef NODEGROUP_H
|
||||
#define NODEGROUP_H
|
||||
#ifndef OAK_NODEGROUP_H
|
||||
#define OAK_NODEGROUP_H
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
@@ -34,45 +34,45 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(NodeGroup)
|
||||
|
||||
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 bool LoadCustom(QXmlStreamReader *reader,
|
||||
virtual bool load_custom(QXmlStreamReader *reader,
|
||||
SerializedData *data) override;
|
||||
virtual void SaveCustom(QXmlStreamWriter *writer) const override;
|
||||
virtual void save_custom(QXmlStreamWriter *writer) const override;
|
||||
virtual void PostLoadEvent(SerializedData *data) override;
|
||||
|
||||
QString AddInputPassthrough(const NodeInput &input,
|
||||
QString add_input_passthrough(const NodeInput &input,
|
||||
const QString &force_id = QString());
|
||||
|
||||
void RemoveInputPassthrough(const NodeInput &input);
|
||||
void remove_input_passthrough(const NodeInput &input);
|
||||
|
||||
Node *GetOutputPassthrough() const
|
||||
Node *get_output_passthrough() const
|
||||
{
|
||||
return output_passthrough_;
|
||||
}
|
||||
|
||||
void SetOutputPassthrough(Node *node);
|
||||
void set_output_passthrough(Node *node);
|
||||
|
||||
using InputPassthrough = QPair<QString, NodeInput>;
|
||||
using InputPassthroughs = QVector<InputPassthrough>;
|
||||
const InputPassthroughs &GetInputPassthroughs() const
|
||||
const InputPassthroughs &get_input_passthroughs() const
|
||||
{
|
||||
return input_passthroughs_;
|
||||
}
|
||||
|
||||
bool ContainsInputPassthrough(const NodeInput &input) const;
|
||||
bool contains_input_passthrough(const NodeInput &input) const;
|
||||
|
||||
virtual QString GetInputName(const QString &id) const override;
|
||||
virtual QString get_input_name(const QString &id) const override;
|
||||
|
||||
static NodeInput ResolveInput(NodeInput input);
|
||||
static bool GetInner(NodeInput *input);
|
||||
static NodeInput resolve_input(NodeInput input);
|
||||
static bool get_inner(NodeInput *input);
|
||||
|
||||
QString GetIDOfPassthrough(const NodeInput &input) const
|
||||
QString get_id_of_passthrough(const NodeInput &input) const
|
||||
{
|
||||
for (auto it = input_passthroughs_.cbegin();
|
||||
it != input_passthroughs_.cend(); it++) {
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
return QString();
|
||||
}
|
||||
|
||||
NodeInput GetInputFromID(const QString &id) const
|
||||
NodeInput get_input_from_id(const QString &id) const
|
||||
{
|
||||
for (auto it = input_passthroughs_.cbegin();
|
||||
it != input_passthroughs_.cend(); it++) {
|
||||
@@ -95,13 +95,13 @@ public:
|
||||
}
|
||||
|
||||
signals:
|
||||
void InputPassthroughAdded(olive::NodeGroup *group,
|
||||
void input_passthrough_added(olive::NodeGroup *group,
|
||||
const olive::NodeInput &input);
|
||||
|
||||
void InputPassthroughRemoved(olive::NodeGroup *group,
|
||||
void input_passthrough_removed(olive::NodeGroup *group,
|
||||
const olive::NodeInput &input);
|
||||
|
||||
void OutputPassthroughChanged(olive::NodeGroup *group, olive::Node *output);
|
||||
void output_passthrough_changed(olive::NodeGroup *group, olive::Node *output);
|
||||
|
||||
private:
|
||||
InputPassthroughs input_passthroughs_;
|
||||
@@ -119,7 +119,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
virtual Project *GetRelevantProject() const override
|
||||
virtual Project *get_relevant_project() const override
|
||||
{
|
||||
return group_->project();
|
||||
}
|
||||
@@ -147,7 +147,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
virtual Project *GetRelevantProject() const override
|
||||
virtual Project *get_relevant_project() const override
|
||||
{
|
||||
return group_->project();
|
||||
}
|
||||
@@ -166,4 +166,4 @@ private:
|
||||
|
||||
}
|
||||
|
||||
#endif // NODEGROUP_H
|
||||
#endif // OAK_NODEGROUP_H
|
||||
|
||||
Reference in New Issue
Block a user