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/nodetreeview/nodetreeview.cpp
+53 -53
View File
@@ -33,24 +33,24 @@ NodeTreeView::NodeTreeView(QWidget *parent)
, checkboxes_enabled_(false)
{
connect(this, &NodeTreeView::itemChanged, this,
&NodeTreeView::ItemCheckStateChanged);
&NodeTreeView::item_check_state_changed);
connect(this, &NodeTreeView::itemSelectionChanged, this,
&NodeTreeView::SelectionChanged);
&NodeTreeView::selection_changed);
Retranslate();
retranslate();
}
bool NodeTreeView::IsNodeEnabled(Node *n) const
bool NodeTreeView::is_node_enabled(Node *n) const
{
return !disabled_nodes_.contains(n);
}
bool NodeTreeView::IsInputEnabled(const NodeKeyframeTrackReference &ref) const
bool NodeTreeView::is_input_enabled(const NodeKeyframeTrackReference &ref) const
{
return !disabled_inputs_.contains(ref);
}
void NodeTreeView::SetKeyframeTrackColor(const NodeKeyframeTrackReference &ref,
void NodeTreeView::set_keyframe_track_color(const NodeKeyframeTrackReference &ref,
const QColor &color)
{
// Insert into hashmap
@@ -63,7 +63,7 @@ void NodeTreeView::SetKeyframeTrackColor(const NodeKeyframeTrackReference &ref,
}
}
void NodeTreeView::SetNodes(const QVector<Node *> &nodes)
void NodeTreeView::set_nodes(const QVector<Node *> &nodes)
{
nodes_ = nodes;
@@ -72,33 +72,33 @@ void NodeTreeView::SetNodes(const QVector<Node *> &nodes)
foreach (Node *n, nodes_) {
QTreeWidgetItem *node_item = new QTreeWidgetItem();
node_item->setText(0, n->Name());
node_item->setText(0, n->name());
if (checkboxes_enabled_) {
node_item->setCheckState(
0, disabled_nodes_.contains(n) ? Qt::Unchecked : Qt::Checked);
}
node_item->setData(0, kItemType, kItemTypeNode);
node_item->setData(0, kItemNodePointer, QtUtils::PtrToValue(n));
node_item->setData(0, k_item_type, k_item_type_node);
node_item->setData(0, k_item_node_pointer, QtUtils::ptr_to_value(n));
foreach (const QString &input, n->inputs()) {
if (n->IsInputHidden(input) ||
(only_show_keyframable_ && !n->IsInputKeyframable(input))) {
if (n->is_input_hidden(input) ||
(only_show_keyframable_ && !n->is_input_keyframable(input))) {
continue;
}
QTreeWidgetItem *input_item = nullptr;
int arr_sz = n->InputArraySize(input);
int arr_sz = n->input_array_size(input);
for (int i = -1; i < arr_sz; i++) {
NodeInput input_ref(n, input, i);
const QVector<NodeKeyframeTrack> &key_tracks =
n->GetKeyframeTracks(input_ref);
n->get_keyframe_tracks(input_ref);
int this_element_track;
if (show_keyframe_tracks_as_rows_ &&
(key_tracks.size() == 1 ||
(i == -1 && n->InputIsArray(input)))) {
(i == -1 && n->input_is_array(input)))) {
this_element_track = 0;
} else {
this_element_track = -1;
@@ -107,19 +107,19 @@ void NodeTreeView::SetNodes(const QVector<Node *> &nodes)
QTreeWidgetItem *element_item;
if (input_item) {
element_item = CreateItem(
element_item = create_item(
input_item, NodeKeyframeTrackReference(
input_ref, this_element_track));
} else {
input_item = CreateItem(node_item,
input_item = create_item(node_item,
NodeKeyframeTrackReference(
input_ref, this_element_track));
element_item = input_item;
}
if (show_keyframe_tracks_as_rows_ && key_tracks.size() > 1 &&
(!n->InputIsArray(input) || i >= 0)) {
CreateItemsForTracks(element_item, input_ref,
(!n->input_is_array(input) || i >= 0)) {
create_items_for_tracks(element_item, input_ref,
key_tracks.size());
}
}
@@ -141,7 +141,7 @@ void NodeTreeView::changeEvent(QEvent *e)
QTreeWidget::changeEvent(e);
if (e->type() == QEvent::LanguageChange) {
Retranslate();
retranslate();
}
}
@@ -149,19 +149,19 @@ void NodeTreeView::mouseDoubleClickEvent(QMouseEvent *e)
{
QTreeWidget::mouseDoubleClickEvent(e);
NodeKeyframeTrackReference ref = GetSelectedInput();
NodeKeyframeTrackReference ref = get_selected_input();
if (ref.input().IsValid()) {
emit InputDoubleClicked(ref);
if (ref.input().is_valid()) {
emit input_double_clicked(ref);
}
}
void NodeTreeView::Retranslate()
void NodeTreeView::retranslate()
{
setHeaderLabel(tr("Nodes"));
}
NodeKeyframeTrackReference NodeTreeView::GetSelectedInput()
NodeKeyframeTrackReference NodeTreeView::get_selected_input()
{
QList<QTreeWidgetItem *> sel = selectedItems();
@@ -170,12 +170,12 @@ NodeKeyframeTrackReference NodeTreeView::GetSelectedInput()
if (!sel.isEmpty()) {
QTreeWidgetItem *item = sel.first();
if (item->data(0, kItemType).toInt() == kItemTypeInput) {
selected_ref = item->data(0, kItemInputReference)
if (item->data(0, k_item_type).toInt() == k_item_type_input) {
selected_ref = item->data(0, k_item_input_reference)
.value<NodeKeyframeTrackReference>();
} else {
selected_ref = NodeKeyframeTrackReference(NodeInput(
QtUtils::ValueToPtr<Node>(item->data(0, kItemNodePointer)),
QtUtils::value_to_ptr<Node>(item->data(0, k_item_node_pointer)),
QString()));
}
}
@@ -183,16 +183,16 @@ NodeKeyframeTrackReference NodeTreeView::GetSelectedInput()
return selected_ref;
}
QTreeWidgetItem *NodeTreeView::CreateItem(QTreeWidgetItem *parent,
QTreeWidgetItem *NodeTreeView::create_item(QTreeWidgetItem *parent,
const NodeKeyframeTrackReference &ref)
{
QTreeWidgetItem *input_item = new QTreeWidgetItem(parent);
QString item_name;
if (ref.track() == -1 ||
NodeValue::get_number_of_keyframe_tracks(ref.input().GetDataType()) ==
NodeValue::get_number_of_keyframe_tracks(ref.input().get_data_type()) ==
1 ||
(ref.input().IsArray() && ref.input().element() == -1)) {
(ref.input().is_array() && ref.input().element() == -1)) {
if (ref.input().element() == -1) {
item_name = ref.input().name();
} else {
@@ -201,16 +201,16 @@ QTreeWidgetItem *NodeTreeView::CreateItem(QTreeWidgetItem *parent,
} else {
switch (ref.track()) {
case 0:
item_name = UseRGBAOverXYZW(ref) ? tr("R") : tr("X");
item_name = use_rgba_over_xyzw(ref) ? tr("R") : tr("X");
break;
case 1:
item_name = UseRGBAOverXYZW(ref) ? tr("G") : tr("Y");
item_name = use_rgba_over_xyzw(ref) ? tr("G") : tr("Y");
break;
case 2:
item_name = UseRGBAOverXYZW(ref) ? tr("B") : tr("Z");
item_name = use_rgba_over_xyzw(ref) ? tr("B") : tr("Z");
break;
case 3:
item_name = UseRGBAOverXYZW(ref) ? tr("A") : tr("W");
item_name = use_rgba_over_xyzw(ref) ? tr("A") : tr("W");
break;
default:
item_name = QString::number(ref.track());
@@ -222,8 +222,8 @@ QTreeWidgetItem *NodeTreeView::CreateItem(QTreeWidgetItem *parent,
input_item->setCheckState(
0, disabled_inputs_.contains(ref) ? Qt::Unchecked : Qt::Checked);
}
input_item->setData(0, kItemType, kItemTypeInput);
input_item->setData(0, kItemInputReference, QVariant::fromValue(ref));
input_item->setData(0, k_item_type, k_item_type_input);
input_item->setData(0, k_item_input_reference, QVariant::fromValue(ref));
if (keyframe_colors_.contains(ref)) {
input_item->setForeground(0, keyframe_colors_.value(ref));
@@ -234,59 +234,59 @@ QTreeWidgetItem *NodeTreeView::CreateItem(QTreeWidgetItem *parent,
return input_item;
}
void NodeTreeView::CreateItemsForTracks(QTreeWidgetItem *parent,
void NodeTreeView::create_items_for_tracks(QTreeWidgetItem *parent,
const NodeInput &input, int track_count)
{
for (int j = 0; j < track_count; j++) {
CreateItem(parent, NodeKeyframeTrackReference(input, j));
create_item(parent, NodeKeyframeTrackReference(input, j));
}
}
bool NodeTreeView::UseRGBAOverXYZW(const NodeKeyframeTrackReference &ref)
bool NodeTreeView::use_rgba_over_xyzw(const NodeKeyframeTrackReference &ref)
{
return ref.input().GetDataType() == NodeValue::kColor;
return ref.input().get_data_type() == NodeValue::k_color;
}
void NodeTreeView::ItemCheckStateChanged(QTreeWidgetItem *item, int column)
void NodeTreeView::item_check_state_changed(QTreeWidgetItem *item, int column)
{
Q_UNUSED(column)
switch (item->data(0, kItemType).toInt()) {
case kItemTypeNode: {
Node *n = QtUtils::ValueToPtr<Node>(item->data(0, kItemNodePointer));
switch (item->data(0, k_item_type).toInt()) {
case k_item_type_node: {
Node *n = QtUtils::value_to_ptr<Node>(item->data(0, k_item_node_pointer));
if (item->checkState(0) == Qt::Checked) {
if (disabled_nodes_.contains(n)) {
disabled_nodes_.removeOne(n);
emit NodeEnableChanged(n, true);
emit node_enable_changed(n, true);
}
} else if (!disabled_nodes_.contains(n)) {
disabled_nodes_.append(n);
emit NodeEnableChanged(n, false);
emit node_enable_changed(n, false);
}
break;
}
case kItemTypeInput: {
NodeKeyframeTrackReference i = item->data(0, kItemInputReference)
case k_item_type_input: {
NodeKeyframeTrackReference i = item->data(0, k_item_input_reference)
.value<NodeKeyframeTrackReference>();
if (item->checkState(0) == Qt::Checked) {
if (disabled_inputs_.contains(i)) {
disabled_inputs_.removeOne(i);
emit InputEnableChanged(i, true);
emit input_enable_changed(i, true);
}
} else if (!disabled_inputs_.contains(i)) {
disabled_inputs_.append(i);
emit InputEnableChanged(i, false);
emit input_enable_changed(i, false);
}
break;
}
}
}
void NodeTreeView::SelectionChanged()
void NodeTreeView::selection_changed()
{
emit InputSelectionChanged(GetSelectedInput());
emit input_selection_changed(get_selected_input());
}
}
app/widget/nodetreeview/nodetreeview.h
+25 -25
View File
@@ -19,8 +19,8 @@
***/
#ifndef NODETREEVIEW_H
#define NODETREEVIEW_H
#ifndef OAK_NODETREEVIEW_H
#define OAK_NODETREEVIEW_H
#include <QTreeWidget>
@@ -34,39 +34,39 @@ class NodeTreeView : public QTreeWidget {
public:
NodeTreeView(QWidget *parent = nullptr);
bool IsNodeEnabled(Node *n) const;
bool is_node_enabled(Node *n) const;
bool IsInputEnabled(const NodeKeyframeTrackReference &ref) const;
bool is_input_enabled(const NodeKeyframeTrackReference &ref) const;
void SetCheckBoxesEnabled(bool e)
void set_check_boxes_enabled(bool e)
{
checkboxes_enabled_ = e;
}
void SetKeyframeTrackColor(const NodeKeyframeTrackReference &ref,
void set_keyframe_track_color(const NodeKeyframeTrackReference &ref,
const QColor &color);
void SetOnlyShowKeyframable(bool e)
void set_only_show_keyframable(bool e)
{
only_show_keyframable_ = e;
}
void SetShowKeyframeTracksAsRows(bool e)
void set_show_keyframe_tracks_as_rows(bool e)
{
show_keyframe_tracks_as_rows_ = e;
}
public slots:
void SetNodes(const QVector<Node *> &nodes);
void set_nodes(const QVector<Node *> &nodes);
signals:
void NodeEnableChanged(Node *n, bool e);
void node_enable_changed(Node *n, bool e);
void InputEnableChanged(const NodeKeyframeTrackReference &ref, bool e);
void input_enable_changed(const NodeKeyframeTrackReference &ref, bool e);
void InputSelectionChanged(const NodeKeyframeTrackReference &ref);
void input_selection_changed(const NodeKeyframeTrackReference &ref);
void InputDoubleClicked(const NodeKeyframeTrackReference &ref);
void input_double_clicked(const NodeKeyframeTrackReference &ref);
protected:
virtual void changeEvent(QEvent *e) override;
@@ -74,23 +74,23 @@ protected:
virtual void mouseDoubleClickEvent(QMouseEvent *e) override;
private:
void Retranslate();
void retranslate();
NodeKeyframeTrackReference GetSelectedInput();
NodeKeyframeTrackReference get_selected_input();
QTreeWidgetItem *CreateItem(QTreeWidgetItem *parent,
QTreeWidgetItem *create_item(QTreeWidgetItem *parent,
const NodeKeyframeTrackReference &ref);
void CreateItemsForTracks(QTreeWidgetItem *parent, const NodeInput &input,
void create_items_for_tracks(QTreeWidgetItem *parent, const NodeInput &input,
int track_count);
static bool UseRGBAOverXYZW(const NodeKeyframeTrackReference &ref);
static bool use_rgba_over_xyzw(const NodeKeyframeTrackReference &ref);
enum ItemType { kItemTypeNode, kItemTypeInput };
enum ItemType { k_item_type_node, k_item_type_input };
static const int kItemType = Qt::UserRole;
static const int kItemInputReference = Qt::UserRole + 1;
static const int kItemNodePointer = Qt::UserRole + 1;
static const int k_item_type = Qt::UserRole;
static const int k_item_input_reference = Qt::UserRole + 1;
static const int k_item_node_pointer = Qt::UserRole + 1;
QVector<Node *> nodes_;
@@ -109,11 +109,11 @@ private:
bool checkboxes_enabled_;
private slots:
void ItemCheckStateChanged(QTreeWidgetItem *item, int column);
void item_check_state_changed(QTreeWidgetItem *item, int column);
void SelectionChanged();
void selection_changed();
};
}
#endif // NODETREEVIEW_H
#endif // OAK_NODETREEVIEW_H