mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-16 05:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

use lmmsconfig.h rather than config.h and use prefixed macro-names

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1097 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-08 11:30:47 +00:00
parent 6dcedad4f0
commit d6262bb556
81 changed files with 376 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/setup_dialog.cpp
View File

@@ -106,7 +106,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
m_artworkDir( configManager::inst()->artworkDir() ),
m_flDir( configManager::inst()->flDir() ),
m_ladDir( configManager::inst()->ladspaDir() ),
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
m_stkDir( configManager::inst()->stkDir() ),
#endif
m_disableChActInd( configManager::inst()->value( "ui",
@@ -133,7 +133,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
m_tabBar->setFixedWidth( 72 );
QWidget * ws = new QWidget( settings );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
ws->setFixedSize( 360, 422 );
#else
ws->setFixedSize( 360, 366 );
@@ -260,7 +260,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
QWidget * directories = new QWidget( ws );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
directories->setFixedSize( 360, 372 );
#else
directories->setFixedSize( 360, 326 );
@@ -364,7 +364,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
connect( laddir_select_btn, SIGNAL( clicked() ), this,
SLOT( openLADSPADir() ) );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
// STK-dir
tabWidget * stk_tw = new tabWidget( tr(
"STK rawwave directory" ).toUpper(),
@@ -394,7 +394,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
dir_layout->addWidget( fl_tw );
dir_layout->addSpacing( 10 );
dir_layout->addWidget( lad_tw );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
dir_layout->addSpacing( 10 );
dir_layout->addWidget( stk_tw );
#endif
@@ -708,7 +708,7 @@ void setupDialog::accept( void )
configManager::inst()->setArtworkDir( m_artworkDir );
configManager::inst()->setFLDir( m_flDir );
configManager::inst()->setLADSPADir( m_ladDir );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
configManager::inst()->setSTKDir( m_stkDir );
#endif
@@ -982,7 +982,7 @@ void setupDialog::openLADSPADir( void )
void setupDialog::openSTKDir( void )
{
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
QString new_dir = QFileDialog::getExistingDirectory( this,
tr( "Choose STK rawwave directory" ),
m_ladDir );
@@ -1014,7 +1014,7 @@ void setupDialog::setLADSPADir( const QString & _fd )
void setupDialog::setSTKDir( const QString & _fd )
{
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
m_stkDir = _fd;
#endif
}