Skip to content

Fix some clang warnings. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hef wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some clang warnings. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OSCWidgets/EditPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
EditButton::EditButton(QWidget *parent)
: QPushButton(parent)
, m_Selected(false)
, m_T(PI_PLUS_PI_2)
, m_Alpha(0)
, m_T(PI_PLUS_PI_2)
{
m_Timer = new QTimer(this);
connect(m_Timer, SIGNAL(timeout()), this, SLOT(onTick()));
Expand Down
2 changes: 1 addition & 1 deletion OSCWidgets/NetworkThreads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@ void EosUdpInThread::OSCParserClient_Log(const std::string &message)

EosTcpClientThread::EosTcpClientThread()
: m_Port(0)
, m_LogMsgType(EosLog::LOG_MSG_TYPE_INFO)
, m_Run(false)
, m_Mutex(QMutex::Recursive)
, m_LogMsgType(EosLog::LOG_MSG_TYPE_INFO)
{
}

Expand Down
4 changes: 2 additions & 2 deletions OSCWidgets/SettingsPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
////////////////////////////////////////////////////////////////////////////////

AddToyButton::AddToyButton(int type, QWidget *parent)
: m_Type(type)
, QPushButton(parent)
: QPushButton(parent)
, m_Type(type)
{
QString label;
Toy::GetName(static_cast<Toy::EnumToyType>(m_Type), label);
Expand Down
4 changes: 2 additions & 2 deletions OSCWidgets/Toy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Toy* Toy::Create(EnumToyType type, Client *pClient, QWidget *parent, Qt::WindowF
case TOY_WINDOW: return (new ToyWindow(pClient,parent,flags));
}

return 0;
return nullptr;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -148,7 +148,7 @@ void Toy::GetDefaultPathName(EnumToyType type, QString &name)
void Toy::SetDefaultWindowIcon(QWidget &w)
{
// NOTE: looks cleaner without window icons on Mac

Q_UNUSED(w);
#ifdef WIN32
static QIcon *sIcon = 0;
if( !sIcon )
Expand Down
8 changes: 4 additions & 4 deletions OSCWidgets/ToyGrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void GridSizeMenu::onHovered(int col, int row)
void GridSizeMenu::onClicked(int col, int row)
{
emit gridResized(m_Id, QSize(col+1,row+1));
emit triggered(0);
emit triggered(nullptr);
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -141,11 +141,11 @@ ToyGrid::ToyGrid(EnumToyType type, Client *pClient, QWidget *parent, Qt::WindowF
: Toy(type, pClient, parent, flags)
, m_Mode(ToyWidget::MODE_DEFAULT)
, m_GridSize(0, 0)
, m_SendOnConnect(false)
, m_EditPanel(nullptr)
, m_IgnoreEdits(0)
, m_pContextMenu(0)
, m_SendOnConnect(false)
, m_pContextMenu(nullptr)
, m_Loading(false)
, m_EditPanel(0)
{
QString name;
Toy::GetName(m_Type, name);
Expand Down
4 changes: 2 additions & 2 deletions OSCWidgets/ToySlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

FadeSlider::FadeSlider(QWidget *parent)
: FadeButton(parent)
, m_TextMargin(0)
, m_LabelMargin(0)
, m_Percent(0)
, m_MouseDown(false)
, m_TextMargin(0)
, m_LabelMargin(0)
{
m_RecvPercent.pending = false;
m_RecvPercent.percent = 0;
Expand Down
2 changes: 1 addition & 1 deletion OSCWidgets/ToyWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

ToyWidget::ToyWidget(QWidget *parent)
: QWidget(parent)
, m_Widget(0)
, m_Mode(MODE_DEFAULT)
, m_Visible(true)
, m_Widget(nullptr)
, m_Min("0")
, m_Max("1")
, m_Min2("0")
Expand Down
4 changes: 2 additions & 2 deletions OSCWidgets/ToyXY.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

FadeXY::FadeXY(QWidget *parent)
: FadeButton(parent)
, m_TextMargin(0)
, m_LabelMargin(0)
, m_Pos(0.5, 0.5)
, m_MouseDown(false)
, m_TextMargin(0)
, m_LabelMargin(0)
{
m_RecvPos.pending = false;
m_RecvPos.pos = QPointF(0, 0);
Expand Down
1 change: 1 addition & 0 deletions OSCWidgets/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ LRESULT CALLBACK EosMouseMsgProc(int nCode, WPARAM wParam, LPARAM lParam)

void Utils::BlockFakeMouseEvents(bool b)
{
Q_UNUSED(b);
#ifdef WIN32
if( b )
{
Expand Down