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,11 +12,11 @@ public:
|
||||
explicit DummyTask(bool *ran)
|
||||
: ran_(ran)
|
||||
{
|
||||
SetTitle(QStringLiteral("DummyTask"));
|
||||
set_title(QStringLiteral("DummyTask"));
|
||||
}
|
||||
|
||||
protected:
|
||||
bool Run() override
|
||||
bool run() override
|
||||
{
|
||||
if (ran_) {
|
||||
*ran_ = true;
|
||||
@@ -32,13 +32,13 @@ class FailingTask final : public olive::Task {
|
||||
public:
|
||||
FailingTask()
|
||||
{
|
||||
SetTitle(QStringLiteral("FailingTask"));
|
||||
set_title(QStringLiteral("FailingTask"));
|
||||
}
|
||||
|
||||
protected:
|
||||
bool Run() override
|
||||
bool run() override
|
||||
{
|
||||
SetError(QStringLiteral("expected failure"));
|
||||
set_error(QStringLiteral("expected failure"));
|
||||
return false;
|
||||
}
|
||||
};
|
||||
@@ -48,14 +48,14 @@ public:
|
||||
explicit ProgressTask(int steps)
|
||||
: steps_(steps)
|
||||
{
|
||||
SetTitle(QStringLiteral("ProgressTask"));
|
||||
set_title(QStringLiteral("ProgressTask"));
|
||||
}
|
||||
|
||||
protected:
|
||||
bool Run() override
|
||||
bool run() override
|
||||
{
|
||||
for (int i = 0; i <= steps_; ++i) {
|
||||
emit ProgressChanged(static_cast<double>(i) / steps_);
|
||||
emit progress_changed(static_cast<double>(i) / steps_);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -67,7 +67,7 @@ private:
|
||||
|
||||
TEST(TaskManager, AddAndRunTask)
|
||||
{
|
||||
olive::TaskManager::CreateInstance();
|
||||
olive::TaskManager::create_instance();
|
||||
olive::TaskManager *mgr = olive::TaskManager::instance();
|
||||
ASSERT_NE(mgr, nullptr);
|
||||
|
||||
@@ -75,21 +75,21 @@ TEST(TaskManager, AddAndRunTask)
|
||||
DummyTask *task = new DummyTask(&ran);
|
||||
|
||||
QEventLoop loop;
|
||||
QObject::connect(task, &olive::Task::Finished, &loop,
|
||||
QObject::connect(task, &olive::Task::finished, &loop,
|
||||
[&loop](olive::Task *, bool) { loop.quit(); });
|
||||
|
||||
mgr->AddTask(task);
|
||||
mgr->add_task(task);
|
||||
|
||||
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
||||
loop.exec();
|
||||
|
||||
EXPECT_TRUE(ran);
|
||||
olive::TaskManager::DestroyInstance();
|
||||
olive::TaskManager::destroy_instance();
|
||||
}
|
||||
|
||||
TEST(TaskManager, FailedTaskEmitsTaskFailed)
|
||||
{
|
||||
olive::TaskManager::CreateInstance();
|
||||
olive::TaskManager::create_instance();
|
||||
olive::TaskManager *mgr = olive::TaskManager::instance();
|
||||
ASSERT_NE(mgr, nullptr);
|
||||
|
||||
@@ -97,24 +97,24 @@ TEST(TaskManager, FailedTaskEmitsTaskFailed)
|
||||
|
||||
QEventLoop loop;
|
||||
bool saw_failed = false;
|
||||
QObject::connect(mgr, &olive::TaskManager::TaskFailed, &loop,
|
||||
QObject::connect(mgr, &olive::TaskManager::task_failed, &loop,
|
||||
[&loop, &saw_failed](olive::Task *) {
|
||||
saw_failed = true;
|
||||
loop.quit();
|
||||
});
|
||||
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
||||
|
||||
mgr->AddTask(task);
|
||||
mgr->add_task(task);
|
||||
loop.exec();
|
||||
|
||||
EXPECT_TRUE(saw_failed);
|
||||
EXPECT_FALSE(task->GetError().isEmpty());
|
||||
olive::TaskManager::DestroyInstance();
|
||||
EXPECT_FALSE(task->get_error().isEmpty());
|
||||
olive::TaskManager::destroy_instance();
|
||||
}
|
||||
|
||||
TEST(TaskManager, ProgressSignalIsEmitted)
|
||||
{
|
||||
olive::TaskManager::CreateInstance();
|
||||
olive::TaskManager::create_instance();
|
||||
olive::TaskManager *mgr = olive::TaskManager::instance();
|
||||
ASSERT_NE(mgr, nullptr);
|
||||
|
||||
@@ -122,23 +122,23 @@ TEST(TaskManager, ProgressSignalIsEmitted)
|
||||
|
||||
QEventLoop loop;
|
||||
QVector<double> progress;
|
||||
QObject::connect(task, &olive::Task::ProgressChanged, &loop,
|
||||
QObject::connect(task, &olive::Task::progress_changed, &loop,
|
||||
[&progress](double p) { progress.append(p); });
|
||||
QObject::connect(task, &olive::Task::Finished, &loop,
|
||||
QObject::connect(task, &olive::Task::finished, &loop,
|
||||
[&loop](olive::Task *, bool) { loop.quit(); });
|
||||
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
||||
|
||||
mgr->AddTask(task);
|
||||
mgr->add_task(task);
|
||||
loop.exec();
|
||||
|
||||
EXPECT_FALSE(progress.isEmpty());
|
||||
EXPECT_GE(progress.last(), 0.99);
|
||||
olive::TaskManager::DestroyInstance();
|
||||
olive::TaskManager::destroy_instance();
|
||||
}
|
||||
|
||||
TEST(TaskManager, MultipleTasksComplete)
|
||||
{
|
||||
olive::TaskManager::CreateInstance();
|
||||
olive::TaskManager::create_instance();
|
||||
olive::TaskManager *mgr = olive::TaskManager::instance();
|
||||
ASSERT_NE(mgr, nullptr);
|
||||
|
||||
@@ -154,15 +154,15 @@ TEST(TaskManager, MultipleTasksComplete)
|
||||
loop.quit();
|
||||
}
|
||||
};
|
||||
QObject::connect(task1, &olive::Task::Finished, &loop, on_finished);
|
||||
QObject::connect(task2, &olive::Task::Finished, &loop, on_finished);
|
||||
QObject::connect(task1, &olive::Task::finished, &loop, on_finished);
|
||||
QObject::connect(task2, &olive::Task::finished, &loop, on_finished);
|
||||
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
||||
|
||||
mgr->AddTask(task1);
|
||||
mgr->AddTask(task2);
|
||||
mgr->add_task(task1);
|
||||
mgr->add_task(task2);
|
||||
loop.exec();
|
||||
|
||||
EXPECT_TRUE(ran1);
|
||||
EXPECT_TRUE(ran2);
|
||||
olive::TaskManager::DestroyInstance();
|
||||
olive::TaskManager::destroy_instance();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user