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:
@@ -28,18 +28,18 @@ namespace olive
|
||||
|
||||
#define super Node
|
||||
|
||||
const QString TimeFormatNode::kTimeInput = QStringLiteral("time_in");
|
||||
const QString TimeFormatNode::kFormatInput = QStringLiteral("format_in");
|
||||
const QString TimeFormatNode::kLocalTimeInput = QStringLiteral("localtime_in");
|
||||
const QString TimeFormatNode::k_time_input = QStringLiteral("time_in");
|
||||
const QString TimeFormatNode::k_format_input = QStringLiteral("format_in");
|
||||
const QString TimeFormatNode::k_local_time_input = QStringLiteral("localtime_in");
|
||||
|
||||
TimeFormatNode::TimeFormatNode()
|
||||
{
|
||||
AddInput(kTimeInput, NodeValue::kFloat);
|
||||
AddInput(kFormatInput, NodeValue::kText, QStringLiteral("hh:mm:ss"));
|
||||
AddInput(kLocalTimeInput, NodeValue::kBoolean);
|
||||
add_input(k_time_input, NodeValue::k_float);
|
||||
add_input(k_format_input, NodeValue::k_text, QStringLiteral("hh:mm:ss"));
|
||||
add_input(k_local_time_input, NodeValue::k_boolean);
|
||||
}
|
||||
|
||||
QString TimeFormatNode::Name() const
|
||||
QString TimeFormatNode::name() const
|
||||
{
|
||||
return tr("Time Format");
|
||||
}
|
||||
@@ -49,36 +49,36 @@ QString TimeFormatNode::id() const
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.timeformat");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> TimeFormatNode::Category() const
|
||||
QVector<Node::CategoryID> TimeFormatNode::category() const
|
||||
{
|
||||
return { kCategoryGenerator };
|
||||
return { k_category_generator };
|
||||
}
|
||||
|
||||
QString TimeFormatNode::Description() const
|
||||
QString TimeFormatNode::description() const
|
||||
{
|
||||
return tr("Format time (in Unix epoch seconds) into a string.");
|
||||
}
|
||||
|
||||
void TimeFormatNode::Retranslate()
|
||||
void TimeFormatNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::retranslate();
|
||||
|
||||
SetInputName(kTimeInput, tr("Time"));
|
||||
SetInputName(kFormatInput, tr("Format"));
|
||||
SetInputName(kLocalTimeInput, tr("Interpret time as local time"));
|
||||
set_input_name(k_time_input, tr("Time"));
|
||||
set_input_name(k_format_input, tr("Format"));
|
||||
set_input_name(k_local_time_input, tr("Interpret time as local time"));
|
||||
}
|
||||
|
||||
void TimeFormatNode::Value(const NodeValueRow &value,
|
||||
void TimeFormatNode::value(const NodeValueRow &value,
|
||||
const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
qint64 ms_since_epoch = value[kTimeInput].toDouble() * 1000;
|
||||
bool time_is_local = value[kLocalTimeInput].toBool();
|
||||
qint64 ms_since_epoch = value[k_time_input].to_double() * 1000;
|
||||
bool time_is_local = value[k_local_time_input].to_bool();
|
||||
QDateTime dt = QDateTime::fromMSecsSinceEpoch(
|
||||
ms_since_epoch, time_is_local ? Qt::LocalTime : Qt::UTC);
|
||||
QString format = value[kFormatInput].toString();
|
||||
QString format = value[k_format_input].to_string();
|
||||
QString output = dt.toString(format);
|
||||
table->Push(NodeValue(NodeValue::kText, output, this));
|
||||
table->push(NodeValue(NodeValue::k_text, output, this));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TIMEFORMAT_H
|
||||
#define TIMEFORMAT_H
|
||||
#ifndef OAK_TIMEFORMAT_H
|
||||
#define OAK_TIMEFORMAT_H
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
@@ -34,21 +34,21 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(TimeFormatNode)
|
||||
|
||||
virtual QString Name() const override;
|
||||
virtual QString name() const override;
|
||||
virtual QString id() const override;
|
||||
virtual QVector<CategoryID> Category() const override;
|
||||
virtual QString Description() const override;
|
||||
virtual QVector<CategoryID> category() const override;
|
||||
virtual QString description() const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
static const QString kTimeInput;
|
||||
static const QString kFormatInput;
|
||||
static const QString kLocalTimeInput;
|
||||
static const QString k_time_input;
|
||||
static const QString k_format_input;
|
||||
static const QString k_local_time_input;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // TIMEFORMAT_H
|
||||
#endif // OAK_TIMEFORMAT_H
|
||||
|
||||
@@ -26,71 +26,71 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
const QString TimeOffsetNode::kTimeInput = QStringLiteral("time_in");
|
||||
const QString TimeOffsetNode::kInputInput = QStringLiteral("input_in");
|
||||
const QString TimeOffsetNode::k_time_input = QStringLiteral("time_in");
|
||||
const QString TimeOffsetNode::k_input_input = QStringLiteral("input_in");
|
||||
|
||||
#define super Node
|
||||
|
||||
TimeOffsetNode::TimeOffsetNode()
|
||||
{
|
||||
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)),
|
||||
InputFlags(kInputFlagNotConnectable));
|
||||
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
|
||||
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
|
||||
add_input(k_time_input, NodeValue::k_rational, QVariant::fromValue(Rational(0)),
|
||||
InputFlags(k_input_flag_not_connectable));
|
||||
set_input_property(k_time_input, QStringLiteral("view"), RationalSlider::k_time);
|
||||
set_input_property(k_time_input, QStringLiteral("viewlock"), true);
|
||||
|
||||
AddInput(kInputInput, NodeValue::kNone,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_input_input, NodeValue::k_none,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
}
|
||||
|
||||
void TimeOffsetNode::Retranslate()
|
||||
void TimeOffsetNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::retranslate();
|
||||
|
||||
SetInputName(kTimeInput, QStringLiteral("Time"));
|
||||
SetInputName(kInputInput, QStringLiteral("Input"));
|
||||
set_input_name(k_time_input, QStringLiteral("Time"));
|
||||
set_input_name(k_input_input, QStringLiteral("Input"));
|
||||
}
|
||||
|
||||
TimeRange TimeOffsetNode::InputTimeAdjustment(const QString &input, int element,
|
||||
TimeRange TimeOffsetNode::input_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time,
|
||||
bool clamp) const
|
||||
{
|
||||
if (input == kInputInput) {
|
||||
return TimeRange(GetRemappedTime(input_time.in()),
|
||||
GetRemappedTime(input_time.out()));
|
||||
if (input == k_input_input) {
|
||||
return TimeRange(get_remapped_time(input_time.in()),
|
||||
get_remapped_time(input_time.out()));
|
||||
} else {
|
||||
return super::InputTimeAdjustment(input, element, input_time, clamp);
|
||||
return super::input_time_adjustment(input, element, input_time, clamp);
|
||||
}
|
||||
}
|
||||
|
||||
TimeRange
|
||||
TimeOffsetNode::OutputTimeAdjustment(const QString &input, int element,
|
||||
TimeOffsetNode::output_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time) const
|
||||
{
|
||||
if (input == kInputInput) {
|
||||
if (input == k_input_input) {
|
||||
// The inverse of InputTimeAdjustment(): times at the input are mapped
|
||||
// back to the output by subtracting the offset again
|
||||
return TimeRange(GetRemappedOutputTime(input_time.in()),
|
||||
GetRemappedOutputTime(input_time.out()));
|
||||
return TimeRange(get_remapped_output_time(input_time.in()),
|
||||
get_remapped_output_time(input_time.out()));
|
||||
} else {
|
||||
return super::OutputTimeAdjustment(input, element, input_time);
|
||||
return super::output_time_adjustment(input, element, input_time);
|
||||
}
|
||||
}
|
||||
|
||||
void TimeOffsetNode::Value(const NodeValueRow &value,
|
||||
void TimeOffsetNode::value(const NodeValueRow &value,
|
||||
const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
table->Push(value[kInputInput]);
|
||||
table->push(value[k_input_input]);
|
||||
}
|
||||
|
||||
rational TimeOffsetNode::GetRemappedTime(const rational &input) const
|
||||
Rational TimeOffsetNode::get_remapped_time(const Rational &input) const
|
||||
{
|
||||
return input + GetValueAtTime(kTimeInput, input).value<rational>();
|
||||
return input + get_value_at_time(k_time_input, input).value<Rational>();
|
||||
}
|
||||
|
||||
rational TimeOffsetNode::GetRemappedOutputTime(const rational &input) const
|
||||
Rational TimeOffsetNode::get_remapped_output_time(const Rational &input) const
|
||||
{
|
||||
return input - GetValueAtTime(kTimeInput, input).value<rational>();
|
||||
return input - get_value_at_time(k_time_input, input).value<Rational>();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TIMEOFFSETNODE_H
|
||||
#define TIMEOFFSETNODE_H
|
||||
#ifndef OAK_TIMEOFFSETNODE_H
|
||||
#define OAK_TIMEOFFSETNODE_H
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(TimeOffsetNode)
|
||||
|
||||
virtual QString Name() const override
|
||||
virtual QString name() const override
|
||||
{
|
||||
return tr("Time Offset");
|
||||
}
|
||||
@@ -43,36 +43,36 @@ public:
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.timeoffset");
|
||||
}
|
||||
|
||||
virtual QVector<CategoryID> Category() const override
|
||||
virtual QVector<CategoryID> category() const override
|
||||
{
|
||||
return { kCategoryTime };
|
||||
return { k_category_time };
|
||||
}
|
||||
|
||||
virtual QString Description() const override
|
||||
virtual QString description() const override
|
||||
{
|
||||
return tr("Offset time passing through the graph.");
|
||||
}
|
||||
|
||||
virtual TimeRange InputTimeAdjustment(const QString &input, int element,
|
||||
virtual TimeRange input_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time,
|
||||
bool clamp) const override;
|
||||
virtual TimeRange
|
||||
OutputTimeAdjustment(const QString &input, int element,
|
||||
output_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time) const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
static const QString kTimeInput;
|
||||
static const QString kInputInput;
|
||||
static const QString k_time_input;
|
||||
static const QString k_input_input;
|
||||
|
||||
private:
|
||||
rational GetRemappedTime(const rational &input) const;
|
||||
rational GetRemappedOutputTime(const rational &input) const;
|
||||
Rational get_remapped_time(const Rational &input) const;
|
||||
Rational get_remapped_output_time(const Rational &input) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // TIMEOFFSETNODE_H
|
||||
#endif // OAK_TIMEOFFSETNODE_H
|
||||
|
||||
@@ -26,23 +26,23 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
const QString TimeRemapNode::kTimeInput = QStringLiteral("time_in");
|
||||
const QString TimeRemapNode::kInputInput = QStringLiteral("input_in");
|
||||
const QString TimeRemapNode::k_time_input = QStringLiteral("time_in");
|
||||
const QString TimeRemapNode::k_input_input = QStringLiteral("input_in");
|
||||
|
||||
#define super Node
|
||||
|
||||
TimeRemapNode::TimeRemapNode()
|
||||
{
|
||||
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)),
|
||||
InputFlags(kInputFlagNotConnectable));
|
||||
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
|
||||
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
|
||||
add_input(k_time_input, NodeValue::k_rational, QVariant::fromValue(Rational(0)),
|
||||
InputFlags(k_input_flag_not_connectable));
|
||||
set_input_property(k_time_input, QStringLiteral("view"), RationalSlider::k_time);
|
||||
set_input_property(k_time_input, QStringLiteral("viewlock"), true);
|
||||
|
||||
AddInput(kInputInput, NodeValue::kNone,
|
||||
InputFlags(kInputFlagNotKeyframable));
|
||||
add_input(k_input_input, NodeValue::k_none,
|
||||
InputFlags(k_input_flag_not_keyframable));
|
||||
}
|
||||
|
||||
QString TimeRemapNode::Name() const
|
||||
QString TimeRemapNode::name() const
|
||||
{
|
||||
return tr("Time Remap");
|
||||
}
|
||||
@@ -52,58 +52,58 @@ QString TimeRemapNode::id() const
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.timeremap");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> TimeRemapNode::Category() const
|
||||
QVector<Node::CategoryID> TimeRemapNode::category() const
|
||||
{
|
||||
return { kCategoryTime };
|
||||
return { k_category_time };
|
||||
}
|
||||
|
||||
QString TimeRemapNode::Description() const
|
||||
QString TimeRemapNode::description() const
|
||||
{
|
||||
return tr("Arbitrarily remap time through the nodes.");
|
||||
}
|
||||
|
||||
TimeRange TimeRemapNode::InputTimeAdjustment(const QString &input, int element,
|
||||
TimeRange TimeRemapNode::input_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time,
|
||||
bool clamp) const
|
||||
{
|
||||
if (input == kInputInput) {
|
||||
return TimeRange(GetRemappedTime(input_time.in()),
|
||||
GetRemappedTime(input_time.out()));
|
||||
if (input == k_input_input) {
|
||||
return TimeRange(get_remapped_time(input_time.in()),
|
||||
get_remapped_time(input_time.out()));
|
||||
} else {
|
||||
return super::InputTimeAdjustment(input, element, input_time, clamp);
|
||||
return super::input_time_adjustment(input, element, input_time, clamp);
|
||||
}
|
||||
}
|
||||
|
||||
TimeRange TimeRemapNode::OutputTimeAdjustment(const QString &input, int element,
|
||||
TimeRange TimeRemapNode::output_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time) const
|
||||
{
|
||||
/*if (input == kInputInput) {
|
||||
rational target_time = GetValueAtTime(kTimeInput, input_time.in()).value<rational>();
|
||||
Rational target_time = GetValueAtTime(kTimeInput, input_time.in()).value<Rational>();
|
||||
|
||||
return TimeRange(target_time, target_time + input_time.length());
|
||||
} else {
|
||||
return super::OutputTimeAdjustment(input, element, input_time);
|
||||
return super::output_time_adjustment(input, element, input_time);
|
||||
}*/
|
||||
return super::OutputTimeAdjustment(input, element, input_time);
|
||||
return super::output_time_adjustment(input, element, input_time);
|
||||
}
|
||||
|
||||
void TimeRemapNode::Retranslate()
|
||||
void TimeRemapNode::retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::retranslate();
|
||||
|
||||
SetInputName(kTimeInput, QStringLiteral("Time"));
|
||||
SetInputName(kInputInput, QStringLiteral("Input"));
|
||||
set_input_name(k_time_input, QStringLiteral("Time"));
|
||||
set_input_name(k_input_input, QStringLiteral("Input"));
|
||||
}
|
||||
|
||||
void TimeRemapNode::Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
void TimeRemapNode::value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
table->Push(value[kInputInput]);
|
||||
table->push(value[k_input_input]);
|
||||
}
|
||||
|
||||
rational TimeRemapNode::GetRemappedTime(const rational &input) const
|
||||
Rational TimeRemapNode::get_remapped_time(const Rational &input) const
|
||||
{
|
||||
return GetValueAtTime(kTimeInput, input).value<rational>();
|
||||
return get_value_at_time(k_time_input, input).value<Rational>();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TIMEREMAPNODE_H
|
||||
#define TIMEREMAPNODE_H
|
||||
#ifndef OAK_TIMEREMAPNODE_H
|
||||
#define OAK_TIMEREMAPNODE_H
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
@@ -34,30 +34,30 @@ public:
|
||||
|
||||
NODE_DEFAULT_FUNCTIONS(TimeRemapNode)
|
||||
|
||||
virtual QString Name() const override;
|
||||
virtual QString name() const override;
|
||||
virtual QString id() const override;
|
||||
virtual QVector<CategoryID> Category() const override;
|
||||
virtual QString Description() const override;
|
||||
virtual QVector<CategoryID> category() const override;
|
||||
virtual QString description() const override;
|
||||
|
||||
virtual TimeRange InputTimeAdjustment(const QString &input, int element,
|
||||
virtual TimeRange input_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time,
|
||||
bool clamp) const override;
|
||||
virtual TimeRange
|
||||
OutputTimeAdjustment(const QString &input, int element,
|
||||
output_time_adjustment(const QString &input, int element,
|
||||
const TimeRange &input_time) const override;
|
||||
|
||||
virtual void Retranslate() override;
|
||||
virtual void retranslate() override;
|
||||
|
||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
virtual void value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
NodeValueTable *table) const override;
|
||||
|
||||
static const QString kTimeInput;
|
||||
static const QString kInputInput;
|
||||
static const QString k_time_input;
|
||||
static const QString k_input_input;
|
||||
|
||||
private:
|
||||
rational GetRemappedTime(const rational &input) const;
|
||||
Rational get_remapped_time(const Rational &input) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // TIMEREMAPNODE_H
|
||||
#endif // OAK_TIMEREMAPNODE_H
|
||||
|
||||
Reference in New Issue
Block a user