Skip to content

Commit 32ca427

Browse files
committed
Fix some clang warnings.
Most of these are related to Initialize list ordering. None of them should have any runtime impact.
1 parent b3f6d20 commit 32ca427

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

OSCWidgets/EditPanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
EditButton::EditButton(QWidget *parent)
2929
: QPushButton(parent)
3030
, m_Selected(false)
31-
, m_T(PI_PLUS_PI_2)
3231
, m_Alpha(0)
32+
, m_T(PI_PLUS_PI_2)
3333
{
3434
m_Timer = new QTimer(this);
3535
connect(m_Timer, SIGNAL(timeout()), this, SLOT(onTick()));

OSCWidgets/NetworkThreads.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@ void EosUdpInThread::OSCParserClient_Log(const std::string &message)
327327

328328
EosTcpClientThread::EosTcpClientThread()
329329
: m_Port(0)
330-
, m_LogMsgType(EosLog::LOG_MSG_TYPE_INFO)
331330
, m_Run(false)
332331
, m_Mutex(QMutex::Recursive)
332+
, m_LogMsgType(EosLog::LOG_MSG_TYPE_INFO)
333333
{
334334
}
335335

OSCWidgets/SettingsPanel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
////////////////////////////////////////////////////////////////////////////////
2626

2727
AddToyButton::AddToyButton(int type, QWidget *parent)
28-
: m_Type(type)
29-
, QPushButton(parent)
28+
: QPushButton(parent)
29+
, m_Type(type)
3030
{
3131
QString label;
3232
Toy::GetName(static_cast<Toy::EnumToyType>(m_Type), label);

OSCWidgets/Toy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Toy* Toy::Create(EnumToyType type, Client *pClient, QWidget *parent, Qt::WindowF
9696
case TOY_WINDOW: return (new ToyWindow(pClient,parent,flags));
9797
}
9898

99-
return 0;
99+
return nullptr;
100100
}
101101

102102
////////////////////////////////////////////////////////////////////////////////
@@ -148,7 +148,7 @@ void Toy::GetDefaultPathName(EnumToyType type, QString &name)
148148
void Toy::SetDefaultWindowIcon(QWidget &w)
149149
{
150150
// NOTE: looks cleaner without window icons on Mac
151-
151+
Q_UNUSED(w);
152152
#ifdef WIN32
153153
static QIcon *sIcon = 0;
154154
if( !sIcon )

OSCWidgets/ToyGrid.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void GridSizeMenu::onHovered(int col, int row)
132132
void GridSizeMenu::onClicked(int col, int row)
133133
{
134134
emit gridResized(m_Id, QSize(col+1,row+1));
135-
emit triggered(0);
135+
emit triggered(nullptr);
136136
}
137137

138138
////////////////////////////////////////////////////////////////////////////////
@@ -141,11 +141,11 @@ ToyGrid::ToyGrid(EnumToyType type, Client *pClient, QWidget *parent, Qt::WindowF
141141
: Toy(type, pClient, parent, flags)
142142
, m_Mode(ToyWidget::MODE_DEFAULT)
143143
, m_GridSize(0, 0)
144-
, m_SendOnConnect(false)
144+
, m_EditPanel(nullptr)
145145
, m_IgnoreEdits(0)
146-
, m_pContextMenu(0)
146+
, m_SendOnConnect(false)
147+
, m_pContextMenu(nullptr)
147148
, m_Loading(false)
148-
, m_EditPanel(0)
149149
{
150150
QString name;
151151
Toy::GetName(m_Type, name);

OSCWidgets/ToySlider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
FadeSlider::FadeSlider(QWidget *parent)
2828
: FadeButton(parent)
29-
, m_TextMargin(0)
30-
, m_LabelMargin(0)
3129
, m_Percent(0)
3230
, m_MouseDown(false)
31+
, m_TextMargin(0)
32+
, m_LabelMargin(0)
3333
{
3434
m_RecvPercent.pending = false;
3535
m_RecvPercent.percent = 0;

OSCWidgets/ToyWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
ToyWidget::ToyWidget(QWidget *parent)
2929
: QWidget(parent)
30-
, m_Widget(0)
3130
, m_Mode(MODE_DEFAULT)
3231
, m_Visible(true)
32+
, m_Widget(nullptr)
3333
, m_Min("0")
3434
, m_Max("1")
3535
, m_Min2("0")

OSCWidgets/ToyXY.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
FadeXY::FadeXY(QWidget *parent)
2828
: FadeButton(parent)
29-
, m_TextMargin(0)
30-
, m_LabelMargin(0)
3129
, m_Pos(0.5, 0.5)
3230
, m_MouseDown(false)
31+
, m_TextMargin(0)
32+
, m_LabelMargin(0)
3333
{
3434
m_RecvPos.pending = false;
3535
m_RecvPos.pos = QPointF(0, 0);

OSCWidgets/Utils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ LRESULT CALLBACK EosMouseMsgProc(int nCode, WPARAM wParam, LPARAM lParam)
341341

342342
void Utils::BlockFakeMouseEvents(bool b)
343343
{
344+
Q_UNUSED(b);
344345
#ifdef WIN32
345346
if( b )
346347
{

0 commit comments

Comments
 (0)