mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-26 00:23:55 -07:00
Prefix shadowed CounterState constructor args with underscores
This commit is contained in:
parent
8bf2d836a6
commit
a9793bc006
2 changed files with 13 additions and 13 deletions
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
#include <libcockatrice/utility/color.h>
|
#include <libcockatrice/utility/color.h>
|
||||||
|
|
||||||
CounterState::CounterState(int id,
|
CounterState::CounterState(int _id,
|
||||||
const QString &name,
|
const QString &_name,
|
||||||
const QColor &color,
|
const QColor &_color,
|
||||||
int radius,
|
int _radius,
|
||||||
int value,
|
int _value,
|
||||||
bool active,
|
bool _active,
|
||||||
QObject *parent)
|
QObject *parent)
|
||||||
: QObject(parent), id(id), name(name), color(color), radius(radius), value(value), active(active)
|
: QObject(parent), id(_id), name(_name), color(_color), radius(_radius), value(_value), active(_active)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,12 @@ class CounterState : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CounterState(int id,
|
CounterState(int _id,
|
||||||
const QString &name,
|
const QString &_name,
|
||||||
const QColor &color,
|
const QColor &_color,
|
||||||
int radius,
|
int _radius,
|
||||||
int value,
|
int _value,
|
||||||
bool active = true,
|
bool _active = true,
|
||||||
QObject *parent = nullptr);
|
QObject *parent = nullptr);
|
||||||
|
|
||||||
static CounterState *fromProto(const ServerInfo_Counter &counter, QObject *parent = nullptr);
|
static CounterState *fromProto(const ServerInfo_Counter &counter, QObject *parent = nullptr);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue