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:
+19
-19
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef WIDGETMENU_H
|
||||
#define WIDGETMENU_H
|
||||
#ifndef OAK_WIDGETMENU_H
|
||||
#define OAK_WIDGETMENU_H
|
||||
|
||||
#include <QMenuBar>
|
||||
#include <QMenu>
|
||||
@@ -63,8 +63,8 @@ public:
|
||||
{
|
||||
bar->addMenu(this);
|
||||
|
||||
Init();
|
||||
ConnectAboutToShow(receiver, member);
|
||||
init();
|
||||
connect_about_to_show(receiver, member);
|
||||
}
|
||||
|
||||
Menu(Menu *menu);
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
{
|
||||
menu->addMenu(this);
|
||||
|
||||
Init();
|
||||
init();
|
||||
ConnectAboutToShow(receiver, member);
|
||||
}
|
||||
|
||||
@@ -121,23 +121,23 @@ public:
|
||||
* The QAction that was created and added to this Menu
|
||||
*/
|
||||
QAction *
|
||||
AddItem(const QString &id,
|
||||
add_item(const QString &id,
|
||||
const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
|
||||
Func member, const QKeySequence &key = QKeySequence())
|
||||
{
|
||||
QAction *a = CreateItem(this, id, receiver, member, key);
|
||||
QAction *a = create_item(this, id, receiver, member, key);
|
||||
|
||||
addAction(a);
|
||||
|
||||
return a;
|
||||
}
|
||||
|
||||
QAction *AddActionWithData(const QString &text, const QVariant &d,
|
||||
QAction *add_action_with_data(const QString &text, const QVariant &d,
|
||||
const QVariant &compare);
|
||||
|
||||
QAction *InsertAlphabetically(const QString &s);
|
||||
void InsertAlphabetically(QAction *entry);
|
||||
void InsertAlphabetically(Menu *menu);
|
||||
QAction *insert_alphabetically(const QString &s);
|
||||
void insert_alphabetically(QAction *entry);
|
||||
void insert_alphabetically(Menu *menu);
|
||||
|
||||
template <typename Func>
|
||||
/**
|
||||
@@ -167,14 +167,14 @@ public:
|
||||
*
|
||||
* The QAction that was created and added to this Menu
|
||||
*/
|
||||
static QAction *CreateItem(
|
||||
static QAction *create_item(
|
||||
QObject *parent, const QString &id,
|
||||
const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
|
||||
Func member, const QKeySequence &key = QKeySequence())
|
||||
{
|
||||
QAction *a = new QAction(parent);
|
||||
|
||||
ConformItem(a, id, receiver, member, key);
|
||||
conform_item(a, id, receiver, member, key);
|
||||
|
||||
return a;
|
||||
}
|
||||
@@ -206,24 +206,24 @@ public:
|
||||
*
|
||||
* Default keyboard sequence
|
||||
*/
|
||||
static void ConformItem(
|
||||
static void conform_item(
|
||||
QAction *a, const QString &id,
|
||||
const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
|
||||
Func member, const QKeySequence &key = QKeySequence())
|
||||
{
|
||||
ConformItem(a, id, key);
|
||||
conform_item(a, id, key);
|
||||
|
||||
connect(a, &QAction::triggered, receiver, member);
|
||||
}
|
||||
|
||||
static void ConformItem(QAction *a, const QString &id,
|
||||
static void conform_item(QAction *a, const QString &id,
|
||||
const QKeySequence &key = QKeySequence());
|
||||
|
||||
private:
|
||||
void Init();
|
||||
void init();
|
||||
|
||||
template <typename Func>
|
||||
void ConnectAboutToShow(
|
||||
void connect_about_to_show(
|
||||
const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
|
||||
Func member)
|
||||
{
|
||||
@@ -233,4 +233,4 @@ private:
|
||||
|
||||
}
|
||||
|
||||
#endif // WIDGETMENU_H
|
||||
#endif // OAK_WIDGETMENU_H
|
||||
|
||||
Reference in New Issue
Block a user