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:
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef IMPORTTIMELINETOOL_H
|
||||
#define IMPORTTIMELINETOOL_H
|
||||
#ifndef OAK_IMPORTTIMELINETOOL_H
|
||||
#define OAK_IMPORTTIMELINETOOL_H
|
||||
|
||||
#include "tool.h"
|
||||
|
||||
@@ -31,48 +31,48 @@ class ImportTool : public TimelineTool {
|
||||
public:
|
||||
ImportTool(TimelineWidget *parent);
|
||||
|
||||
virtual void DragEnter(TimelineViewMouseEvent *event) override;
|
||||
virtual void DragMove(TimelineViewMouseEvent *event) override;
|
||||
virtual void DragLeave(QDragLeaveEvent *event) override;
|
||||
virtual void DragDrop(TimelineViewMouseEvent *event) override;
|
||||
virtual void drag_enter(TimelineViewMouseEvent *event) override;
|
||||
virtual void drag_move(TimelineViewMouseEvent *event) override;
|
||||
virtual void drag_leave(QDragLeaveEvent *event) override;
|
||||
virtual void drag_drop(TimelineViewMouseEvent *event) override;
|
||||
|
||||
using DraggedFootageData =
|
||||
QVector<QPair<ViewerOutput *, QVector<Track::Reference>>>;
|
||||
|
||||
void PlaceAt(const QVector<ViewerOutput *> &footage, const rational &start,
|
||||
void place_at(const QVector<ViewerOutput *> &footage, const Rational &start,
|
||||
bool insert, MultiUndoCommand *command, int track_offset = 0,
|
||||
bool jump_to_end = false);
|
||||
void PlaceAt(const DraggedFootageData &footage, const rational &start,
|
||||
void place_at(const DraggedFootageData &footage, const Rational &start,
|
||||
bool insert, MultiUndoCommand *command, int track_offset = 0,
|
||||
bool jump_to_end = false);
|
||||
|
||||
enum DropWithoutSequenceBehavior {
|
||||
kDWSAsk,
|
||||
kDWSAuto,
|
||||
kDWSManual,
|
||||
kDWSDisable
|
||||
k_dws_ask,
|
||||
k_dws_auto,
|
||||
k_dws_manual,
|
||||
k_dws_disable
|
||||
};
|
||||
|
||||
private:
|
||||
void FootageToGhosts(rational ghost_start,
|
||||
void footage_to_ghosts(Rational ghost_start,
|
||||
const DraggedFootageData &footage,
|
||||
const rational &dest_tb, const int &track_start);
|
||||
const Rational &dest_tb, const int &track_start);
|
||||
|
||||
void PrepGhosts(const rational &frame, const int &track_index);
|
||||
void prep_ghosts(const Rational &frame, const int &track_index);
|
||||
|
||||
void DropGhosts(bool insert, MultiUndoCommand *parent_command);
|
||||
void drop_ghosts(bool insert, MultiUndoCommand *parent_command);
|
||||
|
||||
TimelineViewGhostItem *CreateGhost(const TimeRange &range,
|
||||
const rational &media_in,
|
||||
TimelineViewGhostItem *create_ghost(const TimeRange &range,
|
||||
const Rational &media_in,
|
||||
const Track::Reference &track);
|
||||
|
||||
DraggedFootageData dragged_footage_;
|
||||
|
||||
int import_pre_buffer_;
|
||||
|
||||
rational ghost_offset_;
|
||||
Rational ghost_offset_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // IMPORTTIMELINETOOL_H
|
||||
#endif // OAK_IMPORTTIMELINETOOL_H
|
||||
|
||||
Reference in New Issue
Block a user