sed: s/( void )/(), s/FALSE/false/, s/TRUE/true

Replaced remaining occurences of old constants and superfluous "void"
on empty argument list of functions.
(cherry picked from commit 166701f9f3)
This commit is contained in:
Tobias Doerffel
2009-08-24 23:25:26 +02:00
parent 1d5cb23385
commit f4dbb2ff5c
175 changed files with 1130 additions and 1130 deletions

View File

@@ -114,7 +114,7 @@ float Controller::runningTime()
void Controller::triggerFrameCounter( void )
void Controller::triggerFrameCounter()
{
for( int i = 0; i < s_controllers.size(); ++i )
{
@@ -131,7 +131,7 @@ void Controller::triggerFrameCounter( void )
void Controller::resetFrameCounter( void )
void Controller::resetFrameCounter()
{
s_frames = 0;
}
@@ -239,7 +239,7 @@ void Controller::loadSettings( const QDomElement & _this )
}
QString Controller::nodeName( void ) const
QString Controller::nodeName() const
{
return( "Controller" );
}

View File

@@ -40,7 +40,7 @@ ControllerConnectionVector ControllerConnection::s_connections;
ControllerConnection::ControllerConnection( Controller * _controller ) :
m_controllerId( -1 ),
m_ownsController( FALSE )
m_ownsController( false )
{
if( _controller != NULL )
{
@@ -60,7 +60,7 @@ ControllerConnection::ControllerConnection( Controller * _controller ) :
ControllerConnection::ControllerConnection( int _controllerId ) :
m_controller( Controller::create( Controller::DummyController, NULL ) ),
m_controllerId( _controllerId ),
m_ownsController( FALSE )
m_ownsController( false )
{
s_connections.append( this );
}
@@ -141,7 +141,7 @@ inline void ControllerConnection::setTargetName( const QString & _name )
* controllers. So, we remember the controller-ID and use a dummyController
* instead. Once the song is loaded, finalizeConnections() connects to the proper controllers
*/
void ControllerConnection::finalizeConnections( void )
void ControllerConnection::finalizeConnections()
{
for( int i = 0; i < s_connections.size(); ++i )
{
@@ -203,12 +203,12 @@ void ControllerConnection::loadSettings( const QDomElement & _this )
}
void ControllerConnection::deleteConnection( void )
void ControllerConnection::deleteConnection()
{
delete this;
}
QString ControllerConnection::nodeName( void ) const
QString ControllerConnection::nodeName() const
{
return( "connection" );
}

View File

@@ -141,7 +141,7 @@ void FxMixer::processChannel( fx_ch_t _ch, sampleFrame * _buf )
void FxMixer::prepareMasterMix( void )
void FxMixer::prepareMasterMix()
{
engine::getMixer()->clearAudioBuffer( m_fxChannels[0]->m_buffer,
engine::getMixer()->framesPerPeriod() );

View File

@@ -171,7 +171,7 @@ float LfoController::value( int _offset )
void LfoController::updateSampleFunction( void )
void LfoController::updateSampleFunction()
{
switch( m_waveModel.value() )
{
@@ -231,7 +231,7 @@ void LfoController::loadSettings( const QDomElement & _this )
QString LfoController::nodeName( void ) const
QString LfoController::nodeName() const
{
return( "lfocontroller" );
}

View File

@@ -306,7 +306,7 @@ void Oscillator::updateFM( sampleFrame * _ab, const fpp_t _frames,
// should be called every time phase-offset is changed...
inline void Oscillator::recalcPhase( void )
inline void Oscillator::recalcPhase()
{
if( !typeInfo<float>::isEqual( m_phaseOffset, m_ext_phaseOffset ) )
{

View File

@@ -96,7 +96,7 @@ Plugin * Plugin::instantiate( const QString & _plugin_name, Model * _parent,
{
QLibrary plugin_lib( configManager::inst()->pluginDir() +
_plugin_name );
if( plugin_lib.load() == FALSE )
if( plugin_lib.load() == false )
{
if( engine::hasGUI() )
{
@@ -151,7 +151,7 @@ void Plugin::getDescriptorsOfAvailPlugins( QVector<Descriptor> & _plugin_descs )
foreach( const QFileInfo & f, list )
{
QLibrary plugin_lib( f.absoluteFilePath() );
if( plugin_lib.load() == FALSE ||
if( plugin_lib.load() == false ||
plugin_lib.resolve( "lmms_plugin_main" ) == NULL )
{
continue;

View File

@@ -108,7 +108,7 @@ void TempoSyncKnobModel::calculateTempoSyncTime( bpm_t _bpm )
break;
default: ;
}
bool journalling = testAndSetJournalling( FALSE );
bool journalling = testAndSetJournalling( false );
float oneUnit = 60000.0 / ( _bpm * conversionFactor * m_scale );
setValue( oneUnit * maxValue() );
setJournalling( journalling );

View File

@@ -117,7 +117,7 @@ void automationPattern::addObject( AutomatableModel * _obj, bool _search_dup )
const AutomatableModel * automationPattern::firstObject( void ) const
const AutomatableModel * automationPattern::firstObject() const
{
AutomatableModel * m;
if( !m_objects.isEmpty() && ( m = m_objects.first() ) != NULL )
@@ -134,7 +134,7 @@ const AutomatableModel * automationPattern::firstObject( void ) const
//TODO: Improve this
midiTime automationPattern::length( void ) const
midiTime automationPattern::length() const
{
tick_t max_length = 0;
@@ -349,7 +349,7 @@ void automationPattern::loadSettings( const QDomElement & _this )
const QString automationPattern::name( void ) const
const QString automationPattern::name() const
{
if( !trackContentObject::name().isEmpty() )
{
@@ -464,7 +464,7 @@ automationPattern * automationPattern::globalAutomationPattern(
void automationPattern::resolveAllIDs( void )
void automationPattern::resolveAllIDs()
{
trackContainer::trackList l = engine::getSong()->tracks() +
engine::getBBTrackContainer()->tracks();
@@ -504,7 +504,7 @@ void automationPattern::resolveAllIDs( void )
void automationPattern::clear( void )
void automationPattern::clear()
{
const float val = firstObject()->value<float>();
m_timeMap.clear();
@@ -520,7 +520,7 @@ void automationPattern::clear( void )
void automationPattern::openInAutomationEditor( void )
void automationPattern::openInAutomationEditor()
{
engine::getAutomationEditor()->setCurrentPattern( this );
engine::getAutomationEditor()->parentWidget()->show();

View File

@@ -32,7 +32,7 @@
bbTrackContainer::bbTrackContainer( void ) :
bbTrackContainer::bbTrackContainer() :
trackContainer(),
m_bbComboBoxModel( this )
{
@@ -58,10 +58,10 @@ bool bbTrackContainer::play( midiTime _start, fpp_t _frames,
f_cnt_t _offset,
Sint16 _tco_num )
{
bool played_a_note = FALSE;
bool played_a_note = false;
if( lengthOfBB( _tco_num ) <= 0 )
{
return( FALSE );
return( false );
}
_start = _start % ( lengthOfBB( _tco_num ) * midiTime::ticksPerTact() );
@@ -71,7 +71,7 @@ bool bbTrackContainer::play( midiTime _start, fpp_t _frames,
{
if( ( *it )->play( _start, _frames, _offset, _tco_num ) )
{
played_a_note = TRUE;
played_a_note = true;
}
}
@@ -81,7 +81,7 @@ bool bbTrackContainer::play( midiTime _start, fpp_t _frames,
void bbTrackContainer::updateAfterTrackAdd( void )
void bbTrackContainer::updateAfterTrackAdd()
{
// make sure, new track(s) have TCOs for every beat/bassline
for( int i = 0; i < qMax<int>( 1, numOfBBs() ); ++i )
@@ -110,7 +110,7 @@ tact_t bbTrackContainer::lengthOfBB( int _bb )
int bbTrackContainer::numOfBBs( void ) const
int bbTrackContainer::numOfBBs() const
{
return( engine::getSong()->countTracks( track::BBTrack ) );
}
@@ -161,7 +161,7 @@ void bbTrackContainer::updateBBTrack( trackContentObject * _tco )
void bbTrackContainer::fixIncorrectPositions( void )
void bbTrackContainer::fixIncorrectPositions()
{
trackList tl = tracks();
for( trackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -176,7 +176,7 @@ void bbTrackContainer::fixIncorrectPositions( void )
void bbTrackContainer::play( void )
void bbTrackContainer::play()
{
if( engine::getSong()->isPlaying() )
{
@@ -204,7 +204,7 @@ void bbTrackContainer::play( void )
void bbTrackContainer::stop( void )
void bbTrackContainer::stop()
{
engine::getSong()->stop();
}
@@ -212,7 +212,7 @@ void bbTrackContainer::stop( void )
void bbTrackContainer::updateComboBox( void )
void bbTrackContainer::updateComboBox()
{
const int cur_bb = currentBB();
@@ -229,7 +229,7 @@ void bbTrackContainer::updateComboBox( void )
void bbTrackContainer::currentBBChanged( void )
void bbTrackContainer::currentBBChanged()
{
// first make sure, all channels have a TCO at current BB
createTCOsForBB( currentBB() );

View File

@@ -49,7 +49,7 @@ static inline QString ensureTrailingSlash( const QString & _s )
configManager * configManager::s_instanceOfMe = NULL;
configManager::configManager( void ) :
configManager::configManager() :
m_lmmsRcFile( QDir::home().absolutePath() + QDir::separator() +
".lmmsrc.xml" ),
m_workingDir( QDir::home().absolutePath() + QDir::separator() +
@@ -212,7 +212,7 @@ void configManager::setValue( const QString & _class,
void configManager::loadConfigFile( void )
void configManager::loadConfigFile()
{
// read the XML file and create DOM tree
QFile cfg_file( m_lmmsRcFile );
@@ -352,7 +352,7 @@ void configManager::loadConfigFile( void )
void configManager::saveConfigFile( void )
void configManager::saveConfigFile()
{
setValue( "paths", "artwork", m_artworkDir );
setValue( "paths", "workingdir", m_workingDir );

View File

@@ -84,7 +84,7 @@ void engine::init( const bool _has_gui )
s_ladspaManager = new ladspa2LMMS;
s_projectJournal->setJournalling( TRUE );
s_projectJournal->setJournalling( true );
s_mixer->initDevices();

View File

@@ -27,7 +27,7 @@
#include "ladspa_2_lmms.h"
ladspa2LMMS::ladspa2LMMS( void )
ladspa2LMMS::ladspa2LMMS()
{
l_sortable_plugin_t plugins = getSortedPlugins();

View File

@@ -35,7 +35,7 @@
ladspaManager::ladspaManager( void )
ladspaManager::ladspaManager()
{
QStringList ladspaDirectories = QString( getenv( "LADSPA_PATH" ) ).
split( ',' );
@@ -72,7 +72,7 @@ ladspaManager::ladspaManager( void )
QLibrary plugin_lib( f.absoluteFilePath() );
if( plugin_lib.load() == TRUE )
if( plugin_lib.load() == true )
{
LADSPA_Descriptor_Function descriptorFunction =
( LADSPA_Descriptor_Function ) plugin_lib.resolve(
@@ -269,7 +269,7 @@ bool ladspaManager::hasRealTimeDependency(
}
else
{
return( FALSE );
return( false );
}
}
@@ -289,7 +289,7 @@ bool ladspaManager::isInplaceBroken( const ladspa_key_t & _plugin )
}
else
{
return( FALSE );
return( false );
}
}
@@ -310,7 +310,7 @@ bool ladspaManager::isRealTimeCapable(
}
else
{
return( FALSE );
return( false );
}
}
@@ -414,7 +414,7 @@ bool ladspaManager::isPortInput( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -438,7 +438,7 @@ bool ladspaManager::isPortOutput( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -462,7 +462,7 @@ bool ladspaManager::isPortAudio( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -486,7 +486,7 @@ bool ladspaManager::isPortControl( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -511,7 +511,7 @@ bool ladspaManager::areHintsSampleRateDependent(
}
else
{
return( FALSE );
return( false );
}
}
@@ -596,7 +596,7 @@ bool ladspaManager::isPortToggled( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -707,7 +707,7 @@ bool ladspaManager::isLogarithmic( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -731,7 +731,7 @@ bool ladspaManager::isInteger( const ladspa_key_t & _plugin,
}
else
{
return( FALSE );
return( false );
}
}
@@ -843,10 +843,10 @@ bool ladspaManager::connectPort( const ladspa_key_t & _plugin,
{
( descriptor->connect_port )
( _instance, _port, _data_location );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}
@@ -865,10 +865,10 @@ bool ladspaManager::activate( const ladspa_key_t & _plugin,
if( descriptor->activate != NULL )
{
( descriptor->activate ) ( _instance );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}
@@ -888,10 +888,10 @@ bool ladspaManager::run( const ladspa_key_t & _plugin,
if( descriptor->run != NULL )
{
( descriptor->run ) ( _instance, _sample_count );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}
@@ -912,10 +912,10 @@ bool ladspaManager::runAdding( const ladspa_key_t & _plugin,
descriptor->set_run_adding_gain != NULL )
{
( descriptor->run_adding ) ( _instance, _sample_count );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}
@@ -937,10 +937,10 @@ bool ladspaManager::setRunAddingGain( const ladspa_key_t & _plugin,
{
( descriptor->set_run_adding_gain )
( _instance, _gain );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}
@@ -959,10 +959,10 @@ bool ladspaManager::deactivate( const ladspa_key_t & _plugin,
if( descriptor->deactivate != NULL )
{
( descriptor->deactivate ) ( _instance );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}
@@ -981,8 +981,8 @@ bool ladspaManager::cleanup( const ladspa_key_t & _plugin,
if( descriptor->cleanup != NULL )
{
( descriptor->cleanup ) ( _instance );
return( TRUE );
return( true );
}
}
return( FALSE );
return( false );
}

View File

@@ -63,7 +63,7 @@ float MidiController::value( int _offset )
void MidiController::updateName( void )
void MidiController::updateName()
{
setName( QString("MIDI ch%1 ctrl%2").
arg( m_midiPort.inputChannel() ).
@@ -137,7 +137,7 @@ void MidiController::loadSettings( const QDomElement & _this )
QString MidiController::nodeName( void ) const
QString MidiController::nodeName() const
{
return( "Midicontroller" );
}

View File

@@ -263,7 +263,7 @@ void multimediaProject::cleanMetaNodes( QDomElement _de )
void multimediaProject::upgrade( void )
void multimediaProject::upgrade()
{
projectVersion version =
documentElement().attribute( "creatorversion" ).

View File

@@ -50,8 +50,8 @@ note::note( const midiTime & _length, const midiTime & _pos,
m_pos( _pos ),
m_detuning( NULL )
{
//saveJournallingState( FALSE );
// setJournalling( FALSE );
//saveJournallingState( false );
// setJournalling( false );
if( _detuning )
{
m_detuning = sharedObject::ref( _detuning );
@@ -221,7 +221,7 @@ void note::loadSettings( const QDomElement & _this )
/*void note::undoStep( journalEntry & _je )
{
saveJournallingState( FALSE );
saveJournallingState( false );
switch( static_cast<Actions>( _je.actionID() ) )
{
case ChangeKey:
@@ -259,7 +259,7 @@ void note::redoStep( journalEntry & _je )
void note::editDetuningPattern( void )
void note::editDetuningPattern()
{
m_detuning->getAutomationPattern()->openInAutomationEditor();
}
@@ -267,7 +267,7 @@ void note::editDetuningPattern( void )
void note::createDetuning( void )
void note::createDetuning()
{
m_detuning = new detuningHelper;
(void) m_detuning->getAutomationPattern();
@@ -277,7 +277,7 @@ void note::createDetuning( void )
bool note::hasDetuningInfo( void ) const
bool note::hasDetuningInfo() const
{
return m_detuning && m_detuning->hasAutomation();
}

View File

@@ -140,7 +140,7 @@ void samplePlayHandle::play( sampleFrame * _working_buffer )
bool samplePlayHandle::done( void ) const
bool samplePlayHandle::done() const
{
return( framesDone() >= totalFrames() && m_doneMayReturnTrue == true );
}
@@ -156,7 +156,7 @@ bool samplePlayHandle::isFromTrack( const track * _track ) const
f_cnt_t samplePlayHandle::totalFrames( void ) const
f_cnt_t samplePlayHandle::totalFrames() const
{
return( ( m_sampleBuffer->endFrame() - m_sampleBuffer->startFrame() ) *
( engine::getMixer()->processingSampleRate() /

View File

@@ -84,7 +84,7 @@ void sampleRecordHandle::play( sampleFrame * /*_working_buffer*/ )
bool sampleRecordHandle::done( void ) const
bool sampleRecordHandle::done() const
{
return false;
}
@@ -100,7 +100,7 @@ bool sampleRecordHandle::isFromTrack( const track * _track ) const
f_cnt_t sampleRecordHandle::framesRecorded( void ) const
f_cnt_t sampleRecordHandle::framesRecorded() const
{
return( m_framesRecorded );
}

View File

@@ -53,7 +53,7 @@ timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt,
m_autoScroll( AutoScrollEnabled ),
m_loopPoints( LoopPointsDisabled ),
m_behaviourAtStop( BackToZero ),
m_changedPosition( TRUE ),
m_changedPosition( true ),
m_xOffset( _xoff ),
m_posMarkerX( 0 ),
m_ppt( _ppt ),
@@ -182,7 +182,7 @@ void timeLine::updatePosition( const midiTime & )
if( new_x != m_posMarkerX )
{
m_posMarkerX = new_x;
m_changedPosition = TRUE;
m_changedPosition = true;
emit positionChanged( m_pos );
update();
}

View File

@@ -225,7 +225,7 @@ DummyTrackContainer::DummyTrackContainer() :
trackContainer(),
m_dummyInstrumentTrack( NULL )
{
setJournalling( FALSE );
setJournalling( false );
m_dummyInstrumentTrack = dynamic_cast<InstrumentTrack *>(
track::create( track::InstrumentTrack,
this ) );

View File

@@ -228,7 +228,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
setModel( _model );
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(),
embed::getIconPixmap( "lfo_controller_artwork" ) );
@@ -278,7 +278,7 @@ void lfoControllerDialog::paintEvent( QPaintEvent * _pe )
*/
void LfoControllerDialog::modelChanged( void )
void LfoControllerDialog::modelChanged()
{
m_lfo = castModel<LfoController>();

View File

@@ -70,7 +70,7 @@ PeakControllerDialog::~PeakControllerDialog()
/*
void effectView::displayHelp( void )
void effectView::displayHelp()
{
QWhatsThis::showText( mapToGlobal( rect().bottomRight() ),
whatsThis() );
@@ -79,10 +79,10 @@ void effectView::displayHelp( void )
void effectView::closeEffects( void )
void effectView::closeEffects()
{
m_subWindow->hide();
m_show = TRUE;
m_show = true;
}
*/
@@ -101,7 +101,7 @@ void PeakControllerDialog::paintEvent( QPaintEvent * )
void PeakControllerDialog::modelChanged( void )
void PeakControllerDialog::modelChanged()
{
m_peakController = castModel<PeakController>();
}

View File

@@ -72,7 +72,7 @@ QPixmap * automationEditor::s_toolSelect = NULL;
QPixmap * automationEditor::s_toolMove = NULL;
automationEditor::automationEditor( void ) :
automationEditor::automationEditor() :
QWidget(),
m_zoomingXModel(),
m_zoomingYModel(),
@@ -450,7 +450,7 @@ inline void automationEditor::drawValueRect( QPainter & _p,
void automationEditor::removeSelection( void )
void automationEditor::removeSelection()
{
m_selectStartTick = 0;
m_selectedTick = 0;
@@ -1670,7 +1670,7 @@ float automationEditor::getLevel( int _y )
inline bool automationEditor::inBBEditor( void )
inline bool automationEditor::inBBEditor()
{
return( m_pattern->getTrack()->getTrackContainer()
== engine::getBBTrackContainer() );
@@ -1679,7 +1679,7 @@ inline bool automationEditor::inBBEditor( void )
void automationEditor::play( void )
void automationEditor::play()
{
if( validPattern() == FALSE )
{
@@ -1753,7 +1753,7 @@ void automationEditor::play( void )
void automationEditor::stop( void )
void automationEditor::stop()
{
if( !validPattern() )
{
@@ -1795,7 +1795,7 @@ void automationEditor::verScrolled( int _new_pos )
void automationEditor::drawButtonToggled( void )
void automationEditor::drawButtonToggled()
{
m_editMode = DRAW;
removeSelection();
@@ -1805,7 +1805,7 @@ void automationEditor::drawButtonToggled( void )
void automationEditor::eraseButtonToggled( void )
void automationEditor::eraseButtonToggled()
{
m_editMode = ERASE;
removeSelection();
@@ -1815,7 +1815,7 @@ void automationEditor::eraseButtonToggled( void )
void automationEditor::selectButtonToggled( void )
void automationEditor::selectButtonToggled()
{
m_editMode = SELECT;
removeSelection();
@@ -1825,7 +1825,7 @@ void automationEditor::selectButtonToggled( void )
void automationEditor::moveButtonToggled( void )
void automationEditor::moveButtonToggled()
{
m_editMode = MOVE;
m_selValuesForMove.clear();
@@ -1836,7 +1836,7 @@ void automationEditor::moveButtonToggled( void )
void automationEditor::selectAll( void )
void automationEditor::selectAll()
{
if( validPattern() == FALSE )
{
@@ -1918,7 +1918,7 @@ void automationEditor::getSelectedValues( timeMap & _selected_values )
void automationEditor::copySelectedValues( void )
void automationEditor::copySelectedValues()
{
m_valuesToCopy.clear();
@@ -1942,7 +1942,7 @@ void automationEditor::copySelectedValues( void )
void automationEditor::cutSelectedValues( void )
void automationEditor::cutSelectedValues()
{
if( validPattern() == FALSE )
{
@@ -1973,7 +1973,7 @@ void automationEditor::cutSelectedValues( void )
void automationEditor::pasteValues( void )
void automationEditor::pasteValues()
{
if( validPattern() == FALSE )
{
@@ -2000,7 +2000,7 @@ void automationEditor::pasteValues( void )
void automationEditor::deleteSelectedValues( void )
void automationEditor::deleteSelectedValues()
{
if( validPattern() == FALSE )
{
@@ -2056,7 +2056,7 @@ void automationEditor::updatePosition( const midiTime & _t )
void automationEditor::zoomingXChanged( void )
void automationEditor::zoomingXChanged()
{
const QString & zfac = m_zoomingXModel.currentText();
m_ppt = zfac.left( zfac.length() - 1 ).toInt() * DEFAULT_PPT / 100;
@@ -2070,7 +2070,7 @@ void automationEditor::zoomingXChanged( void )
void automationEditor::zoomingYChanged( void )
void automationEditor::zoomingYChanged()
{
const QString & zfac = m_zoomingYModel.currentText();
m_y_auto = zfac == "Auto";
@@ -2088,7 +2088,7 @@ void automationEditor::zoomingYChanged( void )
int automationEditor::quantization( void ) const
int automationEditor::quantization() const
{
return( DefaultTicksPerTact /
m_quantizeComboBox->model()->currentText().right(
@@ -2099,7 +2099,7 @@ int automationEditor::quantization( void ) const
void automationEditor::updateTopBottomLevels( void )
void automationEditor::updateTopBottomLevels()
{
if( m_y_auto )
{
@@ -2146,7 +2146,7 @@ void automationEditor::updateTopBottomLevels( void )
void automationEditor::update( void )
void automationEditor::update()
{
QWidget::update();
// Note detuning?

View File

@@ -45,7 +45,7 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) :
m_toolBar = new QWidget;
m_toolBar->setFixedHeight( 32 );
m_toolBar->move( 0, 0 );
m_toolBar->setAutoFillBackground( TRUE );
m_toolBar->setAutoFillBackground( true );
QPalette pal;
pal.setBrush( m_toolBar->backgroundRole(),
embed::getIconPixmap( "toolbar_bg" ) );
@@ -113,7 +113,7 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) :
tb_layout->addSpacing( 15 );
engine::mainWindow()->workspace()->addSubWindow( this );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false );
parentWidget()->layout()->setSizeConstraint( QLayout::SetMinimumSize );
parentWidget()->resize( minimumWidth(), 300 );
parentWidget()->move( 610, 5 );
@@ -147,7 +147,7 @@ void bbEditor::removeBBView( int _bb )
void bbEditor::play( void )
void bbEditor::play()
{
if( engine::getSong()->isPlaying() )
{
@@ -181,7 +181,7 @@ void bbEditor::play( void )
void bbEditor::stop( void )
void bbEditor::stop()
{
engine::getSong()->stop();
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
@@ -191,7 +191,7 @@ void bbEditor::stop( void )
void bbEditor::updatePosition( void )
void bbEditor::updatePosition()
{
//realignTracks();
emit positionChanged( m_currentPosition );
@@ -200,7 +200,7 @@ void bbEditor::updatePosition( void )
void bbEditor::addAutomationTrack( void )
void bbEditor::addAutomationTrack()
{
(void) track::create( track::AutomationTrack, model() );
}

View File

@@ -74,7 +74,7 @@ void positionLine::paintEvent( QPaintEvent * _pe )
songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
trackContainerView( _song ),
m_s( _song ),
m_scrollBack( FALSE )
m_scrollBack( false )
{
_engine_ptr = this;
@@ -222,7 +222,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
// create own toolbar
m_toolBar = new QWidget( this );
m_toolBar->setFixedHeight( 32 );
m_toolBar->setAutoFillBackground( TRUE );
m_toolBar->setAutoFillBackground( true );
QPalette pal;
pal.setBrush( m_toolBar->backgroundRole(),
embed::getIconPixmap( "toolbar_bg" ) );
@@ -286,19 +286,19 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
"edit_draw" ),
tr( "Draw mode" ),
NULL, NULL, m_toolBar );
m_drawModeButton->setCheckable( TRUE );
m_drawModeButton->setChecked( TRUE );
m_drawModeButton->setCheckable( true );
m_drawModeButton->setChecked( true );
m_editModeButton = new toolButton( embed::getIconPixmap(
"edit_select" ),
tr( "Edit mode (select and move)" ),
NULL, NULL, m_toolBar );
m_editModeButton->setCheckable( TRUE );
m_editModeButton->setCheckable( true );
QButtonGroup * tool_button_group = new QButtonGroup( this );
tool_button_group->addButton( m_drawModeButton );
tool_button_group->addButton( m_editModeButton );
tool_button_group->setExclusive( TRUE );
tool_button_group->setExclusive( true );
#if 0
#warning TODO
@@ -338,7 +338,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
m_zoomingComboBox->model()->setInitValue(
m_zoomingComboBox->model()->findText( "100%" ) );
connect( m_zoomingComboBox->model(), SIGNAL( dataChanged() ),
this, SLOT( zoomingChanged( void ) ) );
this, SLOT( zoomingChanged() ) );
tb_layout->addSpacing( 5 );
@@ -375,7 +375,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
engine::mainWindow()->workspace()->addSubWindow( this );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false );
parentWidget()->resize( 600, 300 );
parentWidget()->move( 5, 5 );
parentWidget()->show();
@@ -410,7 +410,7 @@ void songEditor::scrolled( int _new_pos )
void songEditor::play( void )
void songEditor::play()
{
m_s->play();
engine::getPianoRoll()->stopRecording();
@@ -427,7 +427,7 @@ void songEditor::play( void )
void songEditor::record( void )
void songEditor::record()
{
m_s->record();
}
@@ -435,7 +435,7 @@ void songEditor::record( void )
void songEditor::recordAccompany( void )
void songEditor::recordAccompany()
{
m_s->playAndRecord();
}
@@ -443,7 +443,7 @@ void songEditor::recordAccompany( void )
void songEditor::stop( void )
void songEditor::stop()
{
m_s->stop();
engine::getPianoRoll()->stopRecording();
@@ -647,7 +647,7 @@ void songEditor::updatePosition( const midiTime & _t )
{
if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong
&& m_timeLine->autoScroll() == timeLine::AutoScrollEnabled) ||
m_scrollBack == TRUE )
m_scrollBack == true )
{
const int w = width() - DEFAULT_SETTINGS_WIDGET_WIDTH
- TRACK_OP_WIDTH;
@@ -664,7 +664,7 @@ void songEditor::updatePosition( const midiTime & _t )
0 );
m_leftRightScroll->setValue( t.getTact() );
}
m_scrollBack = FALSE;
m_scrollBack = false;
}
const int x = m_s->m_playPos[song::Mode_PlaySong].m_timeLine->
@@ -685,7 +685,7 @@ void songEditor::updatePosition( const midiTime & _t )
void songEditor::zoomingChanged( void )
void songEditor::zoomingChanged()
{
const QString & zfac = m_zoomingComboBox->model()->currentText();
setPixelsPerTact( zfac.left( zfac.length() - 1 ).toInt() *
@@ -698,7 +698,7 @@ void songEditor::zoomingChanged( void )
bool songEditor::allowRubberband( void ) const
bool songEditor::allowRubberband() const
{
return( m_editModeButton->isChecked() );
}

View File

@@ -63,11 +63,11 @@ ControllerRackView::ControllerRackView( ) :
QWidget * w = new QWidget();
m_scrollArea->setWidget( w );
connect( m_addButton, SIGNAL( clicked( void ) ),
this, SLOT( addController( void ) ) );
connect( m_addButton, SIGNAL( clicked() ),
this, SLOT( addController() ) );
connect( engine::getSong(), SIGNAL( dataChanged( void ) ),
this, SLOT( update( void ) ) );
connect( engine::getSong(), SIGNAL( dataChanged() ),
this, SLOT( update() ) );
QVBoxLayout * layout = new QVBoxLayout();
layout->addWidget( m_scrollArea );
@@ -85,7 +85,7 @@ ControllerRackView::ControllerRackView( ) :
subWin->layout()->setSizeConstraint( QLayout::SetMaximumSize );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false );
parentWidget()->move( 880, 310 );
}
@@ -132,7 +132,7 @@ void ControllerRackView::deleteController( ControllerView * _view )
void ControllerRackView::update( void )
void ControllerRackView::update()
{
QWidget * w = m_scrollArea->widget();
song * s = engine::getSong();
@@ -167,7 +167,7 @@ void ControllerRackView::update( void )
}
void ControllerRackView::addController( void )
void ControllerRackView::addController()
{
// TODO: Eventually let the user pick from available controller types

View File

@@ -294,7 +294,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) :
tr( "control envelope-amount by this LFO" ) );
setAcceptDrops( TRUE );
setAcceptDrops( true );
}
@@ -339,7 +339,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me )
}
if( QRect( ENV_GRAPH_X, ENV_GRAPH_Y, s_envGraph->width(),
s_envGraph->height() ).contains( _me->pos() ) == TRUE )
s_envGraph->height() ).contains( _me->pos() ) == true )
{
if( m_amountKnob->value<float>() < 1.0f )
{
@@ -351,7 +351,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me )
}
}
else if( QRect( LFO_GRAPH_X, LFO_GRAPH_Y, s_lfoGraph->width(),
s_lfoGraph->height() ).contains( _me->pos() ) == TRUE )
s_lfoGraph->height() ).contains( _me->pos() ) == true )
{
if( m_lfoAmountKnob->value<float>() < 1.0f )
{
@@ -385,7 +385,7 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
{
m_params->m_userWave.setAudioFile(
stringPairDrag::decodeValue( _de ) );
m_userLfoBtn->model()->setValue( TRUE );
m_userLfoBtn->model()->setValue( true );
_de->accept();
}
else if( type == QString( "tco_%1" ).arg( track::SampleTrack ) )
@@ -394,7 +394,7 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
m_params->m_userWave.setAudioFile(
mmp.content().firstChild().toElement().
attribute( "src" ) );
m_userLfoBtn->model()->setValue( TRUE );
m_userLfoBtn->model()->setValue( true );
_de->accept();
}
}

View File

@@ -88,7 +88,7 @@ ChordCreatorView::~ChordCreatorView()
void ChordCreatorView::modelChanged( void )
void ChordCreatorView::modelChanged()
{
m_cc = castModel<ChordCreator>();
m_chordsGroupBox->setModel( &m_cc->m_chordsEnabledModel );
@@ -187,7 +187,7 @@ ArpeggiatorView::~ArpeggiatorView()
void ArpeggiatorView::modelChanged( void )
void ArpeggiatorView::modelChanged()
{
m_a = castModel<Arpeggiator>();
m_arpGroupBox->setModel( &m_a->m_arpEnabledModel );

View File

@@ -129,7 +129,7 @@ InstrumentSoundShapingView::~InstrumentSoundShapingView()
void InstrumentSoundShapingView::modelChanged( void )
void InstrumentSoundShapingView::modelChanged()
{
m_ss = castModel<InstrumentSoundShaping>();
m_filterGroupBox->setModel( &m_ss->m_filterEnabledModel );

View File

@@ -32,7 +32,7 @@ captionMenu::captionMenu( const QString & _title, QWidget * _parent ) :
QMenu( _title, _parent )
{
QAction * caption = addAction( _title );
caption->setEnabled( FALSE );
caption->setEnabled( false );
}

View File

@@ -38,7 +38,7 @@ cpuloadWidget::cpuloadWidget( QWidget * _parent ) :
m_temp(),
m_background( embed::getIconPixmap( "cpuload_bg" ) ),
m_leds( embed::getIconPixmap( "cpuload_leds" ) ),
m_changed( TRUE ),
m_changed( true ),
m_updateTimer()
{
setAttribute( Qt::WA_OpaquePaintEvent, true );
@@ -63,9 +63,9 @@ cpuloadWidget::~cpuloadWidget()
void cpuloadWidget::paintEvent( QPaintEvent * )
{
if( m_changed == TRUE )
if( m_changed == true )
{
m_changed = FALSE;
m_changed = false;
QPainter p( &m_temp );
p.drawPixmap( 0, 0, m_background );
@@ -94,7 +94,7 @@ void cpuloadWidget::updateCpuLoad()
if( new_load != m_currentLoad )
{
m_currentLoad = new_load;
m_changed = TRUE;
m_changed = true;
update();
}
}

View File

@@ -58,7 +58,7 @@ fadeButton::~fadeButton()
void fadeButton::activate( void )
void fadeButton::activate()
{
m_stateTimer.restart();
signalUpdate();
@@ -110,7 +110,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
void fadeButton::signalUpdate( void )
void fadeButton::signalUpdate()
{
QApplication::postEvent( this, new updateEvent() );
}

View File

@@ -192,7 +192,7 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me )
void lcdSpinBox::update( void )
void lcdSpinBox::update()
{
QString s = m_textForValue[model()->value()];
if( s == "" )

View File

@@ -43,7 +43,7 @@ ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent,
automatableButton( _parent, _name ),
m_text( _text )
{
setCheckable( TRUE );
setCheckable( true );
if( _color >= NumColors || _color < Yellow )
{
@@ -76,7 +76,7 @@ void ledCheckBox::paintEvent( QPaintEvent * )
QPainter p( this );
p.setFont( pointSize<7>( font() ) );
if( model()->value() == TRUE )
if( model()->value() == true )
{
p.drawPixmap( 0, 0, *m_ledOnPixmap );
}

View File

@@ -37,10 +37,10 @@ pixmapButton::pixmapButton( QWidget * _parent, const QString & _name ) :
automatableButton( _parent, _name ),
m_activePixmap(),
m_inactivePixmap(),
m_pressed( FALSE )
m_pressed( false )
{
setActiveGraphic( embed::getIconPixmap( "led_yellow" ) );
setInactiveGraphic( embed::getIconPixmap( "led_off" ), FALSE );
setInactiveGraphic( embed::getIconPixmap( "led_off" ), false );
}
@@ -79,7 +79,7 @@ void pixmapButton::mousePressEvent( QMouseEvent * _me )
// Show pressing graphics if this isn't checkable
if( !isCheckable() )
{
m_pressed = TRUE;
m_pressed = true;
update();
}
@@ -95,7 +95,7 @@ void pixmapButton::mouseReleaseEvent( QMouseEvent * _me )
if( !isCheckable() )
{
m_pressed = FALSE;
m_pressed = false;
update();
}
}

View File

@@ -44,7 +44,7 @@
projectNotes::projectNotes( void ) :
projectNotes::projectNotes() :
QMainWindow( engine::mainWindow()->workspace() )
{
m_edit = new QTextEdit( this );
@@ -87,7 +87,7 @@ projectNotes::~projectNotes()
void projectNotes::clear( void )
void projectNotes::clear()
{
m_edit->setHtml( tr( "Put down your project notes here." ) );
m_edit->selectAll();
@@ -147,7 +147,7 @@ void projectNotes::setupActions()
tb = addToolBar( tr( "Format Actions" ) );
m_comboFont = new QComboBox( tb );
m_comboFont->setEditable( TRUE );
m_comboFont->setEditable( true );
QFontDatabase db;
m_comboFont->addItems( db.families() );
connect( m_comboFont, SIGNAL( activated( const QString & ) ),
@@ -155,7 +155,7 @@ void projectNotes::setupActions()
m_comboFont->lineEdit()->setText( QApplication::font().family() );
m_comboSize = new QComboBox( tb );
m_comboSize->setEditable( TRUE );
m_comboSize->setEditable( true );
QList<int> sizes = db.standardSizes();
QList<int>::Iterator it = sizes.begin();
for ( ; it != sizes.end(); ++it )
@@ -170,14 +170,14 @@ void projectNotes::setupActions()
m_actionTextBold = new QAction( embed::getIconPixmap( "text_bold" ),
tr( "&Bold" ), this );
m_actionTextBold->setShortcut( tr( "Ctrl+B" ) );
m_actionTextBold->setCheckable( TRUE );
m_actionTextBold->setCheckable( true );
connect( m_actionTextBold, SIGNAL( triggered() ), this,
SLOT( textBold() ) );
m_actionTextItalic = new QAction( embed::getIconPixmap( "text_italic" ),
tr( "&Italic" ), this );
m_actionTextItalic->setShortcut( tr( "Ctrl+I" ) );
m_actionTextItalic->setCheckable( TRUE );
m_actionTextItalic->setCheckable( true );
connect( m_actionTextItalic, SIGNAL( triggered() ), this,
SLOT( textItalic() ) );
@@ -185,7 +185,7 @@ void projectNotes::setupActions()
"text_under" ),
tr( "&Underline" ), this );
m_actionTextUnderline->setShortcut( tr( "Ctrl+U" ) );
m_actionTextUnderline->setCheckable( TRUE );
m_actionTextUnderline->setCheckable( true );
connect( m_actionTextUnderline, SIGNAL( triggered() ), this,
SLOT( textUnderline() ) );
@@ -197,7 +197,7 @@ void projectNotes::setupActions()
m_actionAlignLeft = new QAction( embed::getIconPixmap( "text_left" ),
tr( "&Left" ), m_edit );
m_actionAlignLeft->setShortcut( tr( "Ctrl+L" ) );
m_actionAlignLeft->setCheckable( TRUE );
m_actionAlignLeft->setCheckable( true );
grp->addAction( m_actionAlignLeft );
m_actionAlignCenter = new QAction( embed::getIconPixmap(
@@ -205,21 +205,21 @@ void projectNotes::setupActions()
tr( "C&enter" ), m_edit );
m_actionAlignCenter->setShortcutContext( Qt::WidgetShortcut );
m_actionAlignCenter->setShortcut( tr( "Ctrl+E" ) );
m_actionAlignCenter->setCheckable( TRUE );
m_actionAlignCenter->setCheckable( true );
grp->addAction( m_actionAlignCenter );
m_actionAlignRight = new QAction( embed::getIconPixmap( "text_right" ),
tr( "&Right" ), m_edit );
m_actionAlignRight->setShortcutContext( Qt::WidgetShortcut );
m_actionAlignRight->setShortcut( tr( "Ctrl+R" ) );
m_actionAlignRight->setCheckable( TRUE );
m_actionAlignRight->setCheckable( true );
grp->addAction( m_actionAlignRight );
m_actionAlignJustify = new QAction( embed::getIconPixmap(
"text_block" ),
tr( "&Justify" ), m_edit );
m_actionAlignJustify->setShortcut( tr( "Ctrl+J" ) );
m_actionAlignJustify->setCheckable( TRUE );
m_actionAlignJustify->setCheckable( true );
grp->addAction( m_actionAlignJustify );
@@ -356,19 +356,19 @@ void projectNotes::alignmentChanged( int _a )
{
if ( _a & Qt::AlignLeft )
{
m_actionAlignLeft->setChecked( TRUE );
m_actionAlignLeft->setChecked( true );
}
else if ( ( _a & Qt::AlignHCenter ) )
{
m_actionAlignCenter->setChecked( TRUE );
m_actionAlignCenter->setChecked( true );
}
else if ( ( _a & Qt::AlignRight ) )
{
m_actionAlignRight->setChecked( TRUE );
m_actionAlignRight->setChecked( true );
}
else if ( ( _a & Qt::AlignJustify ) )
{
m_actionAlignJustify->setChecked( TRUE );
m_actionAlignJustify->setChecked( true );
}
engine::getSong()->setModified();
}

View File

@@ -43,13 +43,13 @@ rubberBand::~rubberBand()
QVector<selectableObject *> rubberBand::selectedObjects( void ) const
QVector<selectableObject *> rubberBand::selectedObjects() const
{
QVector<selectableObject *> so = selectableObjects();
for( QVector<selectableObject *>::iterator it = so.begin();
it != so.end(); )
{
if( ( *it )->isSelected() == FALSE )
if( ( *it )->isSelected() == false )
{
so.erase( it );
}
@@ -81,7 +81,7 @@ void rubberBand::resizeEvent( QResizeEvent * _re )
QVector<selectableObject *> rubberBand::selectableObjects( void ) const
QVector<selectableObject *> rubberBand::selectableObjects() const
{
QVector<selectableObject *> so;
if( parentWidget() == NULL )

View File

@@ -62,7 +62,7 @@ void sideBarWidget::paintEvent( QPaintEvent * )
p.fillRect( 0, 0, width(), 27, palette().highlight().color() );
QFont f = p.font();
f.setBold( TRUE );
f.setBold( true );
p.setFont( pointSize<TITLE_FONT_HEIGHT>( f ) );
p.setPen( palette().highlightedText().color() );

View File

@@ -33,7 +33,7 @@
tabBar::tabBar( QWidget * _parent, QBoxLayout::Direction _dir ) :
QWidget( _parent ),
m_layout( new QBoxLayout( _dir, this ) ),
m_exclusive( FALSE )
m_exclusive( false )
{
m_layout->setMargin( 8 );
m_layout->setSpacing( 0 );
@@ -119,7 +119,7 @@ void tabBar::removeTab( int _id )
void tabBar::setActiveTab( int _id )
{
setTabState( _id, TRUE );
setTabState( _id, true );
hideAll( _id );
if( allHidden() )
{
@@ -134,12 +134,12 @@ void tabBar::setActiveTab( int _id )
int tabBar::activeTab( void )
int tabBar::activeTab()
{
QMap<int, QPair<tabButton *, QWidget *> >::iterator it;
for( it = m_tabs.begin(); it != m_tabs.end(); ++it )
{
if( tabState( it.key() ) == TRUE )
if( tabState( it.key() ) == true )
{
return( it.key() );
}
@@ -154,7 +154,7 @@ bool tabBar::tabState( int _id )
{
if( m_tabs.find( _id ) == m_tabs.end() )
{
return( FALSE );
return( false );
}
return( m_tabs[_id].first->isChecked() );
}
@@ -180,7 +180,7 @@ void tabBar::hideAll( int _exception )
{
if( it.key() != _exception )
{
setTabState( it.key(), FALSE );
setTabState( it.key(), false );
}
it.value().second->hide();
}
@@ -202,7 +202,7 @@ void tabBar::hideAll( int _exception )
void tabBar::tabClicked( int _id )
{
if( m_exclusive == TRUE && activeTab() == -1 )
if( m_exclusive == true && activeTab() == -1 )
{
setActiveTab( _id );
}
@@ -212,11 +212,11 @@ void tabBar::tabClicked( int _id )
// disable tabbar-buttons except the one clicked
hideAll( _id );
bool now_hidden = allHidden();
if( all_hidden_before == TRUE && now_hidden == FALSE )
if( all_hidden_before == true && now_hidden == false )
{
emit widgetShown();
}
else if( all_hidden_before == FALSE && now_hidden == TRUE )
else if( all_hidden_before == false && now_hidden == true )
{
emit allWidgetsHidden();
}
@@ -226,17 +226,17 @@ void tabBar::tabClicked( int _id )
bool tabBar::allHidden( void )
bool tabBar::allHidden()
{
QMap<int, QPair<tabButton *, QWidget *> >::iterator it;
for( it = m_tabs.begin(); it != m_tabs.end(); ++it )
{
if( !it.value().second->isHidden() )
{
return( FALSE );
return( false );
}
}
return( TRUE );
return( true );
}

View File

@@ -33,7 +33,7 @@
textFloat::textFloat( void ) :
textFloat::textFloat() :
QWidget( engine::mainWindow(), Qt::ToolTip ),
m_title( "" ),
m_text( "" ),
@@ -101,7 +101,7 @@ textFloat * textFloat::displayMessage( const QString & _msg, int _timeout,
tf->show();
if( _timeout > 0 )
{
tf->setAttribute( Qt::WA_DeleteOnClose, TRUE );
tf->setAttribute( Qt::WA_DeleteOnClose, true );
QTimer::singleShot( _timeout, tf, SLOT( close() ) );
}
return( tf );
@@ -145,14 +145,14 @@ void textFloat::paintEvent( QPaintEvent * _pe )
else
{
int text_x = 2;
if( m_pixmap.isNull() == FALSE )
if( m_pixmap.isNull() == false )
{
p.drawPixmap( 5, 5, m_pixmap );
text_x += m_pixmap.width() + 8;
}
p.drawText( text_x, 28, m_text );
QFont f = p.font();
f.setBold( TRUE );
f.setBold( true );
p.setFont( f );
p.drawText( text_x, 12, m_title );
}
@@ -169,14 +169,14 @@ void textFloat::mousePressEvent( QMouseEvent * )
void textFloat::updateSize( void )
void textFloat::updateSize()
{
QFontMetrics metrics( pointSize<8>( font() ) );
QRect textBound = metrics.boundingRect( m_text );
if( m_title != "" )
{
QFont f = pointSize<8>( font() );
f.setBold( TRUE );
f.setBold( true );
int title_w = QFontMetrics( f ).boundingRect( m_title ).width();
if( title_w > textBound.width() )
{
@@ -184,7 +184,7 @@ void textFloat::updateSize( void )
}
textBound.setHeight( textBound.height() * 2 + 14 );
}
if( m_pixmap.isNull() == FALSE )
if( m_pixmap.isNull() == false )
{
textBound.setWidth( textBound.width() + m_pixmap.width() + 10 );
}

View File

@@ -39,7 +39,7 @@ toolButton::toolButton( const QPixmap & _pixmap, const QString & _tooltip,
m_colorStandard( s_stdColor ),
m_colorHighlighted( s_hlColor )
{
setAutoFillBackground( FALSE );
setAutoFillBackground( false );
QPalette pal = palette();
pal.setColor( backgroundRole(), m_colorStandard );
pal.setColor( QPalette::Window, m_colorStandard );
@@ -94,7 +94,7 @@ void toolButton::leaveEvent( QEvent * )
void toolButton::toggledBool( bool _on )
{
if( _on == TRUE )
if( _on == true )
{
emit( clicked() );
}

View File

@@ -65,7 +65,7 @@ trackLabelButton::~trackLabelButton()
void trackLabelButton::rename( void )
void trackLabelButton::rename()
{
QString txt = m_trackView->getTrack()->name();
renameDialog rename_dlg( txt );

View File

@@ -67,7 +67,7 @@ visualizationWidget::~visualizationWidget()
void visualizationWidget::updateAudioBuffer( void )
void visualizationWidget::updateAudioBuffer()
{
if( !engine::getSong()->isExporting() )
{

View File

@@ -53,7 +53,7 @@ bbTCO::bbTCO( track * _track, unsigned int _color ) :
bbTrack::numOfBBTrack( getTrack() ) );
if( t > 0 )
{
saveJournallingState( FALSE );
saveJournallingState( false );
changeLength( midiTime( t, 0 ) );
restoreJournallingState();
}
@@ -177,7 +177,7 @@ void bbTCOView::paintEvent( QPaintEvent * )
{
col = QColor( 160, 160, 160 );
}
if( isSelected() == TRUE )
if( isSelected() == true )
{
col = QColor( qMax( col.red() - 128, 0 ),
qMax( col.green() - 128, 0 ), 255 );
@@ -221,7 +221,7 @@ void bbTCOView::paintEvent( QPaintEvent * )
void bbTCOView::openInBBEditor( void )
void bbTCOView::openInBBEditor()
{
engine::getBBTrackContainer()->setCurrentBB( bbTrack::numOfBBTrack(
m_bbTCO->getTrack() ) );
@@ -232,7 +232,7 @@ void bbTCOView::openInBBEditor( void )
void bbTCOView::resetName( void )
void bbTCOView::resetName()
{
m_bbTCO->setName( m_bbTCO->getTrack()->name() );
}
@@ -240,7 +240,7 @@ void bbTCOView::resetName( void )
void bbTCOView::changeName( void )
void bbTCOView::changeName()
{
QString s = m_bbTCO->name();
renameDialog rename_dlg( s );
@@ -251,7 +251,7 @@ void bbTCOView::changeName( void )
void bbTCOView::changeColor( void )
void bbTCOView::changeColor()
{
QColor _new_color = QColorDialog::getColor( m_bbTCO->m_color );
if( !_new_color.isValid() )
@@ -346,7 +346,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames,
{
if( isMuted() )
{
return( FALSE );
return( false );
}
if( _tco_num >= 0 )
@@ -362,7 +362,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames,
if( tcos.size() == 0 )
{
return( FALSE );
return( false );
}
midiTime lastPosition;
@@ -385,7 +385,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames,
_offset,
s_infoMap[this] ) );
}
return( FALSE );
return( false );
}
@@ -542,7 +542,7 @@ bbTrackView::bbTrackView( bbTrack * _bbt, trackContainerView * _tcv ) :
setFixedHeight( 32 );
// drag'n'drop with bb-tracks only causes troubles (and makes no sense
// too), so disable it
setAcceptDrops( FALSE );
setAcceptDrops( false );
m_trackLabel = new trackLabelButton( this, getTrackSettingsWidget() );
m_trackLabel->setIcon( embed::getIconPixmap( "bb_track" ) );
@@ -564,7 +564,7 @@ bbTrackView::~bbTrackView()
bool bbTrackView::close( void )
bool bbTrackView::close()
{
engine::getBBEditor()->removeBBView( bbTrack::s_infoMap[m_bbTrack] );
return( trackView::close() );
@@ -573,7 +573,7 @@ bool bbTrackView::close( void )
void bbTrackView::clickedTrackLabel( void )
void bbTrackView::clickedTrackLabel()
{
engine::getBBTrackContainer()->setCurrentBB(
bbTrack::numOfBBTrack( m_bbTrack ) );

View File

@@ -112,7 +112,7 @@ pattern::~pattern()
void pattern::init( void )
void pattern::init()
{
connect( engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
this, SLOT( changeTimeSignature() ) );
@@ -127,7 +127,7 @@ void pattern::init( void )
midiTime pattern::length( void ) const
midiTime pattern::length() const
{
if( m_patternType == BeatPattern )
{
@@ -152,7 +152,7 @@ midiTime pattern::length( void ) const
midiTime pattern::beatPatternLength( void ) const
midiTime pattern::beatPatternLength() const
{
tick_t max_length = midiTime::ticksPerTact();
@@ -266,7 +266,7 @@ note * pattern::rearrangeNote( const note * _note_to_proc,
void pattern::rearrangeAllNotes( void )
void pattern::rearrangeAllNotes()
{
// sort notes by start time
qSort(m_notes.begin(), m_notes.end(), note::lessThan );
@@ -274,7 +274,7 @@ void pattern::rearrangeAllNotes( void )
void pattern::clearNotes( void )
void pattern::clearNotes()
{
engine::getMixer()->lock();
for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end();
@@ -321,7 +321,7 @@ void pattern::setType( PatternTypes _new_pattern_type )
void pattern::checkType( void )
void pattern::checkType()
{
NoteVector::Iterator it = m_notes.begin();
while( it != m_notes.end() )
@@ -427,7 +427,7 @@ void pattern::loadSettings( const QDomElement & _this )
void pattern::clear( void )
void pattern::clear()
{
clearNotes();
ensureBeatNotes();
@@ -436,7 +436,7 @@ void pattern::clear( void )
void pattern::freeze( void )
void pattern::freeze()
{
if( engine::getSong()->isPlaying() )
{
@@ -464,7 +464,7 @@ void pattern::freeze( void )
void pattern::unfreeze( void )
void pattern::unfreeze()
{
if( m_frozenPattern != NULL )
{
@@ -477,7 +477,7 @@ void pattern::unfreeze( void )
void pattern::abortFreeze( void )
void pattern::abortFreeze()
{
m_freezeAborted = true;
}
@@ -531,7 +531,7 @@ trackContentObjectView * pattern::createView( trackView * _tv )
void pattern::ensureBeatNotes( void )
void pattern::ensureBeatNotes()
{
// make sure, that all step-note exist
for( int i = 0; i < m_steps; ++i )
@@ -561,7 +561,7 @@ void pattern::ensureBeatNotes( void )
void pattern::updateBBTrack( void )
void pattern::updateBBTrack()
{
if( getTrack()->getTrackContainer() == engine::getBBTrackContainer() )
{
@@ -572,7 +572,7 @@ void pattern::updateBBTrack( void )
bool pattern::empty( void )
bool pattern::empty()
{
for( NoteVector::ConstIterator it = m_notes.begin();
it != m_notes.end(); ++it )
@@ -588,7 +588,7 @@ bool pattern::empty( void )
void pattern::changeTimeSignature( void )
void pattern::changeTimeSignature()
{
midiTime last_pos = midiTime::ticksPerTact();
for( NoteVector::ConstIterator cit = m_notes.begin();
@@ -684,7 +684,7 @@ void patternFreezeStatusDialog::closeEvent( QCloseEvent * _ce )
void patternFreezeStatusDialog::cancelBtnClicked( void )
void patternFreezeStatusDialog::cancelBtnClicked()
{
emit( aborted() );
done( -1 );
@@ -693,7 +693,7 @@ void patternFreezeStatusDialog::cancelBtnClicked( void )
void patternFreezeStatusDialog::updateProgress( void )
void patternFreezeStatusDialog::updateProgress()
{
if( m_progress < 0 )
{
@@ -734,7 +734,7 @@ patternFreezeThread::~patternFreezeThread()
void patternFreezeThread::run( void )
void patternFreezeThread::run()
{
// create and install audio-sample-recorder
bool b;
@@ -866,7 +866,7 @@ patternView::~patternView()
void patternView::update( void )
void patternView::update()
{
m_needsUpdate = true;
m_pat->changeLength( m_pat->length() );
@@ -876,7 +876,7 @@ void patternView::update( void )
void patternView::openInPianoRoll( void )
void patternView::openInPianoRoll()
{
engine::getPianoRoll()->setCurrentPattern( m_pat );
engine::getPianoRoll()->parentWidget()->show();
@@ -886,7 +886,7 @@ void patternView::openInPianoRoll( void )
void patternView::resetName( void )
void patternView::resetName()
{
m_pat->setName( m_pat->m_instrumentTrack->name() );
}
@@ -894,7 +894,7 @@ void patternView::resetName( void )
void patternView::changeName( void )
void patternView::changeName()
{
QString s = m_pat->name();
renameDialog rename_dlg( s );