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:
@@ -33,51 +33,51 @@ ProjectLoadTask::ProjectLoadTask(const QString &filename)
|
||||
{
|
||||
}
|
||||
|
||||
bool ProjectLoadTask::Run()
|
||||
bool ProjectLoadTask::run()
|
||||
{
|
||||
project_ = new Project();
|
||||
|
||||
project_->set_filename(GetFilename());
|
||||
project_->set_filename(get_filename());
|
||||
|
||||
ProjectSerializer::Result result = ProjectSerializer::Load(
|
||||
project_, GetFilename(), ProjectSerializer::kProject);
|
||||
ProjectSerializer::Result result = ProjectSerializer::load(
|
||||
project_, get_filename(), ProjectSerializer::k_project);
|
||||
|
||||
layout_ = result.GetLoadData().layout;
|
||||
layout_ = result.get_load_data().layout;
|
||||
|
||||
switch (result.code()) {
|
||||
case ProjectSerializer::kSuccess:
|
||||
case ProjectSerializer::k_success:
|
||||
break;
|
||||
case ProjectSerializer::kProjectTooOld:
|
||||
SetError(tr(
|
||||
case ProjectSerializer::k_project_too_old:
|
||||
set_error(tr(
|
||||
"This project is from a version of Oak Video Editor that is no longer supported in this version."));
|
||||
break;
|
||||
case ProjectSerializer::kProjectTooNew:
|
||||
SetError(tr(
|
||||
case ProjectSerializer::k_project_too_new:
|
||||
set_error(tr(
|
||||
"This project is from a newer version of Oak Video Editor and cannot be opened in this version."));
|
||||
break;
|
||||
case ProjectSerializer::kUnknownVersion:
|
||||
SetError(tr("Failed to determine project version."));
|
||||
case ProjectSerializer::k_unknown_version:
|
||||
set_error(tr("Failed to determine project version."));
|
||||
break;
|
||||
case ProjectSerializer::kFileError:
|
||||
SetError(
|
||||
tr("Failed to read file \"%1\" for reading.").arg(GetFilename()));
|
||||
case ProjectSerializer::k_file_error:
|
||||
set_error(
|
||||
tr("Failed to read file \"%1\" for reading.").arg(get_filename()));
|
||||
break;
|
||||
case ProjectSerializer::kXmlError:
|
||||
SetError(
|
||||
case ProjectSerializer::k_xml_error:
|
||||
set_error(
|
||||
tr("Failed to read XML document. File may be corrupt. Error was: %1")
|
||||
.arg(result.GetDetails()));
|
||||
.arg(result.get_details()));
|
||||
break;
|
||||
case ProjectSerializer::kNoData:
|
||||
SetError(tr("Failed to find any data to parse."));
|
||||
case ProjectSerializer::k_no_data:
|
||||
set_error(tr("Failed to find any data to parse."));
|
||||
break;
|
||||
|
||||
// Errors that should never be thrown by a load
|
||||
case ProjectSerializer::kOverwriteError:
|
||||
SetError(tr("Unknown error."));
|
||||
case ProjectSerializer::k_overwrite_error:
|
||||
set_error(tr("Unknown error."));
|
||||
break;
|
||||
}
|
||||
|
||||
if (result == ProjectSerializer::kSuccess) {
|
||||
if (result == ProjectSerializer::k_success) {
|
||||
project_->moveToThread(qApp->thread());
|
||||
return true;
|
||||
} else {
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef PROJECTLOADMANAGER_H
|
||||
#define PROJECTLOADMANAGER_H
|
||||
#ifndef OAK_PROJECTLOADMANAGER_H
|
||||
#define OAK_PROJECTLOADMANAGER_H
|
||||
|
||||
#include "loadbasetask.h"
|
||||
#include "window/mainwindow/mainwindowlayoutinfo.h"
|
||||
@@ -34,9 +34,9 @@ public:
|
||||
ProjectLoadTask(const QString &filename);
|
||||
|
||||
protected:
|
||||
virtual bool Run() override;
|
||||
virtual bool run() override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // PROJECTLOADMANAGER_H
|
||||
#endif // OAK_PROJECTLOADMANAGER_H
|
||||
|
||||
@@ -28,7 +28,7 @@ ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename)
|
||||
: project_(nullptr)
|
||||
, filename_(filename)
|
||||
{
|
||||
SetTitle(tr("Loading '%1'").arg(filename));
|
||||
set_title(tr("Loading '%1'").arg(filename));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef PROJECTLOADBASETASK_H
|
||||
#define PROJECTLOADBASETASK_H
|
||||
#ifndef OAK_PROJECTLOADBASETASK_H
|
||||
#define OAK_PROJECTLOADBASETASK_H
|
||||
|
||||
#include "node/project.h"
|
||||
#include "task/task.h"
|
||||
@@ -33,17 +33,17 @@ class ProjectLoadBaseTask : public Task {
|
||||
public:
|
||||
ProjectLoadBaseTask(const QString &filename);
|
||||
|
||||
Project *GetLoadedProject() const
|
||||
Project *get_loaded_project() const
|
||||
{
|
||||
return project_;
|
||||
}
|
||||
|
||||
const QString &GetFilename() const
|
||||
const QString &get_filename() const
|
||||
{
|
||||
return filename_;
|
||||
}
|
||||
|
||||
const MainWindowLayoutInfo &GetLoadedLayout() const
|
||||
const MainWindowLayoutInfo &get_loaded_layout() const
|
||||
{
|
||||
return layout_;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user