cppcheck fixes.
This commit is contained in:
parent
16bec45063
commit
91a45a216c
|
@ -449,7 +449,7 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)
|
||||||
connect(editKeyBindBtn, SIGNAL(clicked()), this, SLOT(editKeyBindingCallback(void)));
|
connect(editKeyBindBtn, SIGNAL(clicked()), this, SLOT(editKeyBindingCallback(void)));
|
||||||
connect( delKeyBindBtn, SIGNAL(clicked()), this, SLOT(delKeyBindingCallback(void)));
|
connect( delKeyBindBtn, SIGNAL(clicked()), this, SLOT(delKeyBindingCallback(void)));
|
||||||
|
|
||||||
if (useScroll)
|
if (useScroll && (scroll != NULL) )
|
||||||
{
|
{
|
||||||
scroll->setWidget(mainWidget);
|
scroll->setWidget(mainWidget);
|
||||||
scroll->setWidgetResizable(true);
|
scroll->setWidgetResizable(true);
|
||||||
|
@ -460,7 +460,7 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)
|
||||||
|
|
||||||
QHBoxLayout *dialogLayout = new QHBoxLayout();
|
QHBoxLayout *dialogLayout = new QHBoxLayout();
|
||||||
|
|
||||||
if (useScroll)
|
if (useScroll && (scroll != NULL) )
|
||||||
{
|
{
|
||||||
dialogLayout->addWidget(scroll);
|
dialogLayout->addWidget(scroll);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1301,7 +1301,7 @@ void GuiPaletteColorSelect::setText(void)
|
||||||
|
|
||||||
rTxt = getRoleText( role );
|
rTxt = getRoleText( role );
|
||||||
|
|
||||||
if ( rTxt == NULL )
|
if ( (gTxt == NULL) || (rTxt == NULL) )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue