Rename ConfigManager files (3)

This commit is contained in:
Lukas W
2014-11-02 01:26:46 +01:00
parent 47831c99c5
commit f6f44d0c5c
5 changed files with 12 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
/*
* config_mgr.h - class ConfigManager, a class for managing LMMS-configuration
* ConfigManager.h - class ConfigManager, a class for managing LMMS-configuration
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*

View File

@@ -28,7 +28,7 @@
#include <QLabel>
#include "VstSubPluginFeatures.h"
#include "config_mgr.h"
#include "ConfigManager.h"
VstSubPluginFeatures::VstSubPluginFeatures( Plugin::PluginTypes _type ) :
@@ -52,7 +52,7 @@ void VstSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
void VstSubPluginFeatures::listSubPluginKeys( const Plugin::Descriptor * _desc,
KeyList & _kl ) const
{
QStringList dlls = QDir( configManager::inst()->vstDir() ).
QStringList dlls = QDir( ConfigManager::inst()->vstDir() ).
entryList( QStringList() << "*.dll",
QDir::Files, QDir::Name );
// TODO: eval m_type

View File

@@ -77,8 +77,8 @@ malletsInstrument::malletsInstrument( InstrumentTrack * _instrument_track ):
m_strikeModel( false, this, tr( "Bowed" ) ),
m_presetsModel(this),
m_spreadModel(0, 0, 255, 1, this, tr( "Spread" )),
m_filesMissing( !QDir( configManager::inst()->stkDir() ).exists() ||
!QFileInfo( configManager::inst()->stkDir() + QDir::separator()
m_filesMissing( !QDir( ConfigManager::inst()->stkDir() ).exists() ||
!QFileInfo( ConfigManager::inst()->stkDir() + QDir::separator()
+ "sinewave.raw" ).exists() )
{
// try to inform user about missing Stk-installation
@@ -533,7 +533,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir()
Stk::setRawwavePath( ConfigManager::inst()->stkDir()
.toLatin1().constData() );
m_voice = new ModalBar();
@@ -580,7 +580,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir()
Stk::setRawwavePath( ConfigManager::inst()->stkDir()
.toLatin1().constData() );
m_voice = new TubeBell();
@@ -625,7 +625,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir()
Stk::setRawwavePath( ConfigManager::inst()->stkDir()
.toLatin1().constData() );
m_voice = new BandedWG();

View File

@@ -171,7 +171,7 @@ void vestigeInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this )
if( QFileInfo( m_pluginDLL ).isAbsolute() )
{
QString f = QString( m_pluginDLL ).replace( QDir::separator(), '/' );
QString vd = QString( configManager::inst()->vstDir() ).replace( QDir::separator(), '/' );
QString vd = QString( ConfigManager::inst()->vstDir() ).replace( QDir::separator(), '/' );
QString relativePath;
if( !( relativePath = f.section( vd, 1, 1 ) ).isEmpty() )
{
@@ -623,7 +623,7 @@ void VestigeInstrumentView::openPlugin()
}
else
{
dir = configManager::inst()->vstDir();
dir = ConfigManager::inst()->vstDir();
}
// change dir to position of previously opened file
ofd.setDirectory( dir );

View File

@@ -45,7 +45,7 @@
#include <windows.h>
#endif
#include "config_mgr.h"
#include "ConfigManager.h"
#include "engine.h"
#include "MainWindow.h"
#include "song.h"
@@ -174,7 +174,7 @@ void VstPlugin::tryLoad( const QString &remoteVstPluginExecutable )
QString p = m_plugin;
if( QFileInfo( p ).dir().isRelative() )
{
p = configManager::inst()->vstDir() + QDir::separator() + p;
p = ConfigManager::inst()->vstDir() + QDir::separator() + p;
}
sendMessage( message( IdVstLoadPlugin ).addString( QSTR_TO_STDSTR( p ) ) );