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:
+22
-22
@@ -24,7 +24,7 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
QVector<Color> ColorCoding::colors_ = {
|
||||
QVector<Color> ColorCoding::colors = {
|
||||
Color(0.545f, 0.255f, 0.255f), Color(0.412f, 0.188f, 0.259f),
|
||||
Color(0.561f, 0.427f, 0.239f), Color(0.486f, 0.306f, 0.235f),
|
||||
Color(0.631f, 0.612f, 0.212f), Color(0.404f, 0.478f, 0.243f),
|
||||
@@ -35,55 +35,55 @@ QVector<Color> ColorCoding::colors_ = {
|
||||
Color(0.800f, 0.800f, 0.800f), Color(0.502f, 0.502f, 0.502f)
|
||||
};
|
||||
|
||||
QString ColorCoding::GetColorName(int c)
|
||||
QString ColorCoding::get_color_name(int c)
|
||||
{
|
||||
// FIXME: I'm sure we could come up with more creative names for these colors
|
||||
switch (c) {
|
||||
case kRed:
|
||||
case k_red:
|
||||
return tr("Red");
|
||||
case kMaroon:
|
||||
case k_maroon:
|
||||
return tr("Maroon");
|
||||
case kOrange:
|
||||
case k_orange:
|
||||
return tr("Orange");
|
||||
case kBrown:
|
||||
case k_brown:
|
||||
return tr("Brown");
|
||||
case kYellow:
|
||||
case k_yellow:
|
||||
return tr("Yellow");
|
||||
case kOlive:
|
||||
case k_olive:
|
||||
return tr("Oak");
|
||||
case kLime:
|
||||
case k_lime:
|
||||
return tr("Lime");
|
||||
case kGreen:
|
||||
case k_green:
|
||||
return tr("Green");
|
||||
case kCyan:
|
||||
case k_cyan:
|
||||
return tr("Cyan");
|
||||
case kTeal:
|
||||
case k_teal:
|
||||
return tr("Teal");
|
||||
case kBlue:
|
||||
case k_blue:
|
||||
return tr("Blue");
|
||||
case kNavy:
|
||||
case k_navy:
|
||||
return tr("Navy");
|
||||
case kPink:
|
||||
case k_pink:
|
||||
return tr("Pink");
|
||||
case kPurple:
|
||||
case k_purple:
|
||||
return tr("Purple");
|
||||
case kSilver:
|
||||
case k_silver:
|
||||
return tr("Silver");
|
||||
case kGray:
|
||||
case k_gray:
|
||||
return tr("Gray");
|
||||
}
|
||||
|
||||
return QString();
|
||||
}
|
||||
|
||||
Color ColorCoding::GetColor(int c)
|
||||
Color ColorCoding::get_color(int c)
|
||||
{
|
||||
return colors_.at(c);
|
||||
return colors.at(c);
|
||||
}
|
||||
|
||||
Qt::GlobalColor ColorCoding::GetUISelectorColor(const Color &c)
|
||||
Qt::GlobalColor ColorCoding::get_ui_selector_color(const Color &c)
|
||||
{
|
||||
if (c.GetRoughLuminance() > 0.40f) {
|
||||
if (c.get_rough_luminance() > 0.40f) {
|
||||
return Qt::black;
|
||||
} else {
|
||||
return Qt::white;
|
||||
|
||||
Reference in New Issue
Block a user