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:
2026-07-19 16:10:54 +08:00
parent cb1718a103
commit bb40b4923e
1014 changed files with 44257 additions and 44220 deletions
@@ -51,7 +51,7 @@ TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent)
layout->addStretch();
connect(verticalScrollBar(), &QScrollBar::rangeChanged, this,
&TrackView::ScrollbarRangeChanged);
&TrackView::scrollbar_range_changed);
last_scrollbar_max_ = verticalScrollBar()->maximum();
}
@@ -63,51 +63,51 @@ TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent)
layout->addStretch();
}
connect(splitter_, &TrackViewSplitter::TrackHeightChanged, this,
&TrackView::TrackHeightChanged);
connect(splitter_, &TrackViewSplitter::track_height_changed, this,
&TrackView::track_height_changed);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
}
void TrackView::ConnectTrackList(TrackList *list)
void TrackView::connect_track_list(TrackList *list)
{
if (list_ != nullptr) {
// Remove tracks
for (int i = 0; i < list_->GetTrackCount(); i++) {
splitter_->Remove(0);
for (int i = 0; i < list_->get_track_count(); i++) {
splitter_->remove(0);
}
disconnect(list_, &TrackList::TrackAdded, this,
&TrackView::InsertTrack);
disconnect(list_, &TrackList::TrackRemoved, this,
&TrackView::RemoveTrack);
disconnect(list_, &TrackList::track_added, this,
&TrackView::insert_track);
disconnect(list_, &TrackList::track_removed, this,
&TrackView::remove_track);
}
list_ = list;
if (list_ != nullptr) {
foreach (Track *track, list_->GetTracks()) {
InsertTrack(track);
foreach (Track *track, list_->get_tracks()) {
insert_track(track);
}
connect(list_, &TrackList::TrackAdded, this, &TrackView::InsertTrack);
connect(list_, &TrackList::TrackRemoved, this, &TrackView::RemoveTrack);
connect(list_, &TrackList::track_added, this, &TrackView::insert_track);
connect(list_, &TrackList::track_removed, this, &TrackView::remove_track);
}
}
void TrackView::DisconnectTrackList()
void TrackView::disconnect_track_list()
{
ConnectTrackList(nullptr);
connect_track_list(nullptr);
}
void TrackView::resizeEvent(QResizeEvent *e)
{
QScrollArea::resizeEvent(e);
splitter_->SetSpacerHeight(height() / 2);
splitter_->set_spacer_height(height() / 2);
}
void TrackView::ScrollbarRangeChanged(int, int max)
void TrackView::scrollbar_range_changed(int, int max)
{
if (max != last_scrollbar_max_) {
int ba_val = last_scrollbar_max_ - verticalScrollBar()->value();
@@ -120,24 +120,24 @@ void TrackView::ScrollbarRangeChanged(int, int max)
}
}
void TrackView::TrackHeightChanged(int index, int height)
void TrackView::track_height_changed(int index, int height)
{
list_->GetTrackAt(index)->SetTrackHeightInPixels(height);
list_->get_track_at(index)->set_track_height_in_pixels(height);
}
void TrackView::InsertTrack(Track *track)
void TrackView::insert_track(Track *track)
{
TrackViewItem *tvi = new TrackViewItem(track);
connect(tvi, &TrackViewItem::AboutToDeleteTrack, this,
&TrackView::AboutToDeleteTrack);
connect(tvi, &TrackViewItem::about_to_delete_track, this,
&TrackView::about_to_delete_track);
splitter_->Insert(track->Index(), track->GetTrackHeightInPixels(), tvi);
splitter_->insert(track->index(), track->get_track_height_in_pixels(), tvi);
}
void TrackView::RemoveTrack(Track *track)
void TrackView::remove_track(Track *track)
{
splitter_->Remove(track->Index());
splitter_->remove(track->index());
}
}
+10 -10
View File
@@ -19,8 +19,8 @@
***/
#ifndef TRACKVIEW_H
#define TRACKVIEW_H
#ifndef OAK_TRACKVIEW_H
#define OAK_TRACKVIEW_H
#include <QScrollArea>
#include <QSplitter>
@@ -38,11 +38,11 @@ public:
TrackView(Qt::Alignment vertical_alignment = Qt::AlignTop,
QWidget *parent = nullptr);
void ConnectTrackList(TrackList *list);
void DisconnectTrackList();
void connect_track_list(TrackList *list);
void disconnect_track_list();
signals:
void AboutToDeleteTrack(Track *track);
void about_to_delete_track(Track *track);
protected:
virtual void resizeEvent(QResizeEvent *e) override;
@@ -57,15 +57,15 @@ private:
int last_scrollbar_max_;
private slots:
void ScrollbarRangeChanged(int min, int max);
void scrollbar_range_changed(int min, int max);
void TrackHeightChanged(int index, int height);
void track_height_changed(int index, int height);
void InsertTrack(Track *track);
void insert_track(Track *track);
void RemoveTrack(Track *track);
void remove_track(Track *track);
};
}
#endif // TRACKVIEW_H
#endif // OAK_TRACKVIEW_H
@@ -48,49 +48,49 @@ TrackViewItem::TrackViewItem(Track *track, QWidget *parent)
layout->addWidget(stack_);
label_ = new ClickableLabel();
connect(label_, &ClickableLabel::MouseDoubleClicked, this,
&TrackViewItem::LabelClicked);
connect(track_, &Track::LabelChanged, this, &TrackViewItem::UpdateLabel);
connect(track_, &Track::IndexChanged, this, &TrackViewItem::UpdateLabel);
UpdateLabel();
connect(label_, &ClickableLabel::mouse_double_clicked, this,
&TrackViewItem::label_clicked);
connect(track_, &Track::label_changed, this, &TrackViewItem::update_label);
connect(track_, &Track::index_changed, this, &TrackViewItem::update_label);
update_label();
stack_->addWidget(label_);
line_edit_ = new FocusableLineEdit();
connect(line_edit_, &FocusableLineEdit::Confirmed, this,
&TrackViewItem::LineEditConfirmed);
connect(line_edit_, &FocusableLineEdit::Cancelled, this,
&TrackViewItem::LineEditCancelled);
connect(line_edit_, &FocusableLineEdit::confirmed, this,
&TrackViewItem::line_edit_confirmed);
connect(line_edit_, &FocusableLineEdit::cancelled, this,
&TrackViewItem::line_edit_cancelled);
stack_->addWidget(line_edit_);
mute_button_ = CreateMSLButton(Qt::red);
mute_button_->setChecked(track->IsMuted());
UpdateMuteButton(track->IsMuted());
connect(mute_button_, &QPushButton::toggled, track_, &Track::SetMuted);
mute_button_ = create_msl_button(Qt::red);
mute_button_->setChecked(track->is_muted());
update_mute_button(track->is_muted());
connect(mute_button_, &QPushButton::toggled, track_, &Track::set_muted);
connect(mute_button_, &QPushButton::toggled, this,
&TrackViewItem::UpdateMuteButton);
&TrackViewItem::update_mute_button);
layout->addWidget(mute_button_);
/*solo_button_ = CreateMSLButton(tr("S"), Qt::yellow);
layout->addWidget(solo_button_);*/
lock_button_ = CreateMSLButton(Qt::gray);
lock_button_->setChecked(track->IsLocked());
UpdateLockButton(track->IsLocked());
connect(lock_button_, &QPushButton::toggled, track_, &Track::SetLocked);
lock_button_ = create_msl_button(Qt::gray);
lock_button_->setChecked(track->is_locked());
update_lock_button(track->is_locked());
connect(lock_button_, &QPushButton::toggled, track_, &Track::set_locked);
connect(lock_button_, &QPushButton::toggled, this,
&TrackViewItem::UpdateLockButton);
&TrackViewItem::update_lock_button);
layout->addWidget(lock_button_);
setMinimumHeight(mute_button_->height());
setContextMenuPolicy(Qt::CustomContextMenu);
connect(track, &Track::MutedChanged, mute_button_,
connect(track, &Track::muted_changed, mute_button_,
&QPushButton::setChecked);
connect(this, &QWidget::customContextMenuRequested, this,
&TrackViewItem::ShowContextMenu);
&TrackViewItem::show_context_menu);
}
QPushButton *TrackViewItem::CreateMSLButton(const QColor &checked_color) const
QPushButton *TrackViewItem::create_msl_button(const QColor &checked_color) const
{
QPushButton *button = new QPushButton();
button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
@@ -106,26 +106,26 @@ QPushButton *TrackViewItem::CreateMSLButton(const QColor &checked_color) const
return button;
}
void TrackViewItem::LabelClicked()
void TrackViewItem::label_clicked()
{
stack_->setCurrentWidget(line_edit_);
line_edit_->setFocus();
line_edit_->selectAll();
}
void TrackViewItem::LineEditConfirmed()
void TrackViewItem::line_edit_confirmed()
{
line_edit_->blockSignals(true);
track_->SetLabel(line_edit_->text());
UpdateLabel();
track_->set_label(line_edit_->text());
update_label();
stack_->setCurrentWidget(label_);
line_edit_->blockSignals(false);
}
void TrackViewItem::LineEditCancelled()
void TrackViewItem::line_edit_cancelled()
{
line_edit_->blockSignals(true);
@@ -134,46 +134,46 @@ void TrackViewItem::LineEditCancelled()
line_edit_->blockSignals(false);
}
void TrackViewItem::UpdateLabel()
void TrackViewItem::update_label()
{
label_->setText(track_->GetLabelOrName());
label_->setText(track_->get_label_or_name());
}
void TrackViewItem::ShowContextMenu(const QPoint &p)
void TrackViewItem::show_context_menu(const QPoint &p)
{
Menu m(this);
QAction *delete_action = m.addAction(tr("&Delete"));
connect(delete_action, &QAction::triggered, this,
&TrackViewItem::DeleteTrack, Qt::QueuedConnection);
&TrackViewItem::delete_track, Qt::QueuedConnection);
m.addSeparator();
QAction *delete_unused_action = m.addAction(tr("Delete All &Empty"));
connect(delete_unused_action, &QAction::triggered, this,
&TrackViewItem::DeleteAllEmptyTracks, Qt::QueuedConnection);
&TrackViewItem::delete_all_empty_tracks, Qt::QueuedConnection);
m.exec(mapToGlobal(p));
}
void TrackViewItem::DeleteTrack()
void TrackViewItem::delete_track()
{
emit AboutToDeleteTrack(track_);
emit about_to_delete_track(track_);
Core::instance()->undo_stack()->push(
new TimelineRemoveTrackCommand(track_),
tr("Deleted Track \"%1\"").arg(track_->GetLabelOrName()));
tr("Deleted Track \"%1\"").arg(track_->get_label_or_name()));
}
void TrackViewItem::DeleteAllEmptyTracks()
void TrackViewItem::delete_all_empty_tracks()
{
Sequence *sequence = track_->sequence();
QVector<Track *> tracks_to_remove;
QStringList track_names_to_remove;
foreach (Track *t, sequence->GetTracks()) {
if (t->Blocks().isEmpty()) {
foreach (Track *t, sequence->get_tracks()) {
if (t->blocks().isEmpty()) {
tracks_to_remove.append(t);
track_names_to_remove.append(t->GetLabelOrName());
track_names_to_remove.append(t->get_label_or_name());
}
}
@@ -196,14 +196,14 @@ void TrackViewItem::DeleteAllEmptyTracks()
}
}
void TrackViewItem::UpdateMuteButton(bool e)
void TrackViewItem::update_mute_button(bool e)
{
mute_button_->setIcon(e ? icon::EyeClosed : icon::EyeOpened);
mute_button_->setIcon(e ? icon::eye_closed : icon::eye_opened);
}
void TrackViewItem::UpdateLockButton(bool e)
void TrackViewItem::update_lock_button(bool e)
{
lock_button_->setIcon(e ? icon::LockClosed : icon::LockOpened);
lock_button_->setIcon(e ? icon::lock_closed : icon::lock_opened);
}
}
@@ -19,8 +19,8 @@
***/
#ifndef TRACKVIEWITEM_H
#define TRACKVIEWITEM_H
#ifndef OAK_TRACKVIEWITEM_H
#define OAK_TRACKVIEWITEM_H
#include <QPushButton>
#include <QStackedWidget>
@@ -40,10 +40,10 @@ public:
TrackViewItem(Track *track, QWidget *parent = nullptr);
signals:
void AboutToDeleteTrack(Track *track);
void about_to_delete_track(Track *track);
private:
QPushButton *CreateMSLButton(const QColor &checked_color) const;
QPushButton *create_msl_button(const QColor &checked_color) const;
QStackedWidget *stack_;
@@ -57,25 +57,25 @@ private:
Track *track_;
private slots:
void LabelClicked();
void label_clicked();
void LineEditConfirmed();
void line_edit_confirmed();
void LineEditCancelled();
void line_edit_cancelled();
void UpdateLabel();
void update_label();
void ShowContextMenu(const QPoint &p);
void show_context_menu(const QPoint &p);
void DeleteTrack();
void delete_track();
void DeleteAllEmptyTracks();
void delete_all_empty_tracks();
void UpdateMuteButton(bool e);
void update_mute_button(bool e);
void UpdateLockButton(bool e);
void update_lock_button(bool e);
};
}
#endif // TRACKVIEWITEM_H
#endif // OAK_TRACKVIEWITEM_H
@@ -46,7 +46,7 @@ TrackViewSplitter::TrackViewSplitter(Qt::Alignment vertical_alignment,
setFixedHeight(initial_height);
}
void TrackViewSplitter::HandleReceiver(TrackViewSplitterHandle *h, int diff)
void TrackViewSplitter::handle_receiver(TrackViewSplitterHandle *h, int diff)
{
int ele_id = -1;
@@ -72,18 +72,18 @@ void TrackViewSplitter::HandleReceiver(TrackViewSplitterHandle *h, int diff)
int new_ele_sz = old_ele_sz + diff;
// Limit by track minimum height
new_ele_sz = qMax(new_ele_sz, Track::GetMinimumTrackHeightInPixels());
new_ele_sz = qMax(new_ele_sz, Track::get_minimum_track_height_in_pixels());
if (alignment_ == Qt::AlignBottom) {
ele_id = count() - ele_id - 1;
}
SetTrackHeight(ele_id, new_ele_sz);
set_track_height(ele_id, new_ele_sz);
emit TrackHeightChanged(ele_id, new_ele_sz);
emit track_height_changed(ele_id, new_ele_sz);
}
void TrackViewSplitter::SetTrackHeight(int index, int h)
void TrackViewSplitter::set_track_height(int index, int h)
{
QList<int> element_sizes = sizes();
@@ -103,7 +103,7 @@ void TrackViewSplitter::SetTrackHeight(int index, int h)
setFixedHeight(height() + diff);
}
void TrackViewSplitter::SetHeightWithSizes(QList<int> sizes)
void TrackViewSplitter::set_height_with_sizes(QList<int> sizes)
{
int start_height = 0;
@@ -125,7 +125,7 @@ void TrackViewSplitter::SetHeightWithSizes(QList<int> sizes)
setSizes(sizes);
}
void TrackViewSplitter::Insert(int index, int height, QWidget *item)
void TrackViewSplitter::insert(int index, int height, QWidget *item)
{
QList<int> sz = sizes();
@@ -136,10 +136,10 @@ void TrackViewSplitter::Insert(int index, int height, QWidget *item)
sz.insert(index, height);
insertWidget(index, item);
SetHeightWithSizes(sz);
set_height_with_sizes(sz);
}
void TrackViewSplitter::Remove(int index)
void TrackViewSplitter::remove(int index)
{
QList<int> sz = sizes();
@@ -150,13 +150,13 @@ void TrackViewSplitter::Remove(int index)
sz.removeAt(index);
delete widget(index);
SetHeightWithSizes(sz);
set_height_with_sizes(sz);
}
void TrackViewSplitter::SetSpacerHeight(int height)
void TrackViewSplitter::set_spacer_height(int height)
{
spacer_height_ = height;
SetHeightWithSizes(sizes());
set_height_with_sizes(sizes());
}
QSplitterHandle *TrackViewSplitter::createHandle()
@@ -178,7 +178,7 @@ void TrackViewSplitterHandle::mousePressEvent(QMouseEvent *)
void TrackViewSplitterHandle::mouseMoveEvent(QMouseEvent *)
{
if (dragging_) {
static_cast<TrackViewSplitter *>(parent())->HandleReceiver(
static_cast<TrackViewSplitter *>(parent())->handle_receiver(
this, QCursor::pos().y() - drag_y_);
}
@@ -19,8 +19,8 @@
***/
#ifndef TRACKVIEWSPLITTER_H
#define TRACKVIEWSPLITTER_H
#ifndef OAK_TRACKVIEWSPLITTER_H
#define OAK_TRACKVIEWSPLITTER_H
#include <QSplitter>
@@ -53,20 +53,20 @@ public:
TrackViewSplitter(Qt::Alignment vertical_alignment,
QWidget *parent = nullptr);
void HandleReceiver(TrackViewSplitterHandle *h, int diff);
void handle_receiver(TrackViewSplitterHandle *h, int diff);
void SetHeightWithSizes(QList<int> sizes);
void set_height_with_sizes(QList<int> sizes);
void Insert(int index, int height, QWidget *item);
void Remove(int index);
void insert(int index, int height, QWidget *item);
void remove(int index);
void SetSpacerHeight(int height);
void set_spacer_height(int height);
public slots:
void SetTrackHeight(int index, int h);
void set_track_height(int index, int h);
signals:
void TrackHeightChanged(int index, int height);
void track_height_changed(int index, int height);
protected:
virtual QSplitterHandle *createHandle() override;
@@ -79,4 +79,4 @@ private:
}
#endif // TRACKVIEWSPLITTER_H
#endif // OAK_TRACKVIEWSPLITTER_H