From 18a677cec3c0e80560bc01b9311666e8dfeda68c Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 16 Sep 2009 00:07:36 +0200 Subject: [PATCH] ZynAddSubFX: fixed compilation failure due to 0.4.x specific code After cherry-picking massive changes to ZynAddSubFX (and not resolving conflicts properly) some 0.4.x specific code did not compile anymore. This commit fixes those issues. --- plugins/zynaddsubfx/ZynAddSubFx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index e2fa08e05..09fc9fa61 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -178,7 +178,7 @@ void ZynAddSubFxInstrument::loadSettings( const QDomElement & _this ) -void zynAddSubFx::loadFile( const QString & _file ) +void ZynAddSubFxInstrument::loadFile( const QString & _file ) { const std::string fn = QSTR_TO_STDSTR( _file ); if( m_remotePlugin ) @@ -378,7 +378,7 @@ void ZynAddSubFxView::dropEvent( QDropEvent * _de ) const QString value = stringPairDrag::decodeValue( _de ); if( type == "pluginpresetfile" ) { - castModel()->loadFile( value ); + castModel()->loadFile( value ); _de->accept(); return; }