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:
@@ -41,19 +41,19 @@ FileField::FileField(QWidget *parent)
|
||||
|
||||
line_edit_ = new QLineEdit();
|
||||
connect(line_edit_, &QLineEdit::textChanged, this,
|
||||
&FileField::LineEditChanged);
|
||||
&FileField::line_edit_changed);
|
||||
connect(line_edit_, &QLineEdit::textEdited, this,
|
||||
&FileField::FilenameChanged);
|
||||
&FileField::filename_changed);
|
||||
layout->addWidget(line_edit_);
|
||||
|
||||
browse_btn_ = new QPushButton();
|
||||
browse_btn_->setIcon(icon::Open);
|
||||
browse_btn_->setIcon(icon::open);
|
||||
connect(browse_btn_, &QPushButton::clicked, this,
|
||||
&FileField::BrowseBtnClicked);
|
||||
&FileField::browse_btn_clicked);
|
||||
layout->addWidget(browse_btn_);
|
||||
}
|
||||
|
||||
void FileField::BrowseBtnClicked()
|
||||
void FileField::browse_btn_clicked()
|
||||
{
|
||||
QString s;
|
||||
|
||||
@@ -85,11 +85,11 @@ void FileField::BrowseBtnClicked()
|
||||
|
||||
if (!s.isEmpty()) {
|
||||
line_edit_->setText(s);
|
||||
emit FilenameChanged(s);
|
||||
emit filename_changed(s);
|
||||
}
|
||||
}
|
||||
|
||||
void FileField::LineEditChanged(const QString &text)
|
||||
void FileField::line_edit_changed(const QString &text)
|
||||
{
|
||||
if (QFileInfo::exists(text) || text.isEmpty()) {
|
||||
line_edit_->setStyleSheet(QString());
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef FILEFIELD_H
|
||||
#define FILEFIELD_H
|
||||
#ifndef OAK_FILEFIELD_H
|
||||
#define OAK_FILEFIELD_H
|
||||
|
||||
#include <QLineEdit>
|
||||
#include <QPushButton>
|
||||
@@ -33,27 +33,27 @@ class FileField : public QWidget {
|
||||
public:
|
||||
FileField(QWidget *parent = nullptr);
|
||||
|
||||
QString GetFilename() const
|
||||
QString get_filename() const
|
||||
{
|
||||
return line_edit_->text();
|
||||
}
|
||||
|
||||
virtual void SetFilename(const QString &s)
|
||||
virtual void set_filename(const QString &s)
|
||||
{
|
||||
line_edit_->setText(s);
|
||||
}
|
||||
|
||||
void SetPlaceholder(const QString &s)
|
||||
void set_placeholder(const QString &s)
|
||||
{
|
||||
line_edit_->setPlaceholderText(s);
|
||||
}
|
||||
|
||||
void SetDirectoryMode(bool e)
|
||||
void set_directory_mode(bool e)
|
||||
{
|
||||
directory_mode_ = e;
|
||||
}
|
||||
|
||||
void SetNameFilter(const QString &filter)
|
||||
void set_name_filter(const QString &filter)
|
||||
{
|
||||
name_filter_ = filter;
|
||||
}
|
||||
@@ -64,13 +64,13 @@ public:
|
||||
*
|
||||
* Note: setting sidebar URLs requires Qt's non-native file dialog.
|
||||
*/
|
||||
void SetSidebarUrls(const QList<QUrl> &urls)
|
||||
void set_sidebar_urls(const QList<QUrl> &urls)
|
||||
{
|
||||
sidebar_urls_ = urls;
|
||||
}
|
||||
|
||||
signals:
|
||||
void FilenameChanged(const QString &filename);
|
||||
void filename_changed(const QString &filename);
|
||||
|
||||
private:
|
||||
QLineEdit *line_edit_;
|
||||
@@ -84,11 +84,11 @@ private:
|
||||
QList<QUrl> sidebar_urls_;
|
||||
|
||||
private slots:
|
||||
void BrowseBtnClicked();
|
||||
void browse_btn_clicked();
|
||||
|
||||
void LineEditChanged(const QString &text);
|
||||
void line_edit_changed(const QString &text);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // FILEFIELD_H
|
||||
#endif // OAK_FILEFIELD_H
|
||||
|
||||
@@ -35,7 +35,7 @@ LutFileField::LutFileField(QWidget *parent) : FileField(parent)
|
||||
library_combo_->setMinimumContentsLength(12);
|
||||
static_cast<QHBoxLayout *>(layout())->insertWidget(0, library_combo_, 1);
|
||||
|
||||
RefreshLibraryEntries();
|
||||
refresh_library_entries();
|
||||
|
||||
connect(library_combo_,
|
||||
static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this,
|
||||
@@ -43,33 +43,33 @@ LutFileField::LutFileField(QWidget *parent) : FileField(parent)
|
||||
const QString path =
|
||||
library_combo_->itemData(index).toString();
|
||||
if (!path.isEmpty()) {
|
||||
SetFilename(path);
|
||||
emit FilenameChanged(path);
|
||||
set_filename(path);
|
||||
emit filename_changed(path);
|
||||
}
|
||||
});
|
||||
|
||||
// Keep the combo in sync when the path is edited directly
|
||||
connect(this, &FileField::FilenameChanged, this, [this](const QString &) {
|
||||
RefreshLibraryEntries();
|
||||
connect(this, &FileField::filename_changed, this, [this](const QString &) {
|
||||
refresh_library_entries();
|
||||
});
|
||||
}
|
||||
|
||||
void LutFileField::SetFilename(const QString &s)
|
||||
void LutFileField::set_filename(const QString &s)
|
||||
{
|
||||
FileField::SetFilename(s);
|
||||
RefreshLibraryEntries();
|
||||
FileField::set_filename(s);
|
||||
refresh_library_entries();
|
||||
}
|
||||
|
||||
void LutFileField::RefreshLibraryEntries()
|
||||
void LutFileField::refresh_library_entries()
|
||||
{
|
||||
const QString current = GetFilename();
|
||||
const QString current = get_filename();
|
||||
|
||||
const QSignalBlocker blocker(library_combo_);
|
||||
library_combo_->clear();
|
||||
library_combo_->addItem(tr("Other (Custom File)..."), QString());
|
||||
|
||||
const QStringList library_dirs = LUTLibrary::GetDirectories();
|
||||
const QStringList luts = LUTLibrary::GetLutFiles();
|
||||
const QStringList library_dirs = LUTLibrary::get_directories();
|
||||
const QStringList luts = LUTLibrary::get_lut_files();
|
||||
for (const QString &lut : luts) {
|
||||
// Show the path relative to the library directory that contains it
|
||||
QString display = lut;
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef LUTFILEFIELD_H
|
||||
#define LUTFILEFIELD_H
|
||||
#ifndef OAK_LUTFILEFIELD_H
|
||||
#define OAK_LUTFILEFIELD_H
|
||||
|
||||
#include <QComboBox>
|
||||
|
||||
@@ -43,7 +43,7 @@ class LutFileField : public FileField {
|
||||
public:
|
||||
LutFileField(QWidget *parent = nullptr);
|
||||
|
||||
virtual void SetFilename(const QString &s) override;
|
||||
virtual void set_filename(const QString &s) override;
|
||||
|
||||
/**
|
||||
* @brief The combo box listing the LUT library entries
|
||||
@@ -61,11 +61,11 @@ private:
|
||||
* @brief Repopulates the combo from the LUT library and syncs the
|
||||
* selection with the current filename
|
||||
*/
|
||||
void RefreshLibraryEntries();
|
||||
void refresh_library_entries();
|
||||
|
||||
QComboBox *library_combo_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // LUTFILEFIELD_H
|
||||
#endif // OAK_LUTFILEFIELD_H
|
||||
|
||||
Reference in New Issue
Block a user