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:
+12
-12
@@ -39,27 +39,27 @@ PointGizmo::PointGizmo(const Shape &shape, QObject *parent)
|
||||
}
|
||||
|
||||
PointGizmo::PointGizmo(QObject *parent)
|
||||
: PointGizmo(kSquare, parent)
|
||||
: PointGizmo(k_square, parent)
|
||||
{
|
||||
}
|
||||
|
||||
void PointGizmo::Draw(QPainter *p) const
|
||||
void PointGizmo::draw(QPainter *p) const
|
||||
{
|
||||
QRectF rect = GetDrawingRect(p->transform(), GetStandardRadius());
|
||||
QRectF rect = get_drawing_rect(p->transform(), get_standard_radius());
|
||||
|
||||
if (shape_ != kAnchorPoint) {
|
||||
if (shape_ != k_anchor_point) {
|
||||
p->setPen(QPen(Qt::black, 0));
|
||||
p->setBrush(Qt::white);
|
||||
}
|
||||
|
||||
switch (shape_) {
|
||||
case kSquare:
|
||||
case k_square:
|
||||
p->drawRect(rect);
|
||||
break;
|
||||
case kCircle:
|
||||
case k_circle:
|
||||
p->drawEllipse(rect);
|
||||
break;
|
||||
case kAnchorPoint:
|
||||
case k_anchor_point:
|
||||
p->setPen(QPen(Qt::white, 0));
|
||||
p->setBrush(Qt::NoBrush);
|
||||
|
||||
@@ -72,17 +72,17 @@ void PointGizmo::Draw(QPainter *p) const
|
||||
}
|
||||
}
|
||||
|
||||
QRectF PointGizmo::GetClickingRect(const QTransform &t) const
|
||||
QRectF PointGizmo::get_clicking_rect(const QTransform &t) const
|
||||
{
|
||||
return GetDrawingRect(t, GetStandardRadius());
|
||||
return get_drawing_rect(t, get_standard_radius());
|
||||
}
|
||||
|
||||
double PointGizmo::GetStandardRadius()
|
||||
double PointGizmo::get_standard_radius()
|
||||
{
|
||||
return QFontMetrics(qApp->font()).height() * 0.25;
|
||||
}
|
||||
|
||||
QRectF PointGizmo::GetDrawingRect(const QTransform &transform,
|
||||
QRectF PointGizmo::get_drawing_rect(const QTransform &transform,
|
||||
double radius) const
|
||||
{
|
||||
QRectF r(0, 0, radius, radius);
|
||||
@@ -92,7 +92,7 @@ QRectF PointGizmo::GetDrawingRect(const QTransform &transform,
|
||||
double width = r.width();
|
||||
double height = r.height();
|
||||
|
||||
if (shape_ == kAnchorPoint) {
|
||||
if (shape_ == k_anchor_point) {
|
||||
width *= 2;
|
||||
height *= 2;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user