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:
+13
-13
@@ -28,14 +28,14 @@ namespace olive
|
||||
{
|
||||
|
||||
FrameManager *FrameManager::instance_ = nullptr;
|
||||
const int FrameManager::kFrameLifetime = 5000;
|
||||
const int FrameManager::k_frame_lifetime = 5000;
|
||||
|
||||
void FrameManager::CreateInstance()
|
||||
void FrameManager::create_instance()
|
||||
{
|
||||
instance_ = new FrameManager();
|
||||
}
|
||||
|
||||
void FrameManager::DestroyInstance()
|
||||
void FrameManager::destroy_instance()
|
||||
{
|
||||
delete instance_;
|
||||
instance_ = nullptr;
|
||||
@@ -46,19 +46,19 @@ FrameManager *FrameManager::instance()
|
||||
return instance_;
|
||||
}
|
||||
|
||||
char *FrameManager::Allocate(int size)
|
||||
char *FrameManager::allocate(int size)
|
||||
{
|
||||
if (instance()) {
|
||||
return instance()->AllocateFromPool(size);
|
||||
return instance()->allocate_from_pool(size);
|
||||
} else {
|
||||
return new char[size];
|
||||
}
|
||||
}
|
||||
|
||||
void FrameManager::Deallocate(int size, char *buffer)
|
||||
void FrameManager::deallocate(int size, char *buffer)
|
||||
{
|
||||
if (instance()) {
|
||||
instance()->DeallocateToPool(size, buffer);
|
||||
instance()->deallocate_to_pool(size, buffer);
|
||||
} else {
|
||||
delete[] buffer;
|
||||
}
|
||||
@@ -66,13 +66,13 @@ void FrameManager::Deallocate(int size, char *buffer)
|
||||
|
||||
FrameManager::FrameManager()
|
||||
{
|
||||
clear_timer_.setInterval(kFrameLifetime);
|
||||
clear_timer_.setInterval(k_frame_lifetime);
|
||||
connect(&clear_timer_, &QTimer::timeout, this,
|
||||
&FrameManager::GarbageCollection);
|
||||
&FrameManager::garbage_collection);
|
||||
clear_timer_.start();
|
||||
}
|
||||
|
||||
char *FrameManager::AllocateFromPool(int size)
|
||||
char *FrameManager::allocate_from_pool(int size)
|
||||
{
|
||||
QMutexLocker locker(&mutex_);
|
||||
|
||||
@@ -90,7 +90,7 @@ char *FrameManager::AllocateFromPool(int size)
|
||||
return buf;
|
||||
}
|
||||
|
||||
void FrameManager::DeallocateToPool(int size, char *buffer)
|
||||
void FrameManager::deallocate_to_pool(int size, char *buffer)
|
||||
{
|
||||
QMutexLocker locker(&mutex_);
|
||||
|
||||
@@ -99,11 +99,11 @@ void FrameManager::DeallocateToPool(int size, char *buffer)
|
||||
buffer_list.push_back({ QDateTime::currentMSecsSinceEpoch(), buffer });
|
||||
}
|
||||
|
||||
void FrameManager::GarbageCollection()
|
||||
void FrameManager::garbage_collection()
|
||||
{
|
||||
QMutexLocker locker(&mutex_);
|
||||
|
||||
qint64 min_life = QDateTime::currentMSecsSinceEpoch() - kFrameLifetime;
|
||||
qint64 min_life = QDateTime::currentMSecsSinceEpoch() - k_frame_lifetime;
|
||||
|
||||
for (auto it = pool_.begin(); it != pool_.end(); it++) {
|
||||
std::list<Buffer> &list = it->second;
|
||||
|
||||
Reference in New Issue
Block a user