Merge fix

This commit is contained in:
Hyunjin Song
2022-11-11 11:37:57 +09:00
parent bd976bfeb4
commit 92d046db9f
2 changed files with 3 additions and 4 deletions

View File

@@ -164,8 +164,8 @@ void LadspaMatrixControlDialog::updateEffectView( LadspaControls * ladspaControl
m_stereoLink->setModel( &ladspaControls->m_stereoLinkModel );
}
connect( ladspaControls, SIGNAL( effectModelChanged( LadspaControls * ) ),
this, SLOT( updateEffectView( LadspaControls * ) ),
connect( ladspaControls, SIGNAL( effectModelChanged( lmms::LadspaControls * ) ),
this, SLOT( updateEffectView( lmms::LadspaControls * ) ),
Qt::DirectConnection );
}

View File

@@ -56,7 +56,7 @@ LadspaMatrixControlView::LadspaMatrixControlView( QWidget * parent,
case TOGGLED:
{
LedCheckBox * toggle = new LedCheckBox(
"", this, QString::null, LedCheckBox::Green );
"", this, QString(), LedCheckBox::Green );
toggle->setModel( m_ladspaControl->toggledModel() );
layout->addWidget( toggle );
setFixedSize( toggle->width(), toggle->height() );
@@ -81,7 +81,6 @@ LadspaMatrixControlView::LadspaMatrixControlView( QWidget * parent,
if( knob != NULL )
{
knob->setHintText( tr( "Value:" ), "" );
knob->setWhatsThis( tr( "Sorry, no help available." ) );
layout->addWidget( knob );
setFixedSize( knob->width(), knob->height() );
}