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

Rename __targetNames to targetNames, and make it a static member variable

Browse Source
This commit is contained in:
Colin Wallace
2015-09-05 21:54:06 -07:00
parent e606e30486
commit b53e7a7fbe
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/InstrumentSoundShaping.h
View File

@@ -75,6 +75,8 @@ private:
FloatModel m_filterCutModel;
FloatModel m_filterResModel;
static const QString targetNames[InstrumentSoundShaping::NumTargets][3];
friend class InstrumentSoundShapingView;
friend class FlpImport;
@@ -82,7 +84,4 @@ private:
} ;
extern const QString __targetNames[InstrumentSoundShaping::NumTargets][3];
#endif

8
src/core/InstrumentSoundShaping.cpp
View File

@@ -42,7 +42,7 @@ const float RES_PRECISION = 1000.0f;
// names for env- and lfo-targets - first is name being displayed to user
// and second one is used internally, e.g. for saving/restoring settings
const QString __targetNames[InstrumentSoundShaping::NumTargets][3] =
const QString InstrumentSoundShaping::targetNames[InstrumentSoundShaping::NumTargets][3] =
{
{ InstrumentSoundShaping::tr( "VOLUME" ), "vol",
InstrumentSoundShaping::tr( "Volume" ) },
@@ -76,7 +76,7 @@ InstrumentSoundShaping::InstrumentSoundShaping(
value_for_zero_amount,
this );
m_envLfoParameters[i]->setDisplayName(
tr( __targetNames[i][2].toUtf8().constData() ) );
tr( targetNames[i][2].toUtf8().constData() ) );
}
m_filterModel.addItem( tr( "LowPass" ), new PixmapLoader( "filter_lp" ) );
@@ -331,7 +331,7 @@ void InstrumentSoundShaping::saveSettings( QDomDocument & _doc, QDomElement & _t
{
m_envLfoParameters[i]->saveState( _doc, _this ).setTagName(
m_envLfoParameters[i]->nodeName() +
QString( __targetNames[i][1] ).toLower() );
QString( targetNames[i][1] ).toLower() );
}
}
@@ -354,7 +354,7 @@ void InstrumentSoundShaping::loadSettings( const QDomElement & _this )
{
if( node.nodeName() ==
m_envLfoParameters[i]->nodeName() +
QString( __targetNames[i][1] ).
QString( targetNames[i][1] ).
toLower() )
{
m_envLfoParameters[i]->restoreState( node.toElement() );

2
src/gui/widgets/InstrumentSoundShapingView.cpp
View File

@@ -76,7 +76,7 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) :
{
m_envLfoViews[i] = new EnvelopeAndLfoView( m_targetsTabWidget );
m_targetsTabWidget->addTab( m_envLfoViews[i],
tr( __targetNames[i][0].toUtf8().constData() ) );
tr( InstrumentSoundShaping::targetNames[i][0].toUtf8().constData() ) );
}