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:
@@ -14,37 +14,37 @@ namespace
|
||||
// without simulating mouse drags
|
||||
class ExposedFloatSlider : public olive::FloatSlider {
|
||||
public:
|
||||
QString ValueToStringPublic(const QVariant &v) const
|
||||
QString value_to_string_public(const QVariant &v) const
|
||||
{
|
||||
return ValueToString(v);
|
||||
return value_to_string(v);
|
||||
}
|
||||
|
||||
QVariant StringToValuePublic(const QString &s, bool *ok) const
|
||||
QVariant string_to_value_public(const QString &s, bool *ok) const
|
||||
{
|
||||
return StringToValue(s, ok);
|
||||
return string_to_value(s, ok);
|
||||
}
|
||||
|
||||
QVariant AdjustDragPublic(const QVariant &start, const double &drag) const
|
||||
QVariant adjust_drag_public(const QVariant &start, const double &drag) const
|
||||
{
|
||||
return AdjustDragDistanceInternal(start, drag);
|
||||
return adjust_drag_distance_internal(start, drag);
|
||||
}
|
||||
};
|
||||
|
||||
class ExposedIntegerSlider : public olive::IntegerSlider {
|
||||
public:
|
||||
QString ValueToStringPublic(const QVariant &v) const
|
||||
QString value_to_string_public(const QVariant &v) const
|
||||
{
|
||||
return ValueToString(v);
|
||||
return value_to_string(v);
|
||||
}
|
||||
|
||||
QVariant StringToValuePublic(const QString &s, bool *ok) const
|
||||
QVariant string_to_value_public(const QString &s, bool *ok) const
|
||||
{
|
||||
return StringToValue(s, ok);
|
||||
return string_to_value(s, ok);
|
||||
}
|
||||
|
||||
QVariant AdjustDragPublic(const QVariant &start, const double &drag) const
|
||||
QVariant adjust_drag_public(const QVariant &start, const double &drag) const
|
||||
{
|
||||
return AdjustDragDistanceInternal(start, drag);
|
||||
return adjust_drag_distance_internal(start, drag);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -54,94 +54,94 @@ TEST(WidgetSlider, FloatToStringFormatsAndTrims)
|
||||
{
|
||||
using olive::DecimalSliderBase;
|
||||
|
||||
EXPECT_EQ(DecimalSliderBase::FloatToString(1.5, 2, false),
|
||||
EXPECT_EQ(DecimalSliderBase::float_to_string(1.5, 2, false),
|
||||
QStringLiteral("1.50"));
|
||||
EXPECT_EQ(DecimalSliderBase::FloatToString(1.5, 2, true),
|
||||
EXPECT_EQ(DecimalSliderBase::float_to_string(1.5, 2, true),
|
||||
QStringLiteral("1.5"));
|
||||
|
||||
// Trimming always leaves at least one decimal digit
|
||||
EXPECT_EQ(DecimalSliderBase::FloatToString(2.0, 2, true),
|
||||
EXPECT_EQ(DecimalSliderBase::float_to_string(2.0, 2, true),
|
||||
QStringLiteral("2.0"));
|
||||
EXPECT_EQ(DecimalSliderBase::FloatToString(0.0, 3, true),
|
||||
EXPECT_EQ(DecimalSliderBase::float_to_string(0.0, 3, true),
|
||||
QStringLiteral("0.0"));
|
||||
|
||||
EXPECT_EQ(DecimalSliderBase::FloatToString(-3.5, 1, false),
|
||||
EXPECT_EQ(DecimalSliderBase::float_to_string(-3.5, 1, false),
|
||||
QStringLiteral("-3.5"));
|
||||
EXPECT_EQ(DecimalSliderBase::FloatToString(1.234, 2, false),
|
||||
EXPECT_EQ(DecimalSliderBase::float_to_string(1.234, 2, false),
|
||||
QStringLiteral("1.23"));
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, FloatSetValueClampsToRange)
|
||||
{
|
||||
olive::FloatSlider s;
|
||||
EXPECT_DOUBLE_EQ(s.GetValue(), 0.0);
|
||||
EXPECT_DOUBLE_EQ(s.get_value(), 0.0);
|
||||
|
||||
s.SetValue(1.25);
|
||||
EXPECT_DOUBLE_EQ(s.GetValue(), 1.25);
|
||||
s.set_value(1.25);
|
||||
EXPECT_DOUBLE_EQ(s.get_value(), 1.25);
|
||||
|
||||
s.SetMinimum(0.0);
|
||||
s.SetMaximum(2.0);
|
||||
s.set_minimum(0.0);
|
||||
s.set_maximum(2.0);
|
||||
|
||||
s.SetValue(-5.0);
|
||||
EXPECT_DOUBLE_EQ(s.GetValue(), 0.0);
|
||||
s.set_value(-5.0);
|
||||
EXPECT_DOUBLE_EQ(s.get_value(), 0.0);
|
||||
|
||||
s.SetValue(10.0);
|
||||
EXPECT_DOUBLE_EQ(s.GetValue(), 2.0);
|
||||
s.set_value(10.0);
|
||||
EXPECT_DOUBLE_EQ(s.get_value(), 2.0);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, FloatRangeChangeClampsExistingValue)
|
||||
{
|
||||
olive::FloatSlider s;
|
||||
|
||||
s.SetValue(-3.0);
|
||||
s.SetMinimum(0.0);
|
||||
EXPECT_DOUBLE_EQ(s.GetValue(), 0.0);
|
||||
s.set_value(-3.0);
|
||||
s.set_minimum(0.0);
|
||||
EXPECT_DOUBLE_EQ(s.get_value(), 0.0);
|
||||
|
||||
s.SetValue(5.0);
|
||||
s.SetMaximum(1.0);
|
||||
EXPECT_DOUBLE_EQ(s.GetValue(), 1.0);
|
||||
s.set_value(5.0);
|
||||
s.set_maximum(1.0);
|
||||
EXPECT_DOUBLE_EQ(s.get_value(), 1.0);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, FloatDisplayTransformRoundTrips)
|
||||
{
|
||||
EXPECT_DOUBLE_EQ(
|
||||
olive::FloatSlider::TransformValueToDisplay(0.5, olive::FloatSlider::kPercentage),
|
||||
olive::FloatSlider::transform_value_to_display(0.5, olive::FloatSlider::k_percentage),
|
||||
50.0);
|
||||
EXPECT_DOUBLE_EQ(
|
||||
olive::FloatSlider::TransformDisplayToValue(50.0, olive::FloatSlider::kPercentage),
|
||||
olive::FloatSlider::transform_display_to_value(50.0, olive::FloatSlider::k_percentage),
|
||||
0.5);
|
||||
|
||||
EXPECT_DOUBLE_EQ(
|
||||
olive::FloatSlider::TransformValueToDisplay(1.0, olive::FloatSlider::kDecibel),
|
||||
olive::FloatSlider::transform_value_to_display(1.0, olive::FloatSlider::k_decibel),
|
||||
0.0);
|
||||
EXPECT_NEAR(
|
||||
olive::FloatSlider::TransformValueToDisplay(0.5, olive::FloatSlider::kDecibel),
|
||||
olive::FloatSlider::transform_value_to_display(0.5, olive::FloatSlider::k_decibel),
|
||||
-6.0206, 0.001);
|
||||
EXPECT_NEAR(
|
||||
olive::FloatSlider::TransformDisplayToValue(
|
||||
olive::FloatSlider::TransformValueToDisplay(0.75, olive::FloatSlider::kDecibel),
|
||||
olive::FloatSlider::kDecibel),
|
||||
olive::FloatSlider::transform_display_to_value(
|
||||
olive::FloatSlider::transform_value_to_display(0.75, olive::FloatSlider::k_decibel),
|
||||
olive::FloatSlider::k_decibel),
|
||||
0.75, 1e-12);
|
||||
|
||||
EXPECT_DOUBLE_EQ(
|
||||
olive::FloatSlider::TransformValueToDisplay(3.5, olive::FloatSlider::kNormal),
|
||||
olive::FloatSlider::transform_value_to_display(3.5, olive::FloatSlider::k_normal),
|
||||
3.5);
|
||||
EXPECT_DOUBLE_EQ(
|
||||
olive::FloatSlider::TransformDisplayToValue(3.5, olive::FloatSlider::kNormal),
|
||||
olive::FloatSlider::transform_display_to_value(3.5, olive::FloatSlider::k_normal),
|
||||
3.5);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, FloatStaticValueToStringRespectsDisplayType)
|
||||
{
|
||||
// Zero volume in decibel mode displays as an infinity symbol (U+221E)
|
||||
EXPECT_EQ(olive::FloatSlider::ValueToString(0.0, olive::FloatSlider::kDecibel, 2,
|
||||
EXPECT_EQ(olive::FloatSlider::value_to_string(0.0, olive::FloatSlider::k_decibel, 2,
|
||||
false),
|
||||
QString(QChar(0x221E)));
|
||||
|
||||
EXPECT_EQ(olive::FloatSlider::ValueToString(0.5, olive::FloatSlider::kPercentage,
|
||||
EXPECT_EQ(olive::FloatSlider::value_to_string(0.5, olive::FloatSlider::k_percentage,
|
||||
1, false),
|
||||
QStringLiteral("50.0"));
|
||||
EXPECT_EQ(olive::FloatSlider::ValueToString(1.234, olive::FloatSlider::kNormal,
|
||||
EXPECT_EQ(olive::FloatSlider::value_to_string(1.234, olive::FloatSlider::k_normal,
|
||||
2, false),
|
||||
QStringLiteral("1.23"));
|
||||
}
|
||||
@@ -152,29 +152,29 @@ TEST(WidgetSlider, FloatLabelShowsFormattedValue)
|
||||
QLabel *label = s.findChild<QLabel *>();
|
||||
ASSERT_NE(label, nullptr);
|
||||
|
||||
s.SetValue(0.5);
|
||||
s.set_value(0.5);
|
||||
EXPECT_EQ(label->text(), QStringLiteral("0.50"));
|
||||
|
||||
s.SetDisplayType(olive::FloatSlider::kPercentage);
|
||||
s.set_display_type(olive::FloatSlider::k_percentage);
|
||||
EXPECT_EQ(label->text(), QStringLiteral("50.00%"));
|
||||
|
||||
s.SetFormat(QStringLiteral("%1 px"));
|
||||
s.set_format(QStringLiteral("%1 px"));
|
||||
EXPECT_EQ(label->text(), QStringLiteral("50.00 px"));
|
||||
|
||||
s.ClearFormat();
|
||||
s.SetDisplayType(olive::FloatSlider::kNormal);
|
||||
s.clear_format();
|
||||
s.set_display_type(olive::FloatSlider::k_normal);
|
||||
EXPECT_EQ(label->text(), QStringLiteral("0.50"));
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, FloatOffsetAppliesToDisplayAndParse)
|
||||
{
|
||||
ExposedFloatSlider s;
|
||||
s.SetOffset(10.0);
|
||||
s.set_offset(10.0);
|
||||
|
||||
EXPECT_EQ(s.ValueToStringPublic(2.0), QStringLiteral("12.00"));
|
||||
EXPECT_EQ(s.value_to_string_public(2.0), QStringLiteral("12.00"));
|
||||
|
||||
bool ok = false;
|
||||
QVariant v = s.StringToValuePublic(QStringLiteral("12.5"), &ok);
|
||||
QVariant v = s.string_to_value_public(QStringLiteral("12.5"), &ok);
|
||||
EXPECT_TRUE(ok);
|
||||
EXPECT_DOUBLE_EQ(v.toDouble(), 2.5);
|
||||
}
|
||||
@@ -184,17 +184,17 @@ TEST(WidgetSlider, FloatStringToValueRejectsGarbage)
|
||||
ExposedFloatSlider s;
|
||||
|
||||
bool ok = true;
|
||||
s.StringToValuePublic(QStringLiteral("not a number"), &ok);
|
||||
s.string_to_value_public(QStringLiteral("not a number"), &ok);
|
||||
EXPECT_FALSE(ok);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, FloatStringToValueRespectsDisplayType)
|
||||
{
|
||||
ExposedFloatSlider s;
|
||||
s.SetDisplayType(olive::FloatSlider::kPercentage);
|
||||
s.set_display_type(olive::FloatSlider::k_percentage);
|
||||
|
||||
bool ok = false;
|
||||
QVariant v = s.StringToValuePublic(QStringLiteral("50"), &ok);
|
||||
QVariant v = s.string_to_value_public(QStringLiteral("50"), &ok);
|
||||
EXPECT_TRUE(ok);
|
||||
EXPECT_DOUBLE_EQ(v.toDouble(), 0.5);
|
||||
}
|
||||
@@ -204,17 +204,17 @@ TEST(WidgetSlider, FloatDragDistanceRespectsDisplayType)
|
||||
ExposedFloatSlider s;
|
||||
|
||||
// Normal: plain addition
|
||||
EXPECT_DOUBLE_EQ(s.AdjustDragPublic(1.0, 2.5).toDouble(), 3.5);
|
||||
EXPECT_DOUBLE_EQ(s.adjust_drag_public(1.0, 2.5).toDouble(), 3.5);
|
||||
|
||||
// Percentage: drag is scaled by 1/100
|
||||
s.SetDisplayType(olive::FloatSlider::kPercentage);
|
||||
EXPECT_DOUBLE_EQ(s.AdjustDragPublic(0.5, 10.0).toDouble(), 0.6);
|
||||
s.set_display_type(olive::FloatSlider::k_percentage);
|
||||
EXPECT_DOUBLE_EQ(s.adjust_drag_public(0.5, 10.0).toDouble(), 0.6);
|
||||
|
||||
// Decibel: drag happens in dB space
|
||||
s.SetDisplayType(olive::FloatSlider::kDecibel);
|
||||
s.set_display_type(olive::FloatSlider::k_decibel);
|
||||
const double expected =
|
||||
olive::Decibel::toLinear(olive::Decibel::fromLinear(1.0) + 6.0);
|
||||
EXPECT_DOUBLE_EQ(s.AdjustDragPublic(1.0, 6.0).toDouble(), expected);
|
||||
olive::Decibel::to_linear(olive::Decibel::from_linear(1.0) + 6.0);
|
||||
EXPECT_DOUBLE_EQ(s.adjust_drag_public(1.0, 6.0).toDouble(), expected);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, TristateShowsDashesUntilValueSet)
|
||||
@@ -223,14 +223,14 @@ TEST(WidgetSlider, TristateShowsDashesUntilValueSet)
|
||||
QLabel *label = s.findChild<QLabel *>();
|
||||
ASSERT_NE(label, nullptr);
|
||||
|
||||
s.SetValue(1.0);
|
||||
s.SetTristate();
|
||||
EXPECT_TRUE(s.IsTristate());
|
||||
s.set_value(1.0);
|
||||
s.set_tristate();
|
||||
EXPECT_TRUE(s.is_tristate());
|
||||
EXPECT_EQ(label->text(), QStringLiteral("---"));
|
||||
|
||||
// Setting a value clears the tristate display
|
||||
s.SetValue(2.0);
|
||||
EXPECT_FALSE(s.IsTristate());
|
||||
s.set_value(2.0);
|
||||
EXPECT_FALSE(s.is_tristate());
|
||||
EXPECT_EQ(label->text(), QStringLiteral("2.00"));
|
||||
}
|
||||
|
||||
@@ -240,30 +240,30 @@ TEST(WidgetSlider, LabelSubstitutionOverridesText)
|
||||
QLabel *label = s.findChild<QLabel *>();
|
||||
ASSERT_NE(label, nullptr);
|
||||
|
||||
s.SetValue(0.0);
|
||||
s.InsertLabelSubstitution(0.0, QStringLiteral("Zero"));
|
||||
s.set_value(0.0);
|
||||
s.insert_label_substitution(0.0, QStringLiteral("Zero"));
|
||||
EXPECT_EQ(label->text(), QStringLiteral("Zero"));
|
||||
|
||||
s.SetValue(1.0);
|
||||
s.set_value(1.0);
|
||||
EXPECT_EQ(label->text(), QStringLiteral("1.00"));
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, IntegerSetValueClampsToRange)
|
||||
{
|
||||
olive::IntegerSlider s;
|
||||
EXPECT_EQ(s.GetValue(), 0);
|
||||
EXPECT_EQ(s.get_value(), 0);
|
||||
|
||||
s.SetMinimum(0);
|
||||
s.SetMaximum(10);
|
||||
s.set_minimum(0);
|
||||
s.set_maximum(10);
|
||||
|
||||
s.SetValue(-3);
|
||||
EXPECT_EQ(s.GetValue(), 0);
|
||||
s.set_value(-3);
|
||||
EXPECT_EQ(s.get_value(), 0);
|
||||
|
||||
s.SetValue(42);
|
||||
EXPECT_EQ(s.GetValue(), 10);
|
||||
s.set_value(42);
|
||||
EXPECT_EQ(s.get_value(), 10);
|
||||
|
||||
s.SetValue(7);
|
||||
EXPECT_EQ(s.GetValue(), 7);
|
||||
s.set_value(7);
|
||||
EXPECT_EQ(s.get_value(), 7);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, IntegerStringToValueRounds)
|
||||
@@ -271,25 +271,25 @@ TEST(WidgetSlider, IntegerStringToValueRounds)
|
||||
ExposedIntegerSlider s;
|
||||
|
||||
bool ok = false;
|
||||
EXPECT_EQ(s.StringToValuePublic(QStringLiteral("3.6"), &ok).toLongLong(), 4);
|
||||
EXPECT_EQ(s.string_to_value_public(QStringLiteral("3.6"), &ok).toLongLong(), 4);
|
||||
EXPECT_TRUE(ok);
|
||||
EXPECT_EQ(s.StringToValuePublic(QStringLiteral("-2.4"), &ok).toLongLong(), -2);
|
||||
EXPECT_EQ(s.string_to_value_public(QStringLiteral("-2.4"), &ok).toLongLong(), -2);
|
||||
EXPECT_TRUE(ok);
|
||||
|
||||
ok = true;
|
||||
s.StringToValuePublic(QStringLiteral("junk"), &ok);
|
||||
s.string_to_value_public(QStringLiteral("junk"), &ok);
|
||||
EXPECT_FALSE(ok);
|
||||
}
|
||||
|
||||
TEST(WidgetSlider, IntegerOffsetAppliesToDisplayAndParse)
|
||||
{
|
||||
ExposedIntegerSlider s;
|
||||
s.SetOffset(10);
|
||||
s.set_offset(10);
|
||||
|
||||
EXPECT_EQ(s.ValueToStringPublic(2), QStringLiteral("12"));
|
||||
EXPECT_EQ(s.value_to_string_public(2), QStringLiteral("12"));
|
||||
|
||||
bool ok = false;
|
||||
EXPECT_EQ(s.StringToValuePublic(QStringLiteral("12"), &ok).toLongLong(), 2);
|
||||
EXPECT_EQ(s.string_to_value_public(QStringLiteral("12"), &ok).toLongLong(), 2);
|
||||
EXPECT_TRUE(ok);
|
||||
}
|
||||
|
||||
@@ -297,6 +297,6 @@ TEST(WidgetSlider, IntegerDragRoundsToWhole)
|
||||
{
|
||||
ExposedIntegerSlider s;
|
||||
|
||||
EXPECT_EQ(s.AdjustDragPublic(2, 1.4).toLongLong(), 3);
|
||||
EXPECT_EQ(s.AdjustDragPublic(2, -1.4).toLongLong(), 1);
|
||||
EXPECT_EQ(s.adjust_drag_public(2, 1.4).toLongLong(), 3);
|
||||
EXPECT_EQ(s.adjust_drag_public(2, -1.4).toLongLong(), 1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user