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:
@@ -48,34 +48,34 @@ ElapsedCounterWidget::ElapsedCounterWidget(QWidget *parent)
|
||||
|
||||
elapsed_timer_.setInterval(500);
|
||||
connect(&elapsed_timer_, &QTimer::timeout, this,
|
||||
&ElapsedCounterWidget::UpdateTimers);
|
||||
UpdateTimers();
|
||||
&ElapsedCounterWidget::update_timers);
|
||||
update_timers();
|
||||
}
|
||||
|
||||
void ElapsedCounterWidget::SetProgress(double d)
|
||||
void ElapsedCounterWidget::set_progress(double d)
|
||||
{
|
||||
last_progress_ = d;
|
||||
UpdateTimers();
|
||||
update_timers();
|
||||
}
|
||||
|
||||
void ElapsedCounterWidget::Start()
|
||||
void ElapsedCounterWidget::start()
|
||||
{
|
||||
Start(QDateTime::currentMSecsSinceEpoch());
|
||||
start(QDateTime::currentMSecsSinceEpoch());
|
||||
}
|
||||
|
||||
void ElapsedCounterWidget::Start(qint64 start_time)
|
||||
void ElapsedCounterWidget::start(qint64 start_time)
|
||||
{
|
||||
start_time_ = start_time;
|
||||
elapsed_timer_.start();
|
||||
UpdateTimers();
|
||||
update_timers();
|
||||
}
|
||||
|
||||
void ElapsedCounterWidget::Stop()
|
||||
void ElapsedCounterWidget::stop()
|
||||
{
|
||||
elapsed_timer_.stop();
|
||||
}
|
||||
|
||||
void ElapsedCounterWidget::UpdateTimers()
|
||||
void ElapsedCounterWidget::update_timers()
|
||||
{
|
||||
int64_t elapsed_ms, remaining_ms;
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef ELAPSEDCOUNTERWIDGET_H
|
||||
#define ELAPSEDCOUNTERWIDGET_H
|
||||
#ifndef OAK_ELAPSEDCOUNTERWIDGET_H
|
||||
#define OAK_ELAPSEDCOUNTERWIDGET_H
|
||||
|
||||
#include <QLabel>
|
||||
#include <QTimer>
|
||||
@@ -36,14 +36,14 @@ class ElapsedCounterWidget : public QWidget {
|
||||
public:
|
||||
ElapsedCounterWidget(QWidget *parent = nullptr);
|
||||
|
||||
void SetProgress(double d);
|
||||
void set_progress(double d);
|
||||
|
||||
public slots:
|
||||
void Start(qint64 start_time);
|
||||
void Start();
|
||||
void start(qint64 start_time);
|
||||
void start();
|
||||
|
||||
public slots:
|
||||
void Stop();
|
||||
void stop();
|
||||
|
||||
private:
|
||||
QLabel *elapsed_lbl_;
|
||||
@@ -57,9 +57,9 @@ private:
|
||||
qint64 start_time_;
|
||||
|
||||
private slots:
|
||||
void UpdateTimers();
|
||||
void update_timers();
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // ELAPSEDCOUNTERWIDGET_H
|
||||
#endif // OAK_ELAPSEDCOUNTERWIDGET_H
|
||||
|
||||
@@ -45,21 +45,21 @@ TaskView::TaskView(QWidget *parent)
|
||||
layout_->addStretch();
|
||||
}
|
||||
|
||||
void TaskView::AddTask(Task *t)
|
||||
void TaskView::add_task(Task *t)
|
||||
{
|
||||
// Create TaskViewItem (UI representation of a Task) and connect it
|
||||
TaskViewItem *item = new TaskViewItem(t);
|
||||
connect(item, &TaskViewItem::TaskCancelled, this, &TaskView::TaskCancelled);
|
||||
connect(item, &TaskViewItem::task_cancelled, this, &TaskView::task_cancelled);
|
||||
items_.insert(t, item);
|
||||
layout_->insertWidget(layout_->count() - 1, item);
|
||||
}
|
||||
|
||||
void TaskView::TaskFailed(Task *t)
|
||||
void TaskView::task_failed(Task *t)
|
||||
{
|
||||
items_.value(t)->Failed();
|
||||
items_.value(t)->failed();
|
||||
}
|
||||
|
||||
void TaskView::RemoveTask(Task *t)
|
||||
void TaskView::remove_task(Task *t)
|
||||
{
|
||||
items_.value(t)->deleteLater();
|
||||
items_.remove(t);
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TASKVIEW_H
|
||||
#define TASKVIEW_H
|
||||
#ifndef OAK_TASKVIEW_H
|
||||
#define OAK_TASKVIEW_H
|
||||
|
||||
#include <QScrollArea>
|
||||
#include <QVBoxLayout>
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
TaskView(QWidget *parent);
|
||||
|
||||
signals:
|
||||
void TaskCancelled(Task *t);
|
||||
void task_cancelled(Task *t);
|
||||
|
||||
public slots:
|
||||
/**
|
||||
@@ -52,11 +52,11 @@ public slots:
|
||||
*
|
||||
* Connect this to TaskManager::TaskAdded().
|
||||
*/
|
||||
void AddTask(Task *t);
|
||||
void add_task(Task *t);
|
||||
|
||||
void TaskFailed(Task *t);
|
||||
void task_failed(Task *t);
|
||||
|
||||
void RemoveTask(Task *t);
|
||||
void remove_task(Task *t);
|
||||
|
||||
private:
|
||||
QWidget *central_widget_;
|
||||
@@ -68,4 +68,4 @@ private:
|
||||
|
||||
}
|
||||
|
||||
#endif // TASKVIEW_H
|
||||
#endif // OAK_TASKVIEW_H
|
||||
|
||||
@@ -41,7 +41,7 @@ TaskViewItem::TaskViewItem(Task *task, QWidget *parent)
|
||||
|
||||
// Create header label
|
||||
task_name_lbl_ = new QLabel(this);
|
||||
task_name_lbl_->setText(task_->GetTitle());
|
||||
task_name_lbl_->setText(task_->get_title());
|
||||
layout->addWidget(task_name_lbl_);
|
||||
|
||||
// Create center layout (combines progress bar and a cancel button)
|
||||
@@ -55,7 +55,7 @@ TaskViewItem::TaskViewItem(Task *task, QWidget *parent)
|
||||
|
||||
// Create cancel button
|
||||
cancel_btn_ = new QPushButton(this);
|
||||
cancel_btn_->setIcon(icon::Error);
|
||||
cancel_btn_->setIcon(icon::error);
|
||||
middle_layout->addWidget(cancel_btn_);
|
||||
|
||||
// Create stack with error label and elapsed/remaining time
|
||||
@@ -75,24 +75,24 @@ TaskViewItem::TaskViewItem(Task *task, QWidget *parent)
|
||||
status_stack_->setCurrentWidget(elapsed_timer_lbl_);
|
||||
|
||||
// Connect to the task
|
||||
connect(task_, &Task::Started, elapsed_timer_lbl_,
|
||||
qOverload<qint64>(&ElapsedCounterWidget::Start));
|
||||
connect(task_, &Task::ProgressChanged, this, &TaskViewItem::UpdateProgress);
|
||||
connect(task_, &Task::started, elapsed_timer_lbl_,
|
||||
qOverload<qint64>(&ElapsedCounterWidget::start));
|
||||
connect(task_, &Task::progress_changed, this, &TaskViewItem::update_progress);
|
||||
connect(cancel_btn_, &QPushButton::clicked, this,
|
||||
[this] { emit TaskCancelled(task_); });
|
||||
[this] { emit task_cancelled(task_); });
|
||||
}
|
||||
|
||||
void TaskViewItem::Failed()
|
||||
void TaskViewItem::failed()
|
||||
{
|
||||
status_stack_->setCurrentWidget(task_error_lbl_);
|
||||
task_error_lbl_->setStyleSheet("color: red");
|
||||
task_error_lbl_->setText(tr("Error: %1").arg(task_->GetError()));
|
||||
task_error_lbl_->setText(tr("Error: %1").arg(task_->get_error()));
|
||||
}
|
||||
|
||||
void TaskViewItem::UpdateProgress(double d)
|
||||
void TaskViewItem::update_progress(double d)
|
||||
{
|
||||
progress_bar_->setValue(qRound(100.0 * d));
|
||||
elapsed_timer_lbl_->SetProgress(d);
|
||||
elapsed_timer_lbl_->set_progress(d);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef TASKVIEWITEM_H
|
||||
#define TASKVIEWITEM_H
|
||||
#ifndef OAK_TASKVIEWITEM_H
|
||||
#define OAK_TASKVIEWITEM_H
|
||||
|
||||
#include <QLabel>
|
||||
#include <QProgressBar>
|
||||
@@ -48,10 +48,10 @@ class TaskViewItem : public QFrame {
|
||||
public:
|
||||
TaskViewItem(Task *task, QWidget *parent = nullptr);
|
||||
|
||||
void Failed();
|
||||
void failed();
|
||||
|
||||
signals:
|
||||
void TaskCancelled(Task *t);
|
||||
void task_cancelled(Task *t);
|
||||
|
||||
private:
|
||||
QLabel *task_name_lbl_;
|
||||
@@ -65,9 +65,9 @@ private:
|
||||
Task *task_;
|
||||
|
||||
private slots:
|
||||
void UpdateProgress(double d);
|
||||
void update_progress(double d);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // TASKVIEWITEM_H
|
||||
#endif // OAK_TASKVIEWITEM_H
|
||||
|
||||
Reference in New Issue
Block a user