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:
@@ -29,17 +29,17 @@ ViewerPanel::ViewerPanel(const QString &object_name)
|
||||
{
|
||||
// Set ViewerWidget as the central widget
|
||||
ViewerWidget *vw = new ViewerWidget(this);
|
||||
SetViewerWidget(vw);
|
||||
set_viewer_widget(vw);
|
||||
|
||||
// Set strings
|
||||
Retranslate();
|
||||
retranslate();
|
||||
}
|
||||
|
||||
void ViewerPanel::Retranslate()
|
||||
void ViewerPanel::retranslate()
|
||||
{
|
||||
ViewerPanelBase::Retranslate();
|
||||
ViewerPanelBase::retranslate();
|
||||
|
||||
SetTitle(tr("Viewer"));
|
||||
set_title(tr("Viewer"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef VIEWER_PANEL_H
|
||||
#define VIEWER_PANEL_H
|
||||
#ifndef OAK_VIEWER_PANEL_H
|
||||
#define OAK_VIEWER_PANEL_H
|
||||
|
||||
#include <QOpenGLFunctions>
|
||||
|
||||
@@ -38,9 +38,9 @@ public:
|
||||
ViewerPanel(const QString &object_name);
|
||||
|
||||
protected:
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // VIEWER_PANEL_H
|
||||
#endif // OAK_VIEWER_PANEL_H
|
||||
|
||||
@@ -31,101 +31,101 @@ namespace olive
|
||||
ViewerPanelBase::ViewerPanelBase(const QString &object_name)
|
||||
: super(object_name)
|
||||
{
|
||||
connect(PanelManager::instance(), &PanelManager::FocusedPanelChanged, this,
|
||||
&ViewerPanelBase::FocusedPanelChanged);
|
||||
connect(PanelManager::instance(), &PanelManager::focused_panel_changed, this,
|
||||
&ViewerPanelBase::focused_panel_changed);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::PlayPause()
|
||||
void ViewerPanelBase::play_pause()
|
||||
{
|
||||
GetViewerWidget()->TogglePlayPause();
|
||||
get_viewer_widget()->toggle_play_pause();
|
||||
}
|
||||
|
||||
void ViewerPanelBase::PlayInToOut()
|
||||
void ViewerPanelBase::play_in_to_out()
|
||||
{
|
||||
GetViewerWidget()->Play(true);
|
||||
get_viewer_widget()->play(true);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::ShuttleLeft()
|
||||
void ViewerPanelBase::shuttle_left()
|
||||
{
|
||||
GetViewerWidget()->ShuttleLeft();
|
||||
get_viewer_widget()->shuttle_left();
|
||||
}
|
||||
|
||||
void ViewerPanelBase::ShuttleStop()
|
||||
void ViewerPanelBase::shuttle_stop()
|
||||
{
|
||||
GetViewerWidget()->ShuttleStop();
|
||||
get_viewer_widget()->shuttle_stop();
|
||||
}
|
||||
|
||||
void ViewerPanelBase::ShuttleRight()
|
||||
void ViewerPanelBase::shuttle_right()
|
||||
{
|
||||
GetViewerWidget()->ShuttleRight();
|
||||
get_viewer_widget()->shuttle_right();
|
||||
}
|
||||
|
||||
void ViewerPanelBase::ConnectTimeBasedPanel(TimeBasedPanel *panel)
|
||||
void ViewerPanelBase::connect_time_based_panel(TimeBasedPanel *panel)
|
||||
{
|
||||
connect(panel, &TimeBasedPanel::PlayPauseRequested, this,
|
||||
&ViewerPanelBase::PlayPause);
|
||||
connect(panel, &TimeBasedPanel::PlayInToOutRequested, this,
|
||||
&ViewerPanelBase::PlayInToOut);
|
||||
connect(panel, &TimeBasedPanel::ShuttleLeftRequested, this,
|
||||
&ViewerPanelBase::ShuttleLeft);
|
||||
connect(panel, &TimeBasedPanel::ShuttleStopRequested, this,
|
||||
&ViewerPanelBase::ShuttleStop);
|
||||
connect(panel, &TimeBasedPanel::ShuttleRightRequested, this,
|
||||
&ViewerPanelBase::ShuttleRight);
|
||||
connect(panel, &TimeBasedPanel::play_pause_requested, this,
|
||||
&ViewerPanelBase::play_pause);
|
||||
connect(panel, &TimeBasedPanel::play_in_to_out_requested, this,
|
||||
&ViewerPanelBase::play_in_to_out);
|
||||
connect(panel, &TimeBasedPanel::shuttle_left_requested, this,
|
||||
&ViewerPanelBase::shuttle_left);
|
||||
connect(panel, &TimeBasedPanel::shuttle_stop_requested, this,
|
||||
&ViewerPanelBase::shuttle_stop);
|
||||
connect(panel, &TimeBasedPanel::shuttle_right_requested, this,
|
||||
&ViewerPanelBase::shuttle_right);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::DisconnectTimeBasedPanel(TimeBasedPanel *panel)
|
||||
void ViewerPanelBase::disconnect_time_based_panel(TimeBasedPanel *panel)
|
||||
{
|
||||
disconnect(panel, &TimeBasedPanel::PlayPauseRequested, this,
|
||||
&ViewerPanelBase::PlayPause);
|
||||
disconnect(panel, &TimeBasedPanel::PlayInToOutRequested, this,
|
||||
&ViewerPanelBase::PlayInToOut);
|
||||
disconnect(panel, &TimeBasedPanel::ShuttleLeftRequested, this,
|
||||
&ViewerPanelBase::ShuttleLeft);
|
||||
disconnect(panel, &TimeBasedPanel::ShuttleStopRequested, this,
|
||||
&ViewerPanelBase::ShuttleStop);
|
||||
disconnect(panel, &TimeBasedPanel::ShuttleRightRequested, this,
|
||||
&ViewerPanelBase::ShuttleRight);
|
||||
disconnect(panel, &TimeBasedPanel::play_pause_requested, this,
|
||||
&ViewerPanelBase::play_pause);
|
||||
disconnect(panel, &TimeBasedPanel::play_in_to_out_requested, this,
|
||||
&ViewerPanelBase::play_in_to_out);
|
||||
disconnect(panel, &TimeBasedPanel::shuttle_left_requested, this,
|
||||
&ViewerPanelBase::shuttle_left);
|
||||
disconnect(panel, &TimeBasedPanel::shuttle_stop_requested, this,
|
||||
&ViewerPanelBase::shuttle_stop);
|
||||
disconnect(panel, &TimeBasedPanel::shuttle_right_requested, this,
|
||||
&ViewerPanelBase::shuttle_right);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::SetFullScreen(QScreen *screen)
|
||||
void ViewerPanelBase::set_full_screen(QScreen *screen)
|
||||
{
|
||||
GetViewerWidget()->SetFullScreen(screen);
|
||||
get_viewer_widget()->set_full_screen(screen);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::SetGizmos(Node *node)
|
||||
void ViewerPanelBase::set_gizmos(Node *node)
|
||||
{
|
||||
GetViewerWidget()->SetGizmos(node);
|
||||
get_viewer_widget()->set_gizmos(node);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::CacheEntireSequence()
|
||||
void ViewerPanelBase::cache_entire_sequence()
|
||||
{
|
||||
GetViewerWidget()->CacheEntireSequence();
|
||||
get_viewer_widget()->cache_entire_sequence();
|
||||
}
|
||||
|
||||
void ViewerPanelBase::CacheSequenceInOut()
|
||||
void ViewerPanelBase::cache_sequence_in_out()
|
||||
{
|
||||
GetViewerWidget()->CacheSequenceInOut();
|
||||
get_viewer_widget()->cache_sequence_in_out();
|
||||
}
|
||||
|
||||
void ViewerPanelBase::SetViewerWidget(ViewerWidget *vw)
|
||||
void ViewerPanelBase::set_viewer_widget(ViewerWidget *vw)
|
||||
{
|
||||
connect(vw, &ViewerWidget::TextureChanged, this,
|
||||
&ViewerPanelBase::TextureChanged);
|
||||
connect(vw, &ViewerWidget::ColorProcessorChanged, this,
|
||||
&ViewerPanelBase::ColorProcessorChanged);
|
||||
connect(vw, &ViewerWidget::ColorManagerChanged, this,
|
||||
&ViewerPanelBase::ColorManagerChanged);
|
||||
connect(vw, &ViewerWidget::texture_changed, this,
|
||||
&ViewerPanelBase::texture_changed);
|
||||
connect(vw, &ViewerWidget::color_processor_changed, this,
|
||||
&ViewerPanelBase::color_processor_changed);
|
||||
connect(vw, &ViewerWidget::color_manager_changed, this,
|
||||
&ViewerPanelBase::color_manager_changed);
|
||||
|
||||
SetTimeBasedWidget(vw);
|
||||
set_time_based_widget(vw);
|
||||
}
|
||||
|
||||
void ViewerPanelBase::FocusedPanelChanged(PanelWidget *panel)
|
||||
void ViewerPanelBase::focused_panel_changed(PanelWidget *panel)
|
||||
{
|
||||
if (dynamic_cast<ViewerPanelBase *>(panel)) {
|
||||
auto vw = GetViewerWidget();
|
||||
if (vw->IsPlaying() && panel != this) {
|
||||
vw->Pause();
|
||||
auto vw = get_viewer_widget();
|
||||
if (vw->is_playing() && panel != this) {
|
||||
vw->pause();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef VIEWERPANELBASE_H
|
||||
#define VIEWERPANELBASE_H
|
||||
#ifndef OAK_VIEWERPANELBASE_H
|
||||
#define OAK_VIEWERPANELBASE_H
|
||||
|
||||
#include "panel/pixelsampler/pixelsamplerpanel.h"
|
||||
#include "panel/timebased/timebased.h"
|
||||
@@ -34,95 +34,95 @@ class ViewerPanelBase : public TimeBasedPanel {
|
||||
public:
|
||||
ViewerPanelBase(const QString &object_name);
|
||||
|
||||
ViewerWidget *GetViewerWidget() const
|
||||
ViewerWidget *get_viewer_widget() const
|
||||
{
|
||||
return static_cast<ViewerWidget *>(GetTimeBasedWidget());
|
||||
return static_cast<ViewerWidget *>(get_time_based_widget());
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
void ConnectTimeBasedPanel(TimeBasedPanel *panel);
|
||||
void connect_time_based_panel(TimeBasedPanel *panel);
|
||||
|
||||
void DisconnectTimeBasedPanel(TimeBasedPanel *panel);
|
||||
void disconnect_time_based_panel(TimeBasedPanel *panel);
|
||||
|
||||
/**
|
||||
* @brief Wrapper for ViewerWidget::SetFullScreen()
|
||||
*/
|
||||
void SetFullScreen(QScreen *screen = nullptr);
|
||||
void set_full_screen(QScreen *screen = nullptr);
|
||||
|
||||
ColorManager *GetColorManager()
|
||||
ColorManager *get_color_manager()
|
||||
{
|
||||
return GetViewerWidget()->color_manager();
|
||||
return get_viewer_widget()->color_manager();
|
||||
}
|
||||
|
||||
void UpdateTextureFromNode()
|
||||
void update_texture_from_node()
|
||||
{
|
||||
GetViewerWidget()->UpdateTextureFromNode();
|
||||
get_viewer_widget()->update_texture_from_node();
|
||||
}
|
||||
|
||||
void AddPlaybackDevice(ViewerDisplayWidget *vw)
|
||||
void add_playback_device(ViewerDisplayWidget *vw)
|
||||
{
|
||||
GetViewerWidget()->AddPlaybackDevice(vw);
|
||||
get_viewer_widget()->add_playback_device(vw);
|
||||
}
|
||||
|
||||
void SetTimelineSelectedBlocks(const QVector<Block *> &b)
|
||||
void set_timeline_selected_blocks(const QVector<Block *> &b)
|
||||
{
|
||||
GetViewerWidget()->SetTimelineSelectedBlocks(b);
|
||||
get_viewer_widget()->set_timeline_selected_blocks(b);
|
||||
}
|
||||
|
||||
void SetNodeViewSelections(const QVector<Node *> &n)
|
||||
void set_node_view_selections(const QVector<Node *> &n)
|
||||
{
|
||||
GetViewerWidget()->SetNodeViewSelections(n);
|
||||
get_viewer_widget()->set_node_view_selections(n);
|
||||
}
|
||||
|
||||
void ConnectMulticamWidget(MulticamWidget *p)
|
||||
void connect_multicam_widget(MulticamWidget *p)
|
||||
{
|
||||
GetViewerWidget()->ConnectMulticamWidget(p);
|
||||
get_viewer_widget()->connect_multicam_widget(p);
|
||||
}
|
||||
|
||||
public slots:
|
||||
void SetGizmos(Node *node);
|
||||
void set_gizmos(Node *node);
|
||||
|
||||
void CacheEntireSequence();
|
||||
void cache_entire_sequence();
|
||||
|
||||
void CacheSequenceInOut();
|
||||
void cache_sequence_in_out();
|
||||
|
||||
void RequestStartEditingText()
|
||||
void request_start_editing_text()
|
||||
{
|
||||
GetViewerWidget()->RequestStartEditingText();
|
||||
get_viewer_widget()->request_start_editing_text();
|
||||
}
|
||||
|
||||
signals:
|
||||
/**
|
||||
* @brief Signal emitted when a new frame is loaded
|
||||
*/
|
||||
void TextureChanged(TexturePtr t);
|
||||
void texture_changed(TexturePtr t);
|
||||
|
||||
/**
|
||||
* @brief Wrapper for ViewerGLWidget::ColorProcessorChanged()
|
||||
*/
|
||||
void ColorProcessorChanged(ColorProcessorPtr processor);
|
||||
void color_processor_changed(ColorProcessorPtr processor);
|
||||
|
||||
/**
|
||||
* @brief Wrapper for ViewerGLWidget::ColorManagerChanged()
|
||||
*/
|
||||
void ColorManagerChanged(ColorManager *color_manager);
|
||||
void color_manager_changed(ColorManager *color_manager);
|
||||
|
||||
protected:
|
||||
void SetViewerWidget(ViewerWidget *vw);
|
||||
void set_viewer_widget(ViewerWidget *vw);
|
||||
|
||||
private slots:
|
||||
void FocusedPanelChanged(PanelWidget *panel);
|
||||
void focused_panel_changed(PanelWidget *panel);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // VIEWERPANELBASE_H
|
||||
#endif // OAK_VIEWERPANELBASE_H
|
||||
|
||||
Reference in New Issue
Block a user