hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Plugin::Descriptor: renamed sub_plugin_features to subPluginFeatures

Browse Source 
Renamed field sub_plugin_features to subPluginFeatures in
Plugin::Descriptor struct.
(cherry picked from commit e8c3c21f7f)
This commit is contained in:
Tobias Doerffel
2009-08-26 01:01:35 +02:00
parent fc72b1a6a4
commit c2f9fcd14f
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Plugin.h
View File

@@ -137,7 +137,7 @@ public:
const Plugin::PluginTypes m_type;
} ;
SubPluginFeatures * sub_plugin_features;
SubPluginFeatures * subPluginFeatures;
} ;

7
plugins/flp_import/FlpImport.cpp
View File

@@ -1634,10 +1634,9 @@ p->putValue( jt->pos, value, false );
{
continue;
}
if( it->sub_plugin_features )
if( it->subPluginFeatures )
{
it->sub_plugin_features->listSubPluginKeys(
&( *it ), effKeys );
it->subPluginFeatures->listSubPluginKeys( &( *it ), effKeys );
}
else
{
@@ -1717,7 +1716,7 @@ p->putValue( jt->pos, value, false );
jt != effKeys.end(); ++jt )
{
if( QString( jt->desc->displayName ).contains( effName ) ||
( jt->desc->sub_plugin_features != NULL &&
( jt->desc->subPluginFeatures != NULL &&
jt->name.contains( effName ) ) )
{
qDebug( "instantiate %s\n", jt->desc->name );

13
src/gui/EffectSelectDialog.cpp
View File

@@ -51,9 +51,9 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
{
continue;
}
if( it->sub_plugin_features )
if( it->subPluginFeatures )
{
it->sub_plugin_features->listSubPluginKeys(
it->subPluginFeatures->listSubPluginKeys(
// as iterators are always stated to be not
// equal with pointers, we dereference the
// iterator and take the address of the item,
@@ -75,7 +75,7 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
it != m_effectKeys.end(); ++it )
{
pluginNames += QString( ( *it ).desc->displayName ) +
( ( ( *it ).desc->sub_plugin_features != NULL ) ?
( ( ( *it ).desc->subPluginFeatures != NULL ) ?
": " + ( *it ).name
:
"" );
@@ -110,7 +110,7 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
SLOT( acceptSelection() ) );
// try to accept current selection when pressing "OK"
connect( ui->buttonBox, SIGNAL( accepted() ),
connect( ui->buttonBox, SIGNAL( accepted() ),
this, SLOT( acceptSelection() ) );
updateSelection();
@@ -166,8 +166,7 @@ void EffectSelectDialog::rowChanged( const QModelIndex & _idx,
{
m_currentSelection = m_effectKeys[m_model.mapToSource( _idx ).row()];
}
if( m_currentSelection.desc &&
m_currentSelection.desc->sub_plugin_features )
if( m_currentSelection.desc && m_currentSelection.desc->subPluginFeatures )
{
m_descriptionWidget = new QWidget;
QVBoxLayout * l = new QVBoxLayout( m_descriptionWidget );
@@ -176,7 +175,7 @@ void EffectSelectDialog::rowChanged( const QModelIndex & _idx,
ui->scrollArea->setWidget( m_descriptionWidget );
m_currentSelection.desc->sub_plugin_features->
m_currentSelection.desc->subPluginFeatures->
fillDescriptionWidget( m_descriptionWidget, &m_currentSelection );
foreach( QWidget * w, m_descriptionWidget->findChildren<QWidget *>() )
{