From c2f9fcd14ffcebd562c63da45e796a7cea89c0f9 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Wed, 26 Aug 2009 01:01:35 +0200
Subject: [PATCH] Plugin::Descriptor: renamed sub_plugin_features to
 subPluginFeatures

Renamed field sub_plugin_features to subPluginFeatures in
Plugin::Descriptor struct.
(cherry picked from commit e8c3c21f7f6db317bd7ac7a9119bd453e3b54e73)
---
 include/Plugin.h                 |  2 +-
 plugins/flp_import/FlpImport.cpp |  7 +++----
 src/gui/EffectSelectDialog.cpp   | 13 ++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/Plugin.h b/include/Plugin.h
index d17827803..14f071e26 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -137,7 +137,7 @@ public:
 			const Plugin::PluginTypes m_type;
 		} ;
 
-		SubPluginFeatures * sub_plugin_features;
+		SubPluginFeatures * subPluginFeatures;
 
 	} ;
 
diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp
index 05bff0395..825b059be 100644
--- a/plugins/flp_import/FlpImport.cpp
+++ b/plugins/flp_import/FlpImport.cpp
@@ -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 );
diff --git a/src/gui/EffectSelectDialog.cpp b/src/gui/EffectSelectDialog.cpp
index e456310b2..7edf51e5c 100644
--- a/src/gui/EffectSelectDialog.cpp
+++ b/src/gui/EffectSelectDialog.cpp
@@ -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 *>() )
 		{