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:
@@ -36,122 +36,122 @@ TimeBasedPanel::~TimeBasedPanel()
|
||||
delete widget_;
|
||||
}
|
||||
|
||||
const rational &TimeBasedPanel::timebase()
|
||||
const Rational &TimeBasedPanel::timebase()
|
||||
{
|
||||
return widget_->timebase();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::GoToStart()
|
||||
void TimeBasedPanel::go_to_start()
|
||||
{
|
||||
widget_->GoToStart();
|
||||
widget_->go_to_start();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::PrevFrame()
|
||||
void TimeBasedPanel::prev_frame()
|
||||
{
|
||||
widget_->PrevFrame();
|
||||
widget_->prev_frame();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::NextFrame()
|
||||
void TimeBasedPanel::next_frame()
|
||||
{
|
||||
widget_->NextFrame();
|
||||
widget_->next_frame();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::GoToEnd()
|
||||
void TimeBasedPanel::go_to_end()
|
||||
{
|
||||
widget_->GoToEnd();
|
||||
widget_->go_to_end();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ZoomIn()
|
||||
void TimeBasedPanel::zoom_in()
|
||||
{
|
||||
widget_->ZoomIn();
|
||||
widget_->zoom_in();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ZoomOut()
|
||||
void TimeBasedPanel::zoom_out()
|
||||
{
|
||||
widget_->ZoomOut();
|
||||
widget_->zoom_out();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::SetTimebase(const rational &timebase)
|
||||
void TimeBasedPanel::set_timebase(const Rational &timebase)
|
||||
{
|
||||
widget_->SetTimebase(timebase);
|
||||
}
|
||||
|
||||
void TimeBasedPanel::GoToPrevCut()
|
||||
void TimeBasedPanel::go_to_prev_cut()
|
||||
{
|
||||
widget_->GoToPrevCut();
|
||||
widget_->go_to_prev_cut();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::GoToNextCut()
|
||||
void TimeBasedPanel::go_to_next_cut()
|
||||
{
|
||||
widget_->GoToNextCut();
|
||||
widget_->go_to_next_cut();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::PlayPause()
|
||||
void TimeBasedPanel::play_pause()
|
||||
{
|
||||
emit PlayPauseRequested();
|
||||
emit play_pause_requested();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::PlayInToOut()
|
||||
void TimeBasedPanel::play_in_to_out()
|
||||
{
|
||||
emit PlayInToOutRequested();
|
||||
emit play_in_to_out_requested();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ShuttleLeft()
|
||||
void TimeBasedPanel::shuttle_left()
|
||||
{
|
||||
emit ShuttleLeftRequested();
|
||||
emit shuttle_left_requested();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ShuttleStop()
|
||||
void TimeBasedPanel::shuttle_stop()
|
||||
{
|
||||
emit ShuttleStopRequested();
|
||||
emit shuttle_stop_requested();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ShuttleRight()
|
||||
void TimeBasedPanel::shuttle_right()
|
||||
{
|
||||
emit ShuttleRightRequested();
|
||||
emit shuttle_right_requested();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ConnectViewerNode(ViewerOutput *node)
|
||||
void TimeBasedPanel::connect_viewer_node(ViewerOutput *node)
|
||||
{
|
||||
widget_->ConnectViewerNode(node);
|
||||
widget_->connect_viewer_node(node);
|
||||
}
|
||||
|
||||
void TimeBasedPanel::SetTimeBasedWidget(TimeBasedWidget *widget)
|
||||
void TimeBasedPanel::set_time_based_widget(TimeBasedWidget *widget)
|
||||
{
|
||||
if (widget_) {
|
||||
disconnect(widget_, &TimeBasedWidget::ConnectedNodeChanged, this,
|
||||
&TimeBasedPanel::ConnectedNodeChanged);
|
||||
disconnect(widget_, &TimeBasedWidget::connected_node_changed, this,
|
||||
&TimeBasedPanel::connected_node_changed);
|
||||
}
|
||||
|
||||
widget_ = widget;
|
||||
|
||||
if (widget_) {
|
||||
connect(widget_, &TimeBasedWidget::ConnectedNodeChanged, this,
|
||||
&TimeBasedPanel::ConnectedNodeChanged);
|
||||
connect(widget_, &TimeBasedWidget::connected_node_changed, this,
|
||||
&TimeBasedPanel::connected_node_changed);
|
||||
}
|
||||
|
||||
SetWidgetWithPadding(widget_);
|
||||
set_widget_with_padding(widget_);
|
||||
}
|
||||
|
||||
void TimeBasedPanel::Retranslate()
|
||||
void TimeBasedPanel::retranslate()
|
||||
{
|
||||
if (GetTimeBasedWidget()->GetConnectedNode()) {
|
||||
SetSubtitle(GetTimeBasedWidget()->GetConnectedNode()->GetLabel());
|
||||
if (get_time_based_widget()->get_connected_node()) {
|
||||
set_subtitle(get_time_based_widget()->get_connected_node()->get_label());
|
||||
} else {
|
||||
SetSubtitle(tr("(none)"));
|
||||
set_subtitle(tr("(none)"));
|
||||
}
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ConnectedNodeChanged(ViewerOutput *old, ViewerOutput *now)
|
||||
void TimeBasedPanel::connected_node_changed(ViewerOutput *old, ViewerOutput *now)
|
||||
{
|
||||
if (old) {
|
||||
disconnect(old, &ViewerOutput::LabelChanged, this,
|
||||
&TimeBasedPanel::SetSubtitle);
|
||||
disconnect(old, &ViewerOutput::label_changed, this,
|
||||
&TimeBasedPanel::set_subtitle);
|
||||
}
|
||||
|
||||
if (now) {
|
||||
connect(now, &ViewerOutput::LabelChanged, this,
|
||||
&TimeBasedPanel::SetSubtitle);
|
||||
connect(now, &ViewerOutput::label_changed, this,
|
||||
&TimeBasedPanel::set_subtitle);
|
||||
|
||||
if (show_and_raise_on_connect_) {
|
||||
this->show();
|
||||
@@ -160,72 +160,72 @@ void TimeBasedPanel::ConnectedNodeChanged(ViewerOutput *old, ViewerOutput *now)
|
||||
}
|
||||
|
||||
// Update strings
|
||||
Retranslate();
|
||||
retranslate();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::SetIn()
|
||||
void TimeBasedPanel::set_in()
|
||||
{
|
||||
GetTimeBasedWidget()->SetInAtPlayhead();
|
||||
get_time_based_widget()->set_in_at_playhead();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::SetOut()
|
||||
void TimeBasedPanel::set_out()
|
||||
{
|
||||
GetTimeBasedWidget()->SetOutAtPlayhead();
|
||||
get_time_based_widget()->set_out_at_playhead();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ResetIn()
|
||||
void TimeBasedPanel::reset_in()
|
||||
{
|
||||
GetTimeBasedWidget()->ResetIn();
|
||||
get_time_based_widget()->reset_in();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ResetOut()
|
||||
void TimeBasedPanel::reset_out()
|
||||
{
|
||||
GetTimeBasedWidget()->ResetOut();
|
||||
get_time_based_widget()->reset_out();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ClearInOut()
|
||||
void TimeBasedPanel::clear_in_out()
|
||||
{
|
||||
GetTimeBasedWidget()->ClearInOutPoints();
|
||||
get_time_based_widget()->clear_in_out_points();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::SetMarker()
|
||||
void TimeBasedPanel::set_marker()
|
||||
{
|
||||
GetTimeBasedWidget()->SetMarker();
|
||||
get_time_based_widget()->set_marker();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::ToggleShowAll()
|
||||
void TimeBasedPanel::toggle_show_all()
|
||||
{
|
||||
GetTimeBasedWidget()->ToggleShowAll();
|
||||
get_time_based_widget()->toggle_show_all();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::GoToIn()
|
||||
void TimeBasedPanel::go_to_in()
|
||||
{
|
||||
GetTimeBasedWidget()->GoToIn();
|
||||
get_time_based_widget()->go_to_in();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::GoToOut()
|
||||
void TimeBasedPanel::go_to_out()
|
||||
{
|
||||
GetTimeBasedWidget()->GoToOut();
|
||||
get_time_based_widget()->go_to_out();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::DeleteSelected()
|
||||
void TimeBasedPanel::delete_selected()
|
||||
{
|
||||
GetTimeBasedWidget()->DeleteSelected();
|
||||
get_time_based_widget()->delete_selected();
|
||||
}
|
||||
|
||||
void TimeBasedPanel::CutSelected()
|
||||
void TimeBasedPanel::cut_selected()
|
||||
{
|
||||
GetTimeBasedWidget()->CopySelected(true);
|
||||
get_time_based_widget()->copy_selected(true);
|
||||
}
|
||||
|
||||
void TimeBasedPanel::CopySelected()
|
||||
void TimeBasedPanel::copy_selected()
|
||||
{
|
||||
GetTimeBasedWidget()->CopySelected(false);
|
||||
get_time_based_widget()->copy_selected(false);
|
||||
}
|
||||
|
||||
void TimeBasedPanel::Paste()
|
||||
void TimeBasedPanel::paste()
|
||||
{
|
||||
GetTimeBasedWidget()->Paste();
|
||||
get_time_based_widget()->paste();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TIMEBASEDPANEL_H
|
||||
#define TIMEBASEDPANEL_H
|
||||
#ifndef OAK_TIMEBASEDPANEL_H
|
||||
#define OAK_TIMEBASEDPANEL_H
|
||||
|
||||
#include "panel/panel.h"
|
||||
#include "widget/timebased/timebasedwidget.h"
|
||||
@@ -35,19 +35,19 @@ public:
|
||||
|
||||
virtual ~TimeBasedPanel() override;
|
||||
|
||||
void ConnectViewerNode(ViewerOutput *node);
|
||||
void connect_viewer_node(ViewerOutput *node);
|
||||
|
||||
void DisconnectViewerNode()
|
||||
void disconnect_viewer_node()
|
||||
{
|
||||
ConnectViewerNode(nullptr);
|
||||
connect_viewer_node(nullptr);
|
||||
}
|
||||
|
||||
// Get the timebase of this panels widget
|
||||
const rational &timebase();
|
||||
const Rational &timebase();
|
||||
|
||||
ViewerOutput *GetConnectedViewer() const
|
||||
ViewerOutput *get_connected_viewer() const
|
||||
{
|
||||
return widget_->GetConnectedNode();
|
||||
return widget_->get_connected_node();
|
||||
}
|
||||
|
||||
TimeRuler *ruler() const
|
||||
@@ -55,83 +55,83 @@ public:
|
||||
return widget_->ruler();
|
||||
}
|
||||
|
||||
virtual void ZoomIn() override;
|
||||
virtual void zoom_in() override;
|
||||
|
||||
virtual void ZoomOut() override;
|
||||
virtual void zoom_out() override;
|
||||
|
||||
virtual void GoToStart() override;
|
||||
virtual void go_to_start() override;
|
||||
|
||||
virtual void PrevFrame() override;
|
||||
virtual void prev_frame() override;
|
||||
|
||||
virtual void NextFrame() override;
|
||||
virtual void next_frame() override;
|
||||
|
||||
virtual void GoToEnd() override;
|
||||
virtual void go_to_end() override;
|
||||
|
||||
virtual void GoToPrevCut() override;
|
||||
virtual void go_to_prev_cut() override;
|
||||
|
||||
virtual void GoToNextCut() override;
|
||||
virtual void go_to_next_cut() override;
|
||||
|
||||
virtual void PlayPause() override;
|
||||
virtual void play_pause() override;
|
||||
|
||||
virtual void PlayInToOut() override;
|
||||
virtual void play_in_to_out() override;
|
||||
|
||||
virtual void ShuttleLeft() override;
|
||||
virtual void shuttle_left() override;
|
||||
|
||||
virtual void ShuttleStop() override;
|
||||
virtual void shuttle_stop() override;
|
||||
|
||||
virtual void ShuttleRight() override;
|
||||
virtual void shuttle_right() override;
|
||||
|
||||
virtual void SetIn() override;
|
||||
virtual void set_in() override;
|
||||
|
||||
virtual void SetOut() override;
|
||||
virtual void set_out() override;
|
||||
|
||||
virtual void ResetIn() override;
|
||||
virtual void reset_in() override;
|
||||
|
||||
virtual void ResetOut() override;
|
||||
virtual void reset_out() override;
|
||||
|
||||
virtual void ClearInOut() override;
|
||||
virtual void clear_in_out() override;
|
||||
|
||||
virtual void SetMarker() override;
|
||||
virtual void set_marker() override;
|
||||
|
||||
virtual void ToggleShowAll() override;
|
||||
virtual void toggle_show_all() override;
|
||||
|
||||
virtual void GoToIn() override;
|
||||
virtual void go_to_in() override;
|
||||
|
||||
virtual void GoToOut() override;
|
||||
virtual void go_to_out() override;
|
||||
|
||||
virtual void DeleteSelected() override;
|
||||
virtual void delete_selected() override;
|
||||
|
||||
virtual void CutSelected() override;
|
||||
virtual void cut_selected() override;
|
||||
|
||||
virtual void CopySelected() override;
|
||||
virtual void copy_selected() override;
|
||||
|
||||
virtual void Paste() override;
|
||||
virtual void paste() override;
|
||||
|
||||
TimeBasedWidget *GetTimeBasedWidget() const
|
||||
TimeBasedWidget *get_time_based_widget() const
|
||||
{
|
||||
return widget_;
|
||||
}
|
||||
|
||||
public slots:
|
||||
void SetTimebase(const rational &timebase);
|
||||
void set_timebase(const Rational &timebase);
|
||||
|
||||
signals:
|
||||
void PlayPauseRequested();
|
||||
void play_pause_requested();
|
||||
|
||||
void PlayInToOutRequested();
|
||||
void play_in_to_out_requested();
|
||||
|
||||
void ShuttleLeftRequested();
|
||||
void shuttle_left_requested();
|
||||
|
||||
void ShuttleStopRequested();
|
||||
void shuttle_stop_requested();
|
||||
|
||||
void ShuttleRightRequested();
|
||||
void shuttle_right_requested();
|
||||
|
||||
protected:
|
||||
void SetTimeBasedWidget(TimeBasedWidget *widget);
|
||||
void set_time_based_widget(TimeBasedWidget *widget);
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
void SetShowAndRaiseOnConnect()
|
||||
void set_show_and_raise_on_connect()
|
||||
{
|
||||
show_and_raise_on_connect_ = true;
|
||||
}
|
||||
@@ -142,9 +142,9 @@ private:
|
||||
bool show_and_raise_on_connect_;
|
||||
|
||||
private slots:
|
||||
void ConnectedNodeChanged(ViewerOutput *old, ViewerOutput *now);
|
||||
void connected_node_changed(ViewerOutput *old, ViewerOutput *now);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // TIMEBASEDPANEL_H
|
||||
#endif // OAK_TIMEBASEDPANEL_H
|
||||
|
||||
Reference in New Issue
Block a user