oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions 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/resizablescrollbar/resizablescrollbar.cpp
+24 -24
View File
@@ -31,49 +31,49 @@
namespace olive
{
const int ResizableScrollBar::kHandleWidth = 10;
const int ResizableScrollBar::k_handle_width = 10;
ResizableScrollBar::ResizableScrollBar(QWidget *parent)
: QScrollBar(parent)
{
Init();
init();
}
ResizableScrollBar::ResizableScrollBar(Qt::Orientation orientation,
QWidget *parent)
: QScrollBar(orientation, parent)
{
Init();
init();
}
void ResizableScrollBar::mousePressEvent(QMouseEvent *event)
{
if (mouse_handle_state_ == kNotInHandle) {
if (mouse_handle_state_ == k_not_in_handle) {
QScrollBar::mousePressEvent(event);
} else {
dragging_ = true;
drag_start_point_ = GetActiveMousePos(event);
drag_start_point_ = get_active_mouse_pos(event);
emit ResizeBegan(GetActiveBarSize(),
(mouse_handle_state_ == kInTopHandle));
emit resize_began(get_active_bar_size(),
(mouse_handle_state_ == k_in_top_handle));
}
}
void ResizableScrollBar::mouseMoveEvent(QMouseEvent *event)
{
QRect sr = GetScrollBarRect();
QRect sr = get_scroll_bar_rect();
if (dragging_) {
// Determine how much the cursor has moved
int mouse_movement = GetActiveMousePos(event) - drag_start_point_;
int mouse_movement = get_active_mouse_pos(event) - drag_start_point_;
emit ResizeMoved(mouse_movement);
emit resize_moved(mouse_movement);
} else {
int mouse_pos, top, bottom;
Qt::CursorShape target_cursor;
mouse_pos = GetActiveMousePos(event);
mouse_pos = get_active_mouse_pos(event);
if (orientation() == Qt::Horizontal) {
top = sr.left();
@@ -85,15 +85,15 @@ void ResizableScrollBar::mouseMoveEvent(QMouseEvent *event)
target_cursor = Qt::SizeVerCursor;
}
if (InRange(mouse_pos, top, kHandleWidth)) {
mouse_handle_state_ = kInTopHandle;
} else if (InRange(mouse_pos, bottom, kHandleWidth)) {
mouse_handle_state_ = kInBottomHandle;
if (in_range(mouse_pos, top, k_handle_width)) {
mouse_handle_state_ = k_in_top_handle;
} else if (in_range(mouse_pos, bottom, k_handle_width)) {
mouse_handle_state_ = k_in_bottom_handle;
} else {
mouse_handle_state_ = kNotInHandle;
mouse_handle_state_ = k_not_in_handle;
}
if (mouse_handle_state_ == kNotInHandle) {
if (mouse_handle_state_ == k_not_in_handle) {
unsetCursor();
} else {
setCursor(target_cursor);
@@ -108,13 +108,13 @@ void ResizableScrollBar::mouseReleaseEvent(QMouseEvent *event)
if (dragging_) {
dragging_ = false;
emit ResizeEnded();
emit resize_ended();
} else {
QScrollBar::mouseReleaseEvent(event);
}
}
QRect ResizableScrollBar::GetScrollBarRect()
QRect ResizableScrollBar::get_scroll_bar_rect()
{
// Initialize "style option". I don't know what this does, I just ripped it straight from
// Qt source code
@@ -126,17 +126,17 @@ QRect ResizableScrollBar::GetScrollBarRect()
QStyle::SC_ScrollBarSlider, this);
}
void ResizableScrollBar::Init()
void ResizableScrollBar::init()
{
setSingleStep(20);
setMaximum(0);
setMouseTracking(true);
mouse_handle_state_ = kNotInHandle;
mouse_handle_state_ = k_not_in_handle;
dragging_ = false;
}
int ResizableScrollBar::GetActiveMousePos(QMouseEvent *event)
int ResizableScrollBar::get_active_mouse_pos(QMouseEvent *event)
{
if (orientation() == Qt::Horizontal) {
return event->pos().x();
@@ -145,9 +145,9 @@ int ResizableScrollBar::GetActiveMousePos(QMouseEvent *event)
}
}
int ResizableScrollBar::GetActiveBarSize()
int ResizableScrollBar::get_active_bar_size()
{
QRect sr = GetScrollBarRect();
QRect sr = get_scroll_bar_rect();
if (orientation() == Qt::Horizontal) {
return sr.width();
app/widget/resizablescrollbar/resizablescrollbar.h
+12 -12
View File
@@ -19,8 +19,8 @@
***/
#ifndef RESIZABLESCROLLBAR_H
#define RESIZABLESCROLLBAR_H
#ifndef OAK_RESIZABLESCROLLBAR_H
#define OAK_RESIZABLESCROLLBAR_H
#include <QScrollBar>
@@ -36,11 +36,11 @@ public:
ResizableScrollBar(Qt::Orientation orientation, QWidget *parent = nullptr);
signals:
void ResizeBegan(int old_bar_width, bool top_handle);
void resize_began(int old_bar_width, bool top_handle);
void ResizeMoved(int movement);
void resize_moved(int movement);
void ResizeEnded();
void resize_ended();
protected:
virtual void mousePressEvent(QMouseEvent *event) override;
@@ -50,17 +50,17 @@ protected:
virtual void mouseReleaseEvent(QMouseEvent *event) override;
private:
QRect GetScrollBarRect();
QRect get_scroll_bar_rect();
static const int kHandleWidth;
static const int k_handle_width;
enum MouseHandleState { kNotInHandle, kInTopHandle, kInBottomHandle };
enum MouseHandleState { k_not_in_handle, k_in_top_handle, k_in_bottom_handle };
void Init();
void init();
int GetActiveMousePos(QMouseEvent *event);
int get_active_mouse_pos(QMouseEvent *event);
int GetActiveBarSize();
int get_active_bar_size();
MouseHandleState mouse_handle_state_;
@@ -71,4 +71,4 @@ private:
}
#endif // RESIZABLESCROLLBAR_H
#endif // OAK_RESIZABLESCROLLBAR_H
app/widget/resizablescrollbar/resizabletimelinescrollbar.cpp
+17 -17
View File
@@ -48,16 +48,16 @@ ResizableTimelineScrollBar::ResizableTimelineScrollBar(
{
}
void ResizableTimelineScrollBar::ConnectMarkers(TimelineMarkerList *markers)
void ResizableTimelineScrollBar::connect_markers(TimelineMarkerList *markers)
{
if (markers_) {
disconnect(markers_, &TimelineMarkerList::MarkerAdded, this,
disconnect(markers_, &TimelineMarkerList::marker_added, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
disconnect(markers_, &TimelineMarkerList::MarkerRemoved, this,
disconnect(markers_, &TimelineMarkerList::marker_removed, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
disconnect(markers_, &TimelineMarkerList::MarkerModified, this,
disconnect(markers_, &TimelineMarkerList::marker_modified, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
}
@@ -65,13 +65,13 @@ void ResizableTimelineScrollBar::ConnectMarkers(TimelineMarkerList *markers)
markers_ = markers;
if (markers_) {
connect(markers_, &TimelineMarkerList::MarkerAdded, this,
connect(markers_, &TimelineMarkerList::marker_added, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
connect(markers_, &TimelineMarkerList::MarkerRemoved, this,
connect(markers_, &TimelineMarkerList::marker_removed, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
connect(markers_, &TimelineMarkerList::MarkerModified, this,
connect(markers_, &TimelineMarkerList::marker_modified, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
}
@@ -79,13 +79,13 @@ void ResizableTimelineScrollBar::ConnectMarkers(TimelineMarkerList *markers)
update();
}
void ResizableTimelineScrollBar::ConnectWorkArea(TimelineWorkArea *workarea)
void ResizableTimelineScrollBar::connect_work_area(TimelineWorkArea *workarea)
{
if (workarea_) {
disconnect(workarea_, &TimelineWorkArea::RangeChanged, this,
disconnect(workarea_, &TimelineWorkArea::range_changed, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
disconnect(workarea_, &TimelineWorkArea::EnabledChanged, this,
disconnect(workarea_, &TimelineWorkArea::enabled_changed, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
}
@@ -93,10 +93,10 @@ void ResizableTimelineScrollBar::ConnectWorkArea(TimelineWorkArea *workarea)
workarea_ = workarea;
if (workarea_) {
connect(workarea_, &TimelineWorkArea::RangeChanged, this,
connect(workarea_, &TimelineWorkArea::range_changed, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
connect(workarea_, &TimelineWorkArea::EnabledChanged, this,
connect(workarea_, &TimelineWorkArea::enabled_changed, this,
static_cast<void (ResizableTimelineScrollBar::*)()>(
&ResizableTimelineScrollBar::update));
}
@@ -133,14 +133,14 @@ void ResizableTimelineScrollBar::paintEvent(QPaintEvent *event)
workarea_color.setAlpha(128);
qint64 in =
qMax(qint64(0), qRound64(ratio * TimeToScene(workarea_->in())));
qMax(qint64(0), qRound64(ratio * time_to_scene(workarea_->in())));
qint64 out;
if (workarea_->out() == RATIONAL_MAX) {
out = gr.width();
} else {
out = qMin(qint64(gr.width()),
qRound64(ratio * TimeToScene(workarea_->out())));
qRound64(ratio * time_to_scene(workarea_->out())));
}
qint64 length = qMax(qint64(1), out - in);
@@ -154,10 +154,10 @@ void ResizableTimelineScrollBar::paintEvent(QPaintEvent *event)
TimelineMarker *marker = *it;
QColor marker_color =
QtUtils::toQColor(ColorCoding::GetColor(marker->color()));
int64_t in = qRound64(ratio * TimeToScene(marker->time().in()));
QtUtils::to_q_color(ColorCoding::get_color(marker->color()));
int64_t in = qRound64(ratio * time_to_scene(marker->time().in()));
int64_t out =
qRound64(ratio * TimeToScene(marker->time().out()));
qRound64(ratio * time_to_scene(marker->time().out()));
int64_t length = qMax(int64_t(1), out - in);
p.fillRect(gr.x() + in, 0, length, height(), marker_color);
app/widget/resizablescrollbar/resizabletimelinescrollbar.h
+5 -5
View File
@@ -19,8 +19,8 @@
***/
#ifndef RESIZABLETIMELINESCROLLBAR_H
#define RESIZABLETIMELINESCROLLBAR_H
#ifndef OAK_RESIZABLETIMELINESCROLLBAR_H
#define OAK_RESIZABLETIMELINESCROLLBAR_H
#include "resizablescrollbar.h"
#include "timeline/timelinemarker.h"
@@ -38,8 +38,8 @@ public:
ResizableTimelineScrollBar(Qt::Orientation orientation,
QWidget *parent = nullptr);
void ConnectMarkers(TimelineMarkerList *markers);
void ConnectWorkArea(TimelineWorkArea *workarea);
void connect_markers(TimelineMarkerList *markers);
void connect_work_area(TimelineWorkArea *workarea);
void SetScale(double d);
@@ -56,4 +56,4 @@ private:
}
#endif // RESIZABLETIMELINESCROLLBAR_H
#endif // OAK_RESIZABLETIMELINESCROLLBAR_H