Skip to content

Commit 47318dc

Browse files
committed
Plugins: small code cleanups
1 parent f945b7b commit 47318dc

17 files changed

+299
-299
lines changed

src/engraving/api/v1/apitypes.h

Lines changed: 190 additions & 190 deletions
Large diffs are not rendered by default.

src/engraving/api/v1/enums.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ using namespace mu::engraving::apiv1;
3030
// Enum::Enum
3131
//---------------------------------------------------------
3232

33-
Enum::Enum(const QMetaEnum& _enum, QObject* parent)
33+
Enum::Enum(const QMetaEnum& m_enum, QObject* parent)
3434
: QQmlPropertyMap(this, parent)
3535
{
36-
add(_enum);
36+
add(m_enum);
3737
}
3838

39-
void Enum::add(const QMetaEnum& _enum)
39+
void Enum::add(const QMetaEnum& m_enum)
4040
{
41-
IF_ASSERT_FAILED(_enum.isValid()) {
41+
IF_ASSERT_FAILED(m_enum.isValid()) {
4242
return;
4343
}
4444

45-
const int nkeys = _enum.keyCount();
45+
const int nkeys = m_enum.keyCount();
4646
for (int i = 0; i < nkeys; ++i) {
47-
insert(_enum.key(i), _enum.value(i));
47+
insert(m_enum.key(i), m_enum.value(i));
4848
}
4949
}

src/engraving/api/v1/enums.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Enum : public QQmlPropertyMap
3838

3939
public:
4040
/// \cond MS_INTERNAL
41-
Enum(const QMetaEnum& _enum, QObject* parent = nullptr);
41+
Enum(const QMetaEnum& m_enum, QObject* parent = nullptr);
4242

4343
void add(const QMetaEnum& en);
4444

src/engraving/api/v1/excerpt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class Excerpt : public QObject
5757

5858
public:
5959
/// \cond MS_INTERNAL
60-
Excerpt(mu::engraving::Excerpt* _e = nullptr)
61-
: QObject(), e(_e) {}
60+
Excerpt(mu::engraving::Excerpt* m_e = nullptr)
61+
: QObject(), e(m_e) {}
6262
Excerpt(const Excerpt&) = delete;
6363
Excerpt& operator=(const Excerpt&) = delete;
6464
virtual ~Excerpt() {}

src/engraving/api/v1/fraction.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ class FractionWrapper : public QObject
5858

5959
/// \cond MS_INTERNAL
6060
public slots:
61-
void setFraction(engraving::Fraction _f) { f = _f; }
61+
void setFraction(engraving::Fraction m_f) { f = m_f; }
6262

6363
public:
6464
FractionWrapper() = default;
65-
FractionWrapper(const mu::engraving::Fraction& _f)
66-
: f(_f) {}
65+
FractionWrapper(const mu::engraving::Fraction& m_f)
66+
: f(m_f) {}
6767

6868
mu::engraving::Fraction fraction() const { return f; }
6969
int numerator() const { return f.numerator(); }

src/engraving/api/v1/instrument.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ using namespace mu::engraving::apiv1;
3535

3636
mu::engraving::InstrChannel* Channel::activeChannel()
3737
{
38-
mu::engraving::Score* score = _part->score();
38+
mu::engraving::Score* score = m_part->score();
3939
mu::engraving::MasterScore* masterScore = score->masterScore();
4040

4141
if (masterScore->playbackScore() == score) {
42-
return masterScore->playbackChannel(_channel);
42+
return masterScore->playbackChannel(m_channel);
4343
}
44-
return _channel;
44+
return m_channel;
4545
}
4646

4747
//---------------------------------------------------------
@@ -58,7 +58,7 @@ void Channel::setMidiBankAndProgram(int bank, int program, bool setUserBankContr
5858
patch.bank = bank;
5959
patch.prog = program;
6060

61-
mu::engraving::Score* score = _part->score();
61+
mu::engraving::Score* score = m_part->score();
6262
score->undo(new ChangePatch(score, ch, patch));
6363

6464
if (setUserBankController) {
@@ -93,7 +93,7 @@ void Channel::setMidiBank(int bank)
9393
QVariantList StringData::stringList() const
9494
{
9595
QVariantList pluginStringsList;
96-
for (instrString str : _data.stringList()) {
96+
for (instrString str : m_data.stringList()) {
9797
QVariantMap pluginStringData;
9898
pluginStringData["pitch"] = str.pitch;
9999
pluginStringData["open"] = str.open;

src/engraving/api/v1/instrument.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class Channel : public QObject
7474
{
7575
Q_OBJECT
7676

77-
mu::engraving::InstrChannel* _channel;
78-
mu::engraving::Part* _part;
77+
mu::engraving::InstrChannel* m_channel;
78+
mu::engraving::Part* m_part;
7979

8080
/** Name of this channel */
8181
Q_PROPERTY(QString name READ name)
@@ -136,17 +136,17 @@ class Channel : public QObject
136136
public:
137137
/// \cond MS_INTERNAL
138138
Channel(mu::engraving::InstrChannel* ch, mu::engraving::Part* p, QObject* parent = nullptr)
139-
: QObject(parent), _channel(ch), _part(p) {}
139+
: QObject(parent), m_channel(ch), m_part(p) {}
140140

141-
QString name() const { return _channel->name(); }
141+
QString name() const { return m_channel->name(); }
142142

143-
int volume() const { return _channel->volume(); }
143+
int volume() const { return m_channel->volume(); }
144144
void setVolume(int val) { activeChannel()->setVolume(qBound(0, val, 127)); }
145-
int pan() const { return _channel->pan(); }
145+
int pan() const { return m_channel->pan(); }
146146
void setPan(int val) { activeChannel()->setPan(qBound(0, val, 127)); }
147-
int chorus() const { return _channel->chorus(); }
147+
int chorus() const { return m_channel->chorus(); }
148148
void setChorus(int val) { activeChannel()->setChorus(qBound(0, val, 127)); }
149-
int reverb() const { return _channel->reverb(); }
149+
int reverb() const { return m_channel->reverb(); }
150150
void setReverb(int val) { activeChannel()->setReverb(qBound(0, val, 127)); }
151151

152152
bool mute() const
@@ -162,9 +162,9 @@ class Channel : public QObject
162162
//!@NOTE since MuseScore 4.0 mixer doen/t work via Channel
163163
}
164164

165-
int midiProgram() const { return _channel->program(); }
165+
int midiProgram() const { return m_channel->program(); }
166166
void setMidiProgram(int prog);
167-
int midiBank() const { return _channel->bank(); }
167+
int midiBank() const { return m_channel->bank(); }
168168
void setMidiBank(int bank);
169169
/// \endcond
170170
};
@@ -194,15 +194,15 @@ class StringData : public QObject
194194
/** Number of frets in this instrument */
195195
Q_PROPERTY(int frets READ frets)
196196

197-
mu::engraving::StringData _data;
197+
mu::engraving::StringData m_data;
198198

199199
public:
200200
/// \cond MS_INTERNAL
201201
StringData(const mu::engraving::StringData* d, QObject* parent = nullptr)
202-
: QObject(parent), _data(*d) {}
202+
: QObject(parent), m_data(*d) {}
203203

204204
QVariantList stringList() const;
205-
int frets() const { return _data.frets(); }
205+
int frets() const { return m_data.frets(); }
206206
/// \endcond
207207
};
208208

@@ -260,18 +260,18 @@ class Instrument : public QObject
260260

261261
Q_PROPERTY(QQmlListProperty<apiv1::Channel> channels READ channels)
262262

263-
mu::engraving::Instrument* _instrument;
264-
mu::engraving::Part* _part;
263+
mu::engraving::Instrument* m_instrument;
264+
mu::engraving::Part* m_part;
265265

266266
public:
267267
/// \cond MS_INTERNAL
268268
Instrument(mu::engraving::Instrument* i, mu::engraving::Part* p)
269-
: QObject(), _instrument(i), _part(p) {}
269+
: QObject(), m_instrument(i), m_part(p) {}
270270

271-
mu::engraving::Instrument* instrument() { return _instrument; }
272-
const mu::engraving::Instrument* instrument() const { return _instrument; }
271+
mu::engraving::Instrument* instrument() { return m_instrument; }
272+
const mu::engraving::Instrument* instrument() const { return m_instrument; }
273273

274-
mu::engraving::Part* part() { return _part; }
274+
mu::engraving::Part* part() { return m_part; }
275275

276276
QString instrumentId() const { return instrument()->id(); }
277277
QString musicXmlId() const { return instrument()->musicXmlId(); }

src/engraving/api/v1/playevent.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void PlayEvent::setPitch(int v)
4242
if (!ne || ne->pitch() == v) {
4343
return; // Value hasn't changed so no need to do more.
4444
}
45-
if (parentNote == nullptr) {
45+
if (!parentNote) {
4646
// We can't check against a parent note we don't have so
4747
// we check against the absolute range. When this NoteEvent
4848
// is added to an actual note the range should be checked
@@ -87,7 +87,7 @@ void PlayEvent::setOntime(int v)
8787
LOGW("PluginAPI::PlayEvent::setOntime: Invalid value.");
8888
return;
8989
}
90-
if (parentNote == nullptr) {
90+
if (!parentNote) {
9191
// Unowned floating value in QML context.
9292
ne->setOntime(v); // Set new ontTime value
9393
} else {
@@ -115,7 +115,7 @@ void PlayEvent::setLen(int v)
115115
LOGW("PluginAPI::PlayEvent::setLen: Invalid value.");
116116
return;
117117
}
118-
if (parentNote == nullptr) {
118+
if (!parentNote) {
119119
ne->setLen(v); // Set new length value
120120
} else {
121121
mu::engraving::Score* score = parentNote->note()->score();

src/engraving/api/v1/playevent.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class PlayEvent : public QObject
6767

6868
public:
6969

70-
PlayEvent(mu::engraving::NoteEvent* _ne = new mu::engraving::NoteEvent(), Note* _parent = nullptr)
71-
: QObject(), ne(_ne), parentNote(_parent) {}
70+
PlayEvent(mu::engraving::NoteEvent* m_ne = new mu::engraving::NoteEvent(), Note* m_parent = nullptr)
71+
: QObject(), ne(m_ne), parentNote(m_parent) {}
7272
// Delete the NoteEvent if parentless.
7373
virtual ~PlayEvent()
7474
{

src/engraving/api/v1/scoreelement.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ using namespace mu::engraving::apiv1;
3636

3737
ScoreElement::~ScoreElement()
3838
{
39-
if (_ownership == Ownership::PLUGIN) {
39+
if (m_ownership == Ownership::PLUGIN) {
4040
delete e;
4141
}
4242
}
@@ -168,7 +168,7 @@ void ScoreElement::set(mu::engraving::Pid pid, const QVariant& val)
168168
const PropertyFlags f = e->propertyFlags(pid);
169169
const PropertyFlags newFlags = (f == PropertyFlags::NOSTYLE) ? f : PropertyFlags::UNSTYLED;
170170

171-
if (_ownership == Ownership::SCORE) {
171+
if (m_ownership == Ownership::SCORE) {
172172
e->undoChangeProperty(pid, newValue, newFlags);
173173
} else { // not added to a score so no need (and dangerous) to deal with undo stack
174174
e->setProperty(pid, newValue);

0 commit comments

Comments
 (0)