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:
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef SAMPLEFORMATCOMBOBOX_H
|
||||
#define SAMPLEFORMATCOMBOBOX_H
|
||||
#ifndef OAK_SAMPLEFORMATCOMBOBOX_H
|
||||
#define OAK_SAMPLEFORMATCOMBOBOX_H
|
||||
|
||||
#include <olive/core/core.h>
|
||||
#include <QComboBox>
|
||||
@@ -41,54 +41,54 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
void SetAttemptToRestoreFormat(bool e)
|
||||
void set_attempt_to_restore_format(bool e)
|
||||
{
|
||||
attempt_to_restore_format_ = e;
|
||||
}
|
||||
|
||||
void SetAvailableFormats(const std::vector<SampleFormat> &formats)
|
||||
void set_available_formats(const std::vector<SampleFormat> &formats)
|
||||
{
|
||||
SampleFormat tmp = SampleFormat::INVALID;
|
||||
SampleFormat tmp = SampleFormat::invalid;
|
||||
|
||||
if (attempt_to_restore_format_) {
|
||||
tmp = GetSampleFormat();
|
||||
tmp = get_sample_format();
|
||||
}
|
||||
|
||||
clear();
|
||||
foreach (const SampleFormat &of, formats) {
|
||||
AddFormatItem(of);
|
||||
add_format_item(of);
|
||||
}
|
||||
|
||||
if (attempt_to_restore_format_) {
|
||||
SetSampleFormat(tmp);
|
||||
set_sample_format(tmp);
|
||||
}
|
||||
}
|
||||
|
||||
void SetPackedFormats()
|
||||
void set_packed_formats()
|
||||
{
|
||||
SampleFormat tmp = SampleFormat::INVALID;
|
||||
SampleFormat tmp = SampleFormat::invalid;
|
||||
|
||||
if (attempt_to_restore_format_) {
|
||||
tmp = GetSampleFormat();
|
||||
tmp = get_sample_format();
|
||||
}
|
||||
|
||||
clear();
|
||||
for (int i = SampleFormat::PACKED_START; i < SampleFormat::PACKED_END;
|
||||
for (int i = SampleFormat::packed_start; i < SampleFormat::packed_end;
|
||||
i++) {
|
||||
AddFormatItem(static_cast<SampleFormat::Format>(i));
|
||||
add_format_item(static_cast<SampleFormat::Format>(i));
|
||||
}
|
||||
|
||||
if (attempt_to_restore_format_) {
|
||||
SetSampleFormat(tmp);
|
||||
set_sample_format(tmp);
|
||||
}
|
||||
}
|
||||
|
||||
SampleFormat GetSampleFormat() const
|
||||
SampleFormat get_sample_format() const
|
||||
{
|
||||
return static_cast<SampleFormat::Format>(this->currentData().toInt());
|
||||
}
|
||||
|
||||
void SetSampleFormat(SampleFormat fmt)
|
||||
void set_sample_format(SampleFormat fmt)
|
||||
{
|
||||
for (int i = 0; i < this->count(); i++) {
|
||||
if (this->itemData(i).toInt() == fmt) {
|
||||
@@ -99,9 +99,9 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
void AddFormatItem(SampleFormat f)
|
||||
void add_format_item(SampleFormat f)
|
||||
{
|
||||
this->addItem(HumanStrings::FormatToString(f),
|
||||
this->addItem(HumanStrings::format_to_string(f),
|
||||
static_cast<SampleFormat::Format>(f));
|
||||
}
|
||||
|
||||
@@ -110,4 +110,4 @@ private:
|
||||
|
||||
}
|
||||
|
||||
#endif // SAMPLEFORMATCOMBOBOX_H
|
||||
#endif // OAK_SAMPLEFORMATCOMBOBOX_H
|
||||
|
||||
Reference in New Issue
Block a user