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:
@@ -52,7 +52,7 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
|
||||
for (i = themes.cbegin(); i != themes.cend(); i++) {
|
||||
style_combobox_->addItem(i.value(), i.key());
|
||||
|
||||
if (StyleManager::GetStyle() == i.key()) {
|
||||
if (StyleManager::get_style() == i.key()) {
|
||||
style_combobox_->setCurrentIndex(style_combobox_->count() - 1);
|
||||
}
|
||||
}
|
||||
@@ -68,14 +68,14 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
|
||||
|
||||
QGridLayout *color_layout = new QGridLayout(color_group);
|
||||
|
||||
for (int i = 0; i < Node::kCategoryCount; i++) {
|
||||
for (int i = 0; i < Node::k_category_count; i++) {
|
||||
QString cat_name =
|
||||
Node::GetCategoryName(static_cast<Node::CategoryID>(i));
|
||||
Node::get_category_name(static_cast<Node::CategoryID>(i));
|
||||
color_layout->addWidget(new QLabel(cat_name), i, 0);
|
||||
|
||||
ColorCodingComboBox *ccc = new ColorCodingComboBox();
|
||||
ccc->SetColor(
|
||||
OLIVE_CONFIG_STR(QStringLiteral("CatColor%1").arg(i)).toInt());
|
||||
ccc->set_color(
|
||||
OAK_CONFIG_STR(QStringLiteral("CatColor%1").arg(i)).toInt());
|
||||
color_layout->addWidget(ccc, i, 1);
|
||||
color_btns_.append(ccc);
|
||||
}
|
||||
@@ -93,7 +93,7 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
|
||||
marker_layout->addWidget(new QLabel("Default Marker Color"), 0, 0);
|
||||
|
||||
marker_btn_ = new ColorCodingComboBox();
|
||||
marker_btn_->SetColor(OLIVE_CONFIG("MarkerColor").toInt());
|
||||
marker_btn_->set_color(OAK_CONFIG("MarkerColor").toInt());
|
||||
marker_layout->addWidget(marker_btn_, 0, 1);
|
||||
|
||||
appearance_layout->addWidget(marker_group, row, 0, 1, 2);
|
||||
@@ -102,23 +102,23 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
|
||||
layout->addStretch();
|
||||
}
|
||||
|
||||
void PreferencesAppearanceTab::Accept(MultiUndoCommand *command)
|
||||
void PreferencesAppearanceTab::accept(MultiUndoCommand *command)
|
||||
{
|
||||
Q_UNUSED(command)
|
||||
|
||||
QString style_path = style_combobox_->currentData().toString();
|
||||
|
||||
if (style_path != StyleManager::GetStyle()) {
|
||||
StyleManager::SetStyle(style_path);
|
||||
OLIVE_CONFIG("Style") = style_path;
|
||||
if (style_path != StyleManager::get_style()) {
|
||||
StyleManager::set_style(style_path);
|
||||
OAK_CONFIG("Style") = style_path;
|
||||
}
|
||||
|
||||
for (int i = 0; i < color_btns_.size(); i++) {
|
||||
OLIVE_CONFIG_STR(QStringLiteral("CatColor%1").arg(i)) =
|
||||
color_btns_.at(i)->GetSelectedColor();
|
||||
OAK_CONFIG_STR(QStringLiteral("CatColor%1").arg(i)) =
|
||||
color_btns_.at(i)->get_selected_color();
|
||||
}
|
||||
|
||||
OLIVE_CONFIG("MarkerColor") = marker_btn_->GetSelectedColor();
|
||||
OAK_CONFIG("MarkerColor") = marker_btn_->get_selected_color();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user