diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
index 5463fa482..dc463075c 100644
--- a/src/core/AutomatableModel.cpp
+++ b/src/core/AutomatableModel.cpp
@@ -480,8 +480,8 @@ void AutomatableModel::linkModel( AutomatableModel* model )
 
 		if( !model->hasLinkedModels() )
 		{
-			QObject::connect( this, SIGNAL( dataChanged() ),
-					model, SIGNAL( dataChanged() ), Qt::DirectConnection );
+			QObject::connect( this, SIGNAL(dataChanged()),
+					model, SIGNAL(dataChanged()), Qt::DirectConnection );
 		}
 	}
 }
@@ -552,9 +552,9 @@ void AutomatableModel::setControllerConnection( ControllerConnection* c )
 	m_controllerConnection = c;
 	if( c )
 	{
-		QObject::connect( m_controllerConnection, SIGNAL( valueChanged() ),
-				this, SIGNAL( dataChanged() ), Qt::DirectConnection );
-		QObject::connect( m_controllerConnection, SIGNAL( destroyed() ), this, SLOT( unlinkControllerConnection() ) );
+		QObject::connect( m_controllerConnection, SIGNAL(valueChanged()),
+				this, SIGNAL(dataChanged()), Qt::DirectConnection );
+		QObject::connect( m_controllerConnection, SIGNAL(destroyed()), this, SLOT(unlinkControllerConnection()));
 		m_valueChanged = true;
 		emit dataChanged();
 	}
diff --git a/src/core/AutomationClip.cpp b/src/core/AutomationClip.cpp
index feeed3fc2..f2cb211eb 100644
--- a/src/core/AutomationClip.cpp
+++ b/src/core/AutomationClip.cpp
@@ -134,8 +134,8 @@ bool AutomationClip::addObject( AutomatableModel * _obj, bool _search_dup )
 
 	m_objects += _obj;
 
-	connect( _obj, SIGNAL( destroyed( lmms::jo_id_t ) ),
-			this, SLOT( objectDestroyed( lmms::jo_id_t ) ),
+	connect( _obj, SIGNAL(destroyed(lmms::jo_id_t)),
+			this, SLOT(objectDestroyed(lmms::jo_id_t)),
 						Qt::DirectConnection );
 
 	emit dataChanged();
diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp
index a6402227f..c65cd8ae9 100644
--- a/src/core/ControllerConnection.cpp
+++ b/src/core/ControllerConnection.cpp
@@ -119,8 +119,8 @@ void ControllerConnection::setController( Controller * _controller )
 	if( _controller->type() != Controller::DummyController )
 	{
 		_controller->addConnection( this );
-		QObject::connect( _controller, SIGNAL( valueChanged() ),
-				this, SIGNAL( valueChanged() ), Qt::DirectConnection );
+		QObject::connect( _controller, SIGNAL(valueChanged()),
+				this, SIGNAL(valueChanged()), Qt::DirectConnection );
 	}
 
 	m_ownsController =
@@ -129,8 +129,8 @@ void ControllerConnection::setController( Controller * _controller )
 	// If we don't own the controller, allow deletion of controller
 	// to delete the connection
 	if( !m_ownsController ) {
-		QObject::connect( _controller, SIGNAL( destroyed() ),
-				this, SLOT( deleteConnection() ) );
+		QObject::connect( _controller, SIGNAL(destroyed()),
+				this, SLOT(deleteConnection()));
 	}
 }
 
diff --git a/src/core/EnvelopeAndLfoParameters.cpp b/src/core/EnvelopeAndLfoParameters.cpp
index b80b54946..55d200668 100644
--- a/src/core/EnvelopeAndLfoParameters.cpp
+++ b/src/core/EnvelopeAndLfoParameters.cpp
@@ -132,36 +132,36 @@ EnvelopeAndLfoParameters::EnvelopeAndLfoParameters(
 
 	instances()->add( this );
 
-	connect( &m_predelayModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_attackModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_holdModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_decayModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_sustainModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_releaseModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_amountModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
+	connect( &m_predelayModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_attackModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_holdModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_decayModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_sustainModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_releaseModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_amountModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
 
-	connect( &m_lfoPredelayModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_lfoAttackModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_lfoSpeedModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_lfoAmountModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_lfoWaveModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
-	connect( &m_x100Model, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleVars() ), Qt::DirectConnection );
+	connect( &m_lfoPredelayModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_lfoAttackModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_lfoSpeedModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_lfoAmountModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_lfoWaveModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
+	connect( &m_x100Model, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleVars()), Qt::DirectConnection );
 
-	connect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ),
-				this, SLOT( updateSampleVars() ) );
+	connect( Engine::audioEngine(), SIGNAL(sampleRateChanged()),
+				this, SLOT(updateSampleVars()));
 
 
 	m_lfoShapeData =
diff --git a/src/core/LadspaControl.cpp b/src/core/LadspaControl.cpp
index fb6ef9167..b166ccf9e 100644
--- a/src/core/LadspaControl.cpp
+++ b/src/core/LadspaControl.cpp
@@ -46,8 +46,8 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 {
 	if( m_link )
 	{
-		connect( &m_linkEnabledModel, SIGNAL( dataChanged() ),
-					 this, SLOT( linkStateChanged() ),
+		connect( &m_linkEnabledModel, SIGNAL(dataChanged()),
+					 this, SLOT(linkStateChanged()),
 					 Qt::DirectConnection );
 	}
 
@@ -56,8 +56,8 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 		case TOGGLED:
 			m_toggledModel.setInitValue(
 				static_cast<bool>( m_port->def ) );
-			connect( &m_toggledModel, SIGNAL( dataChanged() ),
-					 this, SLOT( ledChanged() ) );
+			connect( &m_toggledModel, SIGNAL(dataChanged()),
+					 this, SLOT(ledChanged()));
 			if( m_port->def == 1.0f )
 			{
 				m_toggledModel.setValue( true );
@@ -74,8 +74,8 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 							  m_port->min ) / 400 );
 			m_knobModel.setInitValue(
 					static_cast<int>( m_port->def ) );
-			connect( &m_knobModel, SIGNAL( dataChanged() ),
-						 this, SLOT( knobChanged() ) );
+			connect( &m_knobModel, SIGNAL(dataChanged()),
+						 this, SLOT(knobChanged()));
 			// TODO: careful: we must prevent saved scales
 			m_knobModel.setScaleLogarithmic( m_port->suggests_logscale );
 			break;
@@ -87,8 +87,8 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 					&& m_port->max == 10.0f ? 4000.0f :
 								( m_port->suggests_logscale ? 8000000.0f : 800000.0f ) ) );
 			m_knobModel.setInitValue( m_port->def );
-			connect( &m_knobModel, SIGNAL( dataChanged() ),
-						 this, SLOT( knobChanged() ) );
+			connect( &m_knobModel, SIGNAL(dataChanged()),
+						 this, SLOT(knobChanged()));
 			// TODO: careful: we must prevent saved scales
 			m_knobModel.setScaleLogarithmic( m_port->suggests_logscale );
 			break;
@@ -98,8 +98,8 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 					  ( m_port->max -
 						m_port->min ) / 800.0f );
 			m_tempoSyncKnobModel.setInitValue( m_port->def );
-			connect( &m_tempoSyncKnobModel, SIGNAL( dataChanged() ),
-					 this, SLOT( tempoKnobChanged() ) );
+			connect( &m_tempoSyncKnobModel, SIGNAL(dataChanged()),
+					 this, SLOT(tempoKnobChanged()));
 			// TODO: careful: we must prevent saved scales
 			m_tempoSyncKnobModel.setScaleLogarithmic( m_port->suggests_logscale );
 			break;
diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp
index 548da5d7c..495ae54d4 100644
--- a/src/core/LfoController.cpp
+++ b/src/core/LfoController.cpp
@@ -51,20 +51,20 @@ LfoController::LfoController( Model * _parent ) :
 	m_userDefSampleBuffer( new SampleBuffer )
 {
 	setSampleExact( true );
-	connect( &m_waveModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateSampleFunction() ), Qt::DirectConnection );
+	connect( &m_waveModel, SIGNAL(dataChanged()),
+			this, SLOT(updateSampleFunction()), Qt::DirectConnection );
 
-	connect( &m_speedModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateDuration() ), Qt::DirectConnection );
-	connect( &m_multiplierModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateDuration() ), Qt::DirectConnection );
-	connect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ),
-			this, SLOT( updateDuration() ) );
+	connect( &m_speedModel, SIGNAL(dataChanged()),
+			this, SLOT(updateDuration()), Qt::DirectConnection );
+	connect( &m_multiplierModel, SIGNAL(dataChanged()),
+			this, SLOT(updateDuration()), Qt::DirectConnection );
+	connect( Engine::audioEngine(), SIGNAL(sampleRateChanged()),
+			this, SLOT(updateDuration()));
 
-	connect( Engine::getSong(), SIGNAL( playbackStateChanged() ),
-			this, SLOT( updatePhase() ) );
-	connect( Engine::getSong(), SIGNAL( playbackPositionChanged() ),
-			this, SLOT( updatePhase() ) );
+	connect( Engine::getSong(), SIGNAL(playbackStateChanged()),
+			this, SLOT(updatePhase()));
+	connect( Engine::getSong(), SIGNAL(playbackPositionChanged()),
+			this, SLOT(updatePhase()));
 
 	updateDuration();
 }
diff --git a/src/core/MeterModel.cpp b/src/core/MeterModel.cpp
index ee5d8bbc8..3e24ae4d1 100644
--- a/src/core/MeterModel.cpp
+++ b/src/core/MeterModel.cpp
@@ -35,10 +35,10 @@ MeterModel::MeterModel( Model * _parent ) :
 	m_numeratorModel( 4, 1, 32, this, tr( "Numerator" ) ),
 	m_denominatorModel( 4, 1, 32, this, tr( "Denominator" ) )
 {
-	connect( &m_numeratorModel, SIGNAL( dataChanged() ), 
-			this, SIGNAL( dataChanged() ), Qt::DirectConnection );
-	connect( &m_denominatorModel, SIGNAL( dataChanged() ), 
-			this, SIGNAL( dataChanged() ), Qt::DirectConnection );
+	connect( &m_numeratorModel, SIGNAL(dataChanged()), 
+			this, SIGNAL(dataChanged()), Qt::DirectConnection );
+	connect( &m_denominatorModel, SIGNAL(dataChanged()), 
+			this, SIGNAL(dataChanged()), Qt::DirectConnection );
 }
 
 
diff --git a/src/core/PeakController.cpp b/src/core/PeakController.cpp
index 129aa83b7..a9215325e 100644
--- a/src/core/PeakController.cpp
+++ b/src/core/PeakController.cpp
@@ -53,14 +53,14 @@ PeakController::PeakController( Model * _parent,
 	setSampleExact( true );
 	if( m_peakEffect )
 	{
-		connect( m_peakEffect, SIGNAL( destroyed() ),
-			this, SLOT( handleDestroyedEffect() ) );
+		connect( m_peakEffect, SIGNAL(destroyed()),
+			this, SLOT(handleDestroyedEffect()));
 	}
-	connect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ), this, SLOT( updateCoeffs() ) );
-	connect( m_peakEffect->attackModel(), SIGNAL( dataChanged() ),
-			this, SLOT( updateCoeffs() ), Qt::DirectConnection );
-	connect( m_peakEffect->decayModel(), SIGNAL( dataChanged() ),
-			this, SLOT( updateCoeffs() ), Qt::DirectConnection );
+	connect( Engine::audioEngine(), SIGNAL(sampleRateChanged()), this, SLOT(updateCoeffs()));
+	connect( m_peakEffect->attackModel(), SIGNAL(dataChanged()),
+			this, SLOT(updateCoeffs()), Qt::DirectConnection );
+	connect( m_peakEffect->decayModel(), SIGNAL(dataChanged()),
+			this, SLOT(updateCoeffs()), Qt::DirectConnection );
 	m_coeffNeedsUpdate = true;
 }
 
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index 43eed30a7..62ed9b653 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -175,14 +175,14 @@ RemotePlugin::RemotePlugin() :
 	}
 #endif
 
-	connect( &m_process, SIGNAL( finished( int, QProcess::ExitStatus ) ),
-		this, SLOT( processFinished( int, QProcess::ExitStatus ) ),
+	connect( &m_process, SIGNAL(finished(int,QProcess::ExitStatus)),
+		this, SLOT(processFinished(int,QProcess::ExitStatus)),
 		Qt::DirectConnection );
-	connect( &m_process, SIGNAL( errorOccurred( QProcess::ProcessError ) ),
-			 this, SLOT( processErrored( QProcess::ProcessError ) ),
+	connect( &m_process, SIGNAL(errorOccurred(QProcess::ProcessError)),
+			 this, SLOT(processErrored(QProcess::ProcessError)),
 		Qt::DirectConnection );
-	connect( &m_process, SIGNAL( finished( int, QProcess::ExitStatus ) ),
-		&m_watcher, SLOT( quit() ), Qt::DirectConnection );
+	connect( &m_process, SIGNAL(finished(int,QProcess::ExitStatus)),
+		&m_watcher, SLOT(quit()), Qt::DirectConnection );
 }
 
 
diff --git a/src/core/RenderManager.cpp b/src/core/RenderManager.cpp
index e2f6b9311..ea3f69f47 100644
--- a/src/core/RenderManager.cpp
+++ b/src/core/RenderManager.cpp
@@ -57,8 +57,8 @@ RenderManager::~RenderManager()
 void RenderManager::abortProcessing()
 {
 	if ( m_activeRenderer ) {
-		disconnect( m_activeRenderer.get(), SIGNAL( finished() ),
-				this, SLOT( renderNextTrack() ) );
+		disconnect( m_activeRenderer.get(), SIGNAL(finished()),
+				this, SLOT(renderNextTrack()));
 		m_activeRenderer->abortProcessing();
 	}
 	restoreMutedState();
@@ -151,13 +151,13 @@ void RenderManager::render(QString outputPath)
 	if( m_activeRenderer->isReady() )
 	{
 		// pass progress signals through
-		connect( m_activeRenderer.get(), SIGNAL( progressChanged( int ) ),
-				this, SIGNAL( progressChanged( int ) ) );
+		connect( m_activeRenderer.get(), SIGNAL(progressChanged(int)),
+				this, SIGNAL(progressChanged(int)));
 
 		// when it is finished, render the next track.
 		// if we have not queued any tracks, renderNextTrack will just clean up
-		connect( m_activeRenderer.get(), SIGNAL( finished() ),
-				this, SLOT( renderNextTrack() ) );
+		connect( m_activeRenderer.get(), SIGNAL(finished()),
+				this, SLOT(renderNextTrack()));
 
 		m_activeRenderer->startProcessing();
 	}
diff --git a/src/core/RingBuffer.cpp b/src/core/RingBuffer.cpp
index b2e40f3c0..3f1ee7236 100644
--- a/src/core/RingBuffer.cpp
+++ b/src/core/RingBuffer.cpp
@@ -91,11 +91,11 @@ void RingBuffer::setSamplerateAware( bool b )
 {
 	if( b )
 	{
-		connect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ), this, SLOT( updateSamplerate() ), Qt::UniqueConnection );
+		connect( Engine::audioEngine(), SIGNAL(sampleRateChanged()), this, SLOT(updateSamplerate()), Qt::UniqueConnection );
 	}
 	else
 	{
-		disconnect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ), this, SLOT( updateSamplerate() ) );
+		disconnect( Engine::audioEngine(), SIGNAL(sampleRateChanged()), this, SLOT(updateSamplerate()));
 	}
 }
 
diff --git a/src/core/SampleClip.cpp b/src/core/SampleClip.cpp
index 9ee8e93e4..fc59fa457 100644
--- a/src/core/SampleClip.cpp
+++ b/src/core/SampleClip.cpp
@@ -47,30 +47,30 @@ SampleClip::SampleClip( Track * _track ) :
 
 	// we need to receive bpm-change-events, because then we have to
 	// change length of this Clip
-	connect( Engine::getSong(), SIGNAL( tempoChanged( lmms::bpm_t ) ),
-					this, SLOT( updateLength() ), Qt::DirectConnection );
-	connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int,int ) ),
-					this, SLOT( updateLength() ) );
+	connect( Engine::getSong(), SIGNAL(tempoChanged(lmms::bpm_t)),
+					this, SLOT(updateLength()), Qt::DirectConnection );
+	connect( Engine::getSong(), SIGNAL(timeSignatureChanged(int,int)),
+					this, SLOT(updateLength()));
 
 	//care about positionmarker
 	gui::TimeLineWidget* timeLine = Engine::getSong()->getPlayPos( Engine::getSong()->Mode_PlaySong ).m_timeLine;
 	if( timeLine )
 	{
-		connect( timeLine, SIGNAL( positionMarkerMoved() ), this, SLOT( playbackPositionChanged() ) );
+		connect( timeLine, SIGNAL(positionMarkerMoved()), this, SLOT(playbackPositionChanged()));
 	}
 	//playbutton clicked or space key / on Export Song set isPlaying to false
-	connect( Engine::getSong(), SIGNAL( playbackStateChanged() ),
-			this, SLOT( playbackPositionChanged() ), Qt::DirectConnection );
+	connect( Engine::getSong(), SIGNAL(playbackStateChanged()),
+			this, SLOT(playbackPositionChanged()), Qt::DirectConnection );
 	//care about loops
-	connect( Engine::getSong(), SIGNAL( updateSampleTracks() ),
-			this, SLOT( playbackPositionChanged() ), Qt::DirectConnection );
+	connect( Engine::getSong(), SIGNAL(updateSampleTracks()),
+			this, SLOT(playbackPositionChanged()), Qt::DirectConnection );
 	//care about mute Clips
-	connect( this, SIGNAL( dataChanged() ), this, SLOT( playbackPositionChanged() ) );
+	connect( this, SIGNAL(dataChanged()), this, SLOT(playbackPositionChanged()));
 	//care about mute track
-	connect( getTrack()->getMutedModel(), SIGNAL( dataChanged() ),
-			this, SLOT( playbackPositionChanged() ), Qt::DirectConnection );
+	connect( getTrack()->getMutedModel(), SIGNAL(dataChanged()),
+			this, SLOT(playbackPositionChanged()), Qt::DirectConnection );
 	//care about Clip position
-	connect( this, SIGNAL( positionChanged() ), this, SLOT( updateTrackClips() ) );
+	connect( this, SIGNAL(positionChanged()), this, SLOT(updateTrackClips()));
 
 	switch( getTrack()->trackContainer()->type() )
 	{
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index d26eab450..029683f94 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -100,21 +100,21 @@ Song::Song() :
 	m_oldAutomatedValues()
 {
 	for(int i = 0; i < Mode_Count; ++i) m_elapsedMilliSeconds[i] = 0;
-	connect( &m_tempoModel, SIGNAL( dataChanged() ),
-			this, SLOT( setTempo() ), Qt::DirectConnection );
-	connect( &m_tempoModel, SIGNAL( dataUnchanged() ),
-			this, SLOT( setTempo() ), Qt::DirectConnection );
-	connect( &m_timeSigModel, SIGNAL( dataChanged() ),
-			this, SLOT( setTimeSignature() ), Qt::DirectConnection );
+	connect( &m_tempoModel, SIGNAL(dataChanged()),
+			this, SLOT(setTempo()), Qt::DirectConnection );
+	connect( &m_tempoModel, SIGNAL(dataUnchanged()),
+			this, SLOT(setTempo()), Qt::DirectConnection );
+	connect( &m_timeSigModel, SIGNAL(dataChanged()),
+			this, SLOT(setTimeSignature()), Qt::DirectConnection );
 
 
-	connect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ), this,
-						SLOT( updateFramesPerTick() ) );
+	connect( Engine::audioEngine(), SIGNAL(sampleRateChanged()), this,
+						SLOT(updateFramesPerTick()));
 
-	connect( &m_masterVolumeModel, SIGNAL( dataChanged() ),
-			this, SLOT( masterVolumeChanged() ), Qt::DirectConnection );
-/*	connect( &m_masterPitchModel, SIGNAL( dataChanged() ),
-			this, SLOT( masterPitchChanged() ) );*/
+	connect( &m_masterVolumeModel, SIGNAL(dataChanged()),
+			this, SLOT(masterVolumeChanged()), Qt::DirectConnection );
+/*	connect( &m_masterPitchModel, SIGNAL(dataChanged()),
+			this, SLOT(masterPitchChanged()));*/
 
 	qRegisterMetaType<Note>( "Note" );
 	setType( SongContainer );
diff --git a/src/core/TempoSyncKnobModel.cpp b/src/core/TempoSyncKnobModel.cpp
index bc7c86db9..58437db24 100644
--- a/src/core/TempoSyncKnobModel.cpp
+++ b/src/core/TempoSyncKnobModel.cpp
@@ -45,8 +45,8 @@ TempoSyncKnobModel::TempoSyncKnobModel( const float _val, const float _min,
 	m_scale( _scale ),
 	m_custom( _parent )
 {
-	connect( Engine::getSong(), SIGNAL( tempoChanged( lmms::bpm_t ) ),
-			this, SLOT( calculateTempoSyncTime( lmms::bpm_t ) ),
+	connect( Engine::getSong(), SIGNAL(tempoChanged(lmms::bpm_t)),
+			this, SLOT(calculateTempoSyncTime(lmms::bpm_t)),
 			Qt::DirectConnection );
 }
 
@@ -158,8 +158,8 @@ void TempoSyncKnobModel::setSyncMode( TempoSyncMode _new_mode )
 		m_tempoSyncMode = _new_mode;
 		if( _new_mode == SyncCustom )
 		{
-			connect( &m_custom, SIGNAL( dataChanged() ),
-					this, SLOT( updateCustom() ),
+			connect( &m_custom, SIGNAL(dataChanged()),
+					this, SLOT(updateCustom()),
 					Qt::DirectConnection );
 		}
 	}
diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp
index 1699905c6..a08831662 100644
--- a/src/core/VstSyncController.cpp
+++ b/src/core/VstSyncController.cpp
@@ -44,7 +44,7 @@ VstSyncController::VstSyncController() :
 {
 	if( ConfigManager::inst()->value( "ui", "syncvstplugins" ).toInt() )
 	{
-		connect( Engine::audioEngine(), SIGNAL( sampleRateChanged() ), this, SLOT( updateSampleRate() ) );
+		connect( Engine::audioEngine(), SIGNAL(sampleRateChanged()), this, SLOT(updateSampleRate()));
 
 		try
 		{
diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
index f0e606f47..071a6e3c3 100644
--- a/src/core/audio/AudioJack.cpp
+++ b/src/core/audio/AudioJack.cpp
@@ -61,8 +61,8 @@ AudioJack::AudioJack( bool & _success_ful, AudioEngine*  _audioEngine ) :
 	_success_ful = initJackClient();
 	if( _success_ful )
 	{
-		connect( this, SIGNAL( zombified() ),
-				this, SLOT( restartAfterZombified() ),
+		connect( this, SIGNAL(zombified()),
+				this, SLOT(restartAfterZombified()),
 				Qt::QueuedConnection );
 	}
 
diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
index cc1e611c9..b1e9cb5c4 100644
--- a/src/core/audio/AudioPortAudio.cpp
+++ b/src/core/audio/AudioPortAudio.cpp
@@ -444,11 +444,11 @@ AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
 	m_channels->setLabel( tr( "Channels" ) );
 	m_channels->move( 308, 20 );*/
 
-	connect( &m_setupUtil.m_backendModel, SIGNAL( dataChanged() ),
-			&m_setupUtil, SLOT( updateDevices() ) );
+	connect( &m_setupUtil.m_backendModel, SIGNAL(dataChanged()),
+			&m_setupUtil, SLOT(updateDevices()));
 			
-	connect( &m_setupUtil.m_deviceModel, SIGNAL( dataChanged() ),
-			&m_setupUtil, SLOT( updateChannels() ) );
+	connect( &m_setupUtil.m_deviceModel, SIGNAL(dataChanged()),
+			&m_setupUtil, SLOT(updateChannels()));
 			
 	m_backend->setModel( &m_setupUtil.m_backendModel );
 	m_device->setModel( &m_setupUtil.m_deviceModel );
@@ -459,11 +459,11 @@ AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
 
 AudioPortAudio::setupWidget::~setupWidget()
 {
-	disconnect( &m_setupUtil.m_backendModel, SIGNAL( dataChanged() ),
-			&m_setupUtil, SLOT( updateDevices() ) );
+	disconnect( &m_setupUtil.m_backendModel, SIGNAL(dataChanged()),
+			&m_setupUtil, SLOT(updateDevices()));
 			
-	disconnect( &m_setupUtil.m_deviceModel, SIGNAL( dataChanged() ),
-			&m_setupUtil, SLOT( updateChannels() ) );
+	disconnect( &m_setupUtil.m_deviceModel, SIGNAL(dataChanged()),
+			&m_setupUtil, SLOT(updateChannels()));
 }
 
 
diff --git a/src/core/audio/AudioSoundIo.cpp b/src/core/audio/AudioSoundIo.cpp
index c56d23dc3..a25d968df 100644
--- a/src/core/audio/AudioSoundIo.cpp
+++ b/src/core/audio/AudioSoundIo.cpp
@@ -492,7 +492,7 @@ AudioSoundIo::setupWidget::setupWidget( QWidget * _parent ) :
 
 	reconnectSoundIo();
 
-	bool ok = connect( &m_backendModel, SIGNAL( dataChanged() ), &m_setupUtil, SLOT( reconnectSoundIo() ) );
+	bool ok = connect( &m_backendModel, SIGNAL(dataChanged()), &m_setupUtil, SLOT(reconnectSoundIo()));
 	assert(ok);
 
 	m_backend->setModel( &m_backendModel );
@@ -501,7 +501,7 @@ AudioSoundIo::setupWidget::setupWidget( QWidget * _parent ) :
 
 AudioSoundIo::setupWidget::~setupWidget()
 {
-	bool ok = disconnect( &m_backendModel, SIGNAL( dataChanged() ), &m_setupUtil, SLOT( reconnectSoundIo() ) );
+	bool ok = disconnect( &m_backendModel, SIGNAL(dataChanged()), &m_setupUtil, SLOT(reconnectSoundIo()));
 	assert(ok);
 	if (m_soundio)
 	{
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 5d454dd9b..43e744e5b 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -831,12 +831,12 @@ int main( int argc, char * * argv )
 		// create renderer
 		RenderManager * r = new RenderManager( qs, os, eff, renderOut );
 		QCoreApplication::instance()->connect( r,
-				SIGNAL( finished() ), SLOT( quit() ) );
+				SIGNAL(finished()), SLOT(quit()));
 
 		// timer for progress-updates
 		QTimer * t = new QTimer( r );
-		r->connect( t, SIGNAL( timeout() ),
-				SLOT( updateConsoleProgress() ) );
+		r->connect( t, SIGNAL(timeout()),
+				SLOT(updateConsoleProgress()));
 		t->start( 200 );
 
 		if( profilerOutputFile.isEmpty() == false )
diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp
index 41904812c..b7d46fe4f 100644
--- a/src/core/midi/MidiAlsaSeq.cpp
+++ b/src/core/midi/MidiAlsaSeq.cpp
@@ -101,14 +101,14 @@ MidiAlsaSeq::MidiAlsaSeq() :
 
 	snd_seq_start_queue( m_seqHandle, m_queueID, nullptr );
 	changeQueueTempo( Engine::getSong()->getTempo() );
-	connect( Engine::getSong(), SIGNAL( tempoChanged( lmms::bpm_t ) ),
-			this, SLOT( changeQueueTempo( lmms::bpm_t ) ), Qt::DirectConnection );
+	connect( Engine::getSong(), SIGNAL(tempoChanged(lmms::bpm_t)),
+			this, SLOT(changeQueueTempo(lmms::bpm_t)), Qt::DirectConnection );
 
 	// initial list-update
 	updatePortList();
 
-	connect( &m_portListUpdateTimer, SIGNAL( timeout() ),
-					this, SLOT( updatePortList() ) );
+	connect( &m_portListUpdateTimer, SIGNAL(timeout()),
+					this, SLOT(updatePortList()));
 	// we check for port-changes every second
 	m_portListUpdateTimer.start( 1000 );
 
diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp
index 61c85104e..75f548a37 100644
--- a/src/core/midi/MidiController.cpp
+++ b/src/core/midi/MidiController.cpp
@@ -40,8 +40,8 @@ MidiController::MidiController( Model * _parent ) :
 	m_previousValue( 0.0f )
 {
 	setSampleExact( true );
-	connect( &m_midiPort, SIGNAL( modeChanged() ),
-			this, SLOT( updateName() ) );
+	connect( &m_midiPort, SIGNAL(modeChanged()),
+			this, SLOT(updateName()));
 }
 
 
diff --git a/src/core/midi/MidiPort.cpp b/src/core/midi/MidiPort.cpp
index 9b3f46304..33733398b 100644
--- a/src/core/midi/MidiPort.cpp
+++ b/src/core/midi/MidiPort.cpp
@@ -69,12 +69,12 @@ MidiPort::MidiPort( const QString& name,
 	m_readableModel.setValue( m_mode == Input || m_mode == Duplex );
 	m_writableModel.setValue( m_mode == Output || m_mode == Duplex );
 
-	connect( &m_readableModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateMidiPortMode() ), Qt::DirectConnection );
-	connect( &m_writableModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateMidiPortMode() ), Qt::DirectConnection );
-	connect( &m_outputProgramModel, SIGNAL( dataChanged() ),
-			this, SLOT( updateOutputProgram() ), Qt::DirectConnection );
+	connect( &m_readableModel, SIGNAL(dataChanged()),
+			this, SLOT(updateMidiPortMode()), Qt::DirectConnection );
+	connect( &m_writableModel, SIGNAL(dataChanged()),
+			this, SLOT(updateMidiPortMode()), Qt::DirectConnection );
+	connect( &m_outputProgramModel, SIGNAL(dataChanged()),
+			this, SLOT(updateOutputProgram()), Qt::DirectConnection );
 
 
 	// when using with non-raw-clients we can provide buttons showing
@@ -85,8 +85,8 @@ MidiPort::MidiPort( const QString& name,
 		updateWritablePorts();
 
 		// we want to get informed about port-changes!
-		m_midiClient->connectRPChanged( this, SLOT( updateReadablePorts() ) );
-		m_midiClient->connectWPChanged( this, SLOT( updateWritablePorts() ) );
+		m_midiClient->connectRPChanged( this, SLOT(updateReadablePorts()));
+		m_midiClient->connectWPChanged( this, SLOT(updateWritablePorts()));
 	}
 
 	updateMidiPortMode();
diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp
index 7ef527cae..365a5749e 100644
--- a/src/gui/AutomatableModelView.cpp
+++ b/src/gui/AutomatableModelView.cpp
@@ -61,14 +61,14 @@ void AutomatableModelView::addDefaultActions( QMenu* menu )
 						AutomatableModel::tr( "&Reset (%1%2)" ).
 							arg( model->initValue<float>() * m_conversionFactor ).
 							arg( m_unit ),
-						model, SLOT( reset() ) );
+						model, SLOT(reset()));
 
 	menu->addSeparator();
 	menu->addAction( embed::getIconPixmap( "edit_copy" ),
 						AutomatableModel::tr( "&Copy value (%1%2)" ).
 							arg( model->value<float>() * m_conversionFactor ).
 							arg( m_unit ),
-						amvSlots, SLOT( copyToClipboard() ) );
+						amvSlots, SLOT(copyToClipboard()));
 
 	bool canPaste = true;
 	const float valueToPaste = floatFromClipboard(&canPaste);
@@ -78,7 +78,7 @@ void AutomatableModelView::addDefaultActions( QMenu* menu )
 						arg( m_unit )
 					: AutomatableModel::tr( "&Paste value");
 	QAction* pasteAction = menu->addAction( embed::getIconPixmap( "edit_paste" ),
-						pasteDesc, amvSlots, SLOT( pasteFromClipboard() ) );
+						pasteDesc, amvSlots, SLOT(pasteFromClipboard()));
 	pasteAction->setEnabled(canPaste);
 
 	menu->addSeparator();
@@ -86,12 +86,12 @@ void AutomatableModelView::addDefaultActions( QMenu* menu )
 	menu->addAction( embed::getIconPixmap( "automation" ),
 						AutomatableModel::tr( "Edit song-global automation" ),
 							amvSlots,
-							SLOT( editSongGlobalAutomation() ) );
+							SLOT(editSongGlobalAutomation()));
 
 	menu->addAction( QPixmap(),
 						AutomatableModel::tr( "Remove song-global automation" ),
 						amvSlots,
-						SLOT( removeSongGlobalAutomation() ) );
+						SLOT(removeSongGlobalAutomation()));
 
 	menu->addSeparator();
 
@@ -99,7 +99,7 @@ void AutomatableModelView::addDefaultActions( QMenu* menu )
 	{
 		menu->addAction( embed::getIconPixmap( "edit-delete" ),
 							AutomatableModel::tr( "Remove all linked controls" ),
-							amvSlots, SLOT( unlinkAllModels() ) );
+							amvSlots, SLOT(unlinkAllModels()));
 		menu->addSeparator();
 	}
 
@@ -120,16 +120,16 @@ void AutomatableModelView::addDefaultActions( QMenu* menu )
 
 		contMenu->addAction( embed::getIconPixmap( "controller" ),
 								AutomatableModel::tr("Edit connection..."),
-								amvSlots, SLOT( execConnectionDialog() ) );
+								amvSlots, SLOT(execConnectionDialog()));
 		contMenu->addAction( embed::getIconPixmap( "cancel" ),
 								AutomatableModel::tr("Remove connection"),
-								amvSlots, SLOT( removeConnection() ) );
+								amvSlots, SLOT(removeConnection()));
 	}
 	else
 	{
 		menu->addAction( embed::getIconPixmap( "controller" ),
 							AutomatableModel::tr("Connect to controller..."),
-							amvSlots, SLOT( execConnectionDialog() ) );
+							amvSlots, SLOT(execConnectionDialog()));
 	}
 }
 
@@ -202,7 +202,7 @@ AutomatableModelViewSlots::AutomatableModelViewSlots( AutomatableModelView* amv,
 	QObject(),
 	m_amv( amv )
 {
-	connect( parent, SIGNAL( destroyed() ), this, SLOT( deleteLater() ), Qt::QueuedConnection );
+	connect( parent, SIGNAL(destroyed()), this, SLOT(deleteLater()), Qt::QueuedConnection );
 }
 
 
diff --git a/src/gui/ControllerRackView.cpp b/src/gui/ControllerRackView.cpp
index f5420111d..e9f23c767 100644
--- a/src/gui/ControllerRackView.cpp
+++ b/src/gui/ControllerRackView.cpp
@@ -64,12 +64,12 @@ ControllerRackView::ControllerRackView() :
 	m_addButton = new QPushButton( this );
 	m_addButton->setText( tr( "Add" ) );
 
-	connect( m_addButton, SIGNAL( clicked() ),
-			this, SLOT( addController() ) );
+	connect( m_addButton, SIGNAL(clicked()),
+			this, SLOT(addController()));
 
 	Song * song = Engine::getSong();
-	connect( song, SIGNAL( controllerAdded( lmms::Controller* ) ), SLOT( onControllerAdded( lmms::Controller* ) ) );
-	connect( song, SIGNAL( controllerRemoved( lmms::Controller* ) ), SLOT( onControllerRemoved( lmms::Controller* ) ) );
+	connect( song, SIGNAL(controllerAdded(lmms::Controller*)), SLOT(onControllerAdded(lmms::Controller*)));
+	connect( song, SIGNAL(controllerRemoved(lmms::Controller*)), SLOT(onControllerRemoved(lmms::Controller*)));
 
 	QVBoxLayout * layout = new QVBoxLayout();
 	layout->addWidget( m_scrollArea );
@@ -148,8 +148,8 @@ void ControllerRackView::onControllerAdded( Controller * controller )
 
 	ControllerView * controllerView = new ControllerView( controller, scrollAreaWidget );
 
-	connect( controllerView, SIGNAL( deleteController( lmms::gui::ControllerView * ) ),
-		 this, SLOT( deleteController( lmms::gui::ControllerView * ) ), Qt::QueuedConnection );
+	connect( controllerView, SIGNAL(deleteController(lmms::gui::ControllerView*)),
+		 this, SLOT(deleteController(lmms::gui::ControllerView*)), Qt::QueuedConnection );
 
 	m_controllerViews.append( controllerView );
 	m_scrollAreaLayout->insertWidget( m_nextIndex, controllerView );
diff --git a/src/gui/ControllerView.cpp b/src/gui/ControllerView.cpp
index 7e046b4f2..903c02862 100644
--- a/src/gui/ControllerView.cpp
+++ b/src/gui/ControllerView.cpp
@@ -67,7 +67,7 @@ ControllerView::ControllerView( Controller * _model, QWidget * _parent ) :
 	hBox->addWidget(label);
 
 	QPushButton * controlsButton = new QPushButton( tr( "Controls" ), this );
-	connect( controlsButton, SIGNAL( clicked() ), SLOT( editControls() ) );
+	connect( controlsButton, SIGNAL(clicked()), SLOT(editControls()));
 
 	hBox->addWidget(controlsButton);
 
@@ -86,8 +86,8 @@ ControllerView::ControllerView( Controller * _model, QWidget * _parent ) :
 
 	m_subWindow->setWindowIcon( m_controllerDlg->windowIcon() );
 
-	connect( m_controllerDlg, SIGNAL( closed() ),
-		this, SLOT( closeControls() ) );
+	connect( m_controllerDlg, SIGNAL(closed()),
+		this, SLOT(closeControls()));
 
 	m_subWindow->hide();
 
@@ -176,8 +176,8 @@ void ControllerView::contextMenuEvent( QContextMenuEvent * )
 	QPointer<CaptionMenu> contextMenu = new CaptionMenu( model()->displayName(), this );
 	contextMenu->addAction( embed::getIconPixmap( "cancel" ),
 						tr( "&Remove this controller" ),
-						this, SLOT( deleteController() ) );
-	contextMenu->addAction( tr("Re&name this controller"), this, SLOT( renameController() ));
+						this, SLOT(deleteController()));
+	contextMenu->addAction( tr("Re&name this controller"), this, SLOT(renameController()));
 	contextMenu->addSeparator();
 	contextMenu->exec( QCursor::pos() );
 	delete contextMenu;
diff --git a/src/gui/EffectRackView.cpp b/src/gui/EffectRackView.cpp
index 27600056e..d946e753d 100644
--- a/src/gui/EffectRackView.cpp
+++ b/src/gui/EffectRackView.cpp
@@ -65,7 +65,7 @@ EffectRackView::EffectRackView( EffectChain* model, QWidget* parent ) :
 
 	effectsLayout->addWidget( addButton );
 
-	connect( addButton, SIGNAL( clicked() ), this, SLOT( addEffect() ) );
+	connect( addButton, SIGNAL(clicked()), this, SLOT(addEffect()));
 
 
 	m_lastY = 0;
@@ -171,12 +171,12 @@ void EffectRackView::update()
 		if( i >= m_effectViews.size() )
 		{
 			EffectView * view = new EffectView( *it, w );
-			connect( view, SIGNAL( moveUp( lmms::gui::EffectView * ) ),
-					this, SLOT( moveUp( lmms::gui::EffectView * ) ) );
-			connect( view, SIGNAL( moveDown( lmms::gui::EffectView * ) ),
-				this, SLOT( moveDown( lmms::gui::EffectView * ) ) );
-			connect( view, SIGNAL( deletePlugin( lmms::gui::EffectView * ) ),
-				this, SLOT( deletePlugin( lmms::gui::EffectView * ) ),
+			connect( view, SIGNAL(moveUp(lmms::gui::EffectView*)),
+					this, SLOT(moveUp(lmms::gui::EffectView*)));
+			connect( view, SIGNAL(moveDown(lmms::gui::EffectView*)),
+				this, SLOT(moveDown(lmms::gui::EffectView*)));
+			connect( view, SIGNAL(deletePlugin(lmms::gui::EffectView*)),
+				this, SLOT(deletePlugin(lmms::gui::EffectView*)),
 							Qt::QueuedConnection );
 			view->show();
 			m_effectViews.append( view );
@@ -259,7 +259,7 @@ void EffectRackView::modelChanged()
 {
 	//clearViews();
 	m_effectsGroupBox->setModel( &fxChain()->m_enabledModel );
-	connect( fxChain(), SIGNAL( aboutToClear() ), this, SLOT( clearViews() ) );
+	connect( fxChain(), SIGNAL(aboutToClear()), this, SLOT(clearViews()));
 	update();
 }
 
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index f90283631..820f9907d 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -90,8 +90,8 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 		QFont f = ctls_btn->font();
 		ctls_btn->setFont( pointSize<8>( f ) );
 		ctls_btn->setGeometry( 150, 14, 50, 20 );
-		connect( ctls_btn, SIGNAL( clicked() ),
-					this, SLOT( editControls() ) );
+		connect( ctls_btn, SIGNAL(clicked()),
+					this, SLOT(editControls()));
 
 		m_controlView = effect()->controls()->createView();
 		if( m_controlView )
@@ -111,8 +111,8 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 			flags &= ~Qt::WindowMaximizeButtonHint;
 			m_subWindow->setWindowFlags( flags );
 
-			connect( m_controlView, SIGNAL( closed() ),
-					this, SLOT( closeEffects() ) );
+			connect( m_controlView, SIGNAL(closed()),
+					this, SLOT(closeEffects()));
 
 			m_subWindow->hide();
 		}
@@ -194,14 +194,14 @@ void EffectView::contextMenuEvent( QContextMenuEvent * )
 	QPointer<CaptionMenu> contextMenu = new CaptionMenu( model()->displayName(), this );
 	contextMenu->addAction( embed::getIconPixmap( "arp_up" ),
 						tr( "Move &up" ),
-						this, SLOT( moveUp() ) );
+						this, SLOT(moveUp()));
 	contextMenu->addAction( embed::getIconPixmap( "arp_down" ),
 						tr( "Move &down" ),
-						this, SLOT( moveDown() ) );
+						this, SLOT(moveDown()));
 	contextMenu->addSeparator();
 	contextMenu->addAction( embed::getIconPixmap( "cancel" ),
 						tr( "&Remove this plugin" ),
-						this, SLOT( deletePlugin() ) );
+						this, SLOT(deletePlugin()));
 	contextMenu->addSeparator();
 	contextMenu->exec( QCursor::pos() );
 	delete contextMenu;
diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index 732d6aa48..0a6f8a216 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -125,14 +125,14 @@ FileBrowser::FileBrowser(const QString & directories, const QString & filter,
 	m_filterEdit = new QLineEdit( searchWidget );
 	m_filterEdit->setPlaceholderText( tr("Search") );
 	m_filterEdit->setClearButtonEnabled( true );
-	connect( m_filterEdit, SIGNAL( textEdited( const QString & ) ),
-			this, SLOT( filterItems( const QString & ) ) );
+	connect( m_filterEdit, SIGNAL( textEdited( const QString& ) ),
+			this, SLOT( filterItems( const QString& ) ) );
 
 	QPushButton * reload_btn = new QPushButton(
 				embed::getIconPixmap( "reload" ),
 						QString(), searchWidget );
 	reload_btn->setToolTip( tr( "Refresh list" ) );
-	connect( reload_btn, SIGNAL( clicked() ), this, SLOT( reloadTree() ) );
+	connect( reload_btn, SIGNAL(clicked()), this, SLOT(reloadTree()));
 
 	searchWidgetLayout->addWidget( m_filterEdit );
 	searchWidgetLayout->addSpacing( 5 );
@@ -144,7 +144,7 @@ FileBrowser::FileBrowser(const QString & directories, const QString & filter,
 	addContentWidget( m_fileBrowserTreeWidget );
 
 	// Whenever the FileBrowser has focus, Ctrl+F should direct focus to its filter box.
-	QShortcut *filterFocusShortcut = new QShortcut( QKeySequence( QKeySequence::Find ), this, SLOT(giveFocusToFilter()) );
+	QShortcut *filterFocusShortcut = new QShortcut( QKeySequence( QKeySequence::Find ), this, SLOT(giveFocusToFilter()));
 	filterFocusShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 
 	reloadTree();
@@ -381,12 +381,12 @@ FileBrowserTreeWidget::FileBrowserTreeWidget(QWidget * parent ) :
 	headerItem()->setHidden( true );
 	setSortingEnabled( false );
 
-	connect( this, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ),
-			SLOT( activateListItem( QTreeWidgetItem *, int ) ) );
-	connect( this, SIGNAL( itemCollapsed( QTreeWidgetItem * ) ),
-				SLOT( updateDirectory( QTreeWidgetItem * ) ) );
-	connect( this, SIGNAL( itemExpanded( QTreeWidgetItem * ) ),
-				SLOT( updateDirectory( QTreeWidgetItem * ) ) );
+	connect( this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
+			SLOT(activateListItem(QTreeWidgetItem*,int)));
+	connect( this, SIGNAL(itemCollapsed(QTreeWidgetItem*)),
+				SLOT(updateDirectory(QTreeWidgetItem*)));
+	connect( this, SIGNAL(itemExpanded(QTreeWidgetItem*)),
+				SLOT(updateDirectory(QTreeWidgetItem*)));
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 12, 2) && defined LMMS_BUILD_WIN32
 	// Set the font for the QTreeWidget to the Windows System font to make sure that
diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp
index 84a3451d8..b0606dfe9 100644
--- a/src/gui/LfoControllerDialog.cpp
+++ b/src/gui/LfoControllerDialog.cpp
@@ -153,8 +153,8 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
 	m_userWaveBtn->setInactiveGraphic( embed::getIconPixmap(
 						"usr_wave_inactive" ) );
 	connect( m_userWaveBtn,
-					SIGNAL( doubleClicked() ),
-			this, SLOT( askUserDefWave() ) );
+					SIGNAL(doubleClicked()),
+			this, SLOT(askUserDefWave()));
 	m_userWaveBtn->setToolTip(
 				tr( "User-defined shape.\nDouble click to pick a file." ) );
 	
@@ -244,14 +244,14 @@ void LfoControllerDialog::contextMenuEvent( QContextMenuEvent * )
 		//   should be replaced by Model::displayName
 	contextMenu->addAction( embed::getIconPixmap( "arp_up_on" ),
 						tr( "Move &up" ),
-						this, SLOT( moveUp() ) );
+						this, SLOT(moveUp()));
 	contextMenu->addAction( embed::getIconPixmap( "arp_down_on" ),
 						tr( "Move &down" ),
-						this, SLOT( moveDown() ) );
+						this, SLOT(moveDown()));
 	contextMenu->addSeparator();
 	contextMenu->addAction( embed::getIconPixmap( "cancel" ),
 						tr( "&Remove this plugin" ),
-						this, SLOT( deletePlugin() ) );
+						this, SLOT(deletePlugin()));
 	contextMenu->exec( QCursor::pos() );
 	delete contextMenu;
 	*/
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index bc917f53c..a77094b19 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -251,8 +251,8 @@ MainWindow::MainWindow() :
 		// See autoSaveTimerReset() in MainWindow.h
 	}
 
-	connect( Engine::getSong(), SIGNAL( playbackStateChanged() ),
-				this, SLOT( updatePlayPauseIcons() ) );
+	connect( Engine::getSong(), SIGNAL(playbackStateChanged()),
+				this, SLOT(updatePlayPauseIcons()));
 
 	connect(Engine::getSong(), SIGNAL(stopped()), SLOT(onSongStopped()));
 
@@ -302,7 +302,7 @@ void MainWindow::finalize()
 	menuBar()->addMenu( project_menu )->setText( tr( "&File" ) );
 	project_menu->addAction( embed::getIconPixmap( "project_new" ),
 					tr( "&New" ),
-					this, SLOT( createNewProject() ),
+					this, SLOT(createNewProject()),
 					QKeySequence::New );
 
 	auto templates_menu = new TemplatesMenu( this );
@@ -310,48 +310,48 @@ void MainWindow::finalize()
 
 	project_menu->addAction( embed::getIconPixmap( "project_open" ),
 					tr( "&Open..." ),
-					this, SLOT( openProject() ),
+					this, SLOT(openProject()),
 					QKeySequence::Open );
 
 	project_menu->addMenu(new RecentProjectsMenu(this));
 
 	project_menu->addAction( embed::getIconPixmap( "project_save" ),
 					tr( "&Save" ),
-					this, SLOT( saveProject() ),
+					this, SLOT(saveProject()),
 					QKeySequence::Save );
 	project_menu->addAction( embed::getIconPixmap( "project_save" ),
 					tr( "Save &As..." ),
-					this, SLOT( saveProjectAs() ),
+					this, SLOT(saveProjectAs()),
 					Qt::CTRL + Qt::SHIFT + Qt::Key_S );
 	project_menu->addAction( embed::getIconPixmap( "project_save" ),
 					tr( "Save as New &Version" ),
-					this, SLOT( saveProjectAsNewVersion() ),
+					this, SLOT(saveProjectAsNewVersion()),
 					Qt::CTRL + Qt::ALT + Qt::Key_S );
 
 	project_menu->addAction( embed::getIconPixmap( "project_save" ),
 					tr( "Save as default template" ),
-					this, SLOT( saveProjectAsDefaultTemplate() ) );
+					this, SLOT(saveProjectAsDefaultTemplate()));
 
 	project_menu->addSeparator();
 	project_menu->addAction( embed::getIconPixmap( "project_import" ),
 					tr( "Import..." ),
 					this,
-					SLOT( onImportProject() ) );
+					SLOT(onImportProject()));
 	project_menu->addAction( embed::getIconPixmap( "project_export" ),
 					tr( "E&xport..." ),
 					this,
-					SLOT( onExportProject() ),
+					SLOT(onExportProject()),
 					Qt::CTRL + Qt::Key_E );
 	project_menu->addAction( embed::getIconPixmap( "project_export" ),
 					tr( "E&xport Tracks..." ),
 					this,
-					SLOT( onExportProjectTracks() ),
+					SLOT(onExportProjectTracks()),
 					Qt::CTRL + Qt::SHIFT + Qt::Key_E );
 
 	project_menu->addAction( embed::getIconPixmap( "midi_file" ),
 					tr( "Export &MIDI..." ),
 					this,
-					SLOT( onExportProjectMidi() ),
+					SLOT(onExportProjectMidi()),
 					Qt::CTRL + Qt::Key_M );
 
 // Prevent dangling separator at end of menu per https://bugreports.qt.io/browse/QTBUG-40071
@@ -359,7 +359,7 @@ void MainWindow::finalize()
 	project_menu->addSeparator();
 #endif
 	project_menu->addAction( embed::getIconPixmap( "exit" ), tr( "&Quit" ),
-					qApp, SLOT( closeAllWindows() ),
+					qApp, SLOT(closeAllWindows()),
 					Qt::CTRL + Qt::Key_Q );
 
 
@@ -367,32 +367,32 @@ void MainWindow::finalize()
 	menuBar()->addMenu( edit_menu )->setText( tr( "&Edit" ) );
 	m_undoAction = edit_menu->addAction( embed::getIconPixmap( "edit_undo" ),
 					tr( "Undo" ),
-					this, SLOT( undo() ),
+					this, SLOT(undo()),
 					QKeySequence::Undo );
 	m_redoAction = edit_menu->addAction( embed::getIconPixmap( "edit_redo" ),
 					tr( "Redo" ),
-					this, SLOT( redo() ),
+					this, SLOT(redo()),
 					QKeySequence::Redo );
 	// Ensure that both (Ctrl+Y) and (Ctrl+Shift+Z) activate redo shortcut regardless of OS defaults
 	if (QKeySequence(QKeySequence::Redo) != QKeySequence(Qt::CTRL + Qt::Key_Y))
 	{
-		new QShortcut( QKeySequence( Qt::CTRL + Qt::Key_Y ), this, SLOT(redo()) );
+		new QShortcut( QKeySequence( Qt::CTRL + Qt::Key_Y ), this, SLOT(redo()));
 	}
 	if (QKeySequence(QKeySequence::Redo) != QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Z ))
 	{
-		new QShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_Z ), this, SLOT(redo()) );
+		new QShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_Z ), this, SLOT(redo()));
 	}
 
 	edit_menu->addSeparator();
 	edit_menu->addAction( embed::getIconPixmap( "setup_general" ),
 					tr( "Settings" ),
-					this, SLOT( showSettingsDialog() ) );
-	connect( edit_menu, SIGNAL(aboutToShow()), this, SLOT(updateUndoRedoButtons()) );
+					this, SLOT(showSettingsDialog()));
+	connect( edit_menu, SIGNAL(aboutToShow()), this, SLOT(updateUndoRedoButtons()));
 
 	m_viewMenu = new QMenu( this );
 	menuBar()->addMenu( m_viewMenu )->setText( tr( "&View" ) );
-	connect( m_viewMenu, SIGNAL( aboutToShow() ),
-		 this, SLOT( updateViewMenu() ) );
+	connect( m_viewMenu, SIGNAL(aboutToShow()),
+		 this, SLOT(updateViewMenu()));
 	connect( m_viewMenu, SIGNAL(triggered(QAction*)), this,
 		SLOT(updateConfig(QAction*)));
 
@@ -407,8 +407,8 @@ void MainWindow::finalize()
 	if( !m_toolsMenu->isEmpty() )
 	{
 		menuBar()->addMenu( m_toolsMenu )->setText( tr( "&Tools" ) );
-		connect( m_toolsMenu, SIGNAL( triggered( QAction * ) ),
-					this, SLOT( showTool( QAction * ) ) );
+		connect( m_toolsMenu, SIGNAL(triggered(QAction*)),
+					this, SLOT(showTool(QAction*)));
 	}
 
 
@@ -420,13 +420,13 @@ void MainWindow::finalize()
 	{
 		help_menu->addAction( embed::getIconPixmap( "help" ),
 						tr( "Online Help" ),
-						this, SLOT( browseHelp() ) );
+						this, SLOT(browseHelp()));
 	}
 	else
 	{
 		help_menu->addAction( embed::getIconPixmap( "help" ),
 							tr( "Help" ),
-							this, SLOT( help() ) );
+							this, SLOT(help()));
 	}
 
 // Prevent dangling separator at end of menu per https://bugreports.qt.io/browse/QTBUG-40071
@@ -434,19 +434,19 @@ void MainWindow::finalize()
 	help_menu->addSeparator();
 #endif
 	help_menu->addAction( embed::getIconPixmap( "icon_small" ), tr( "About" ),
-				  this, SLOT( aboutLMMS() ) );
+				  this, SLOT(aboutLMMS()));
 
 	// create tool-buttons
 	ToolButton * project_new = new ToolButton(
 					embed::getIconPixmap( "project_new" ),
 					tr( "Create new project" ),
-					this, SLOT( createNewProject() ),
+					this, SLOT(createNewProject()),
 							m_toolBar );
 
 	ToolButton * project_new_from_template = new ToolButton(
 			embed::getIconPixmap( "project_new_from_template" ),
 				tr( "Create new project from template" ),
-					this, SLOT( emptySlot() ),
+					this, SLOT(emptySlot()),
 							m_toolBar );
 	project_new_from_template->setMenu( templates_menu );
 	project_new_from_template->setPopupMode( ToolButton::InstantPopup );
@@ -454,21 +454,21 @@ void MainWindow::finalize()
 	ToolButton * project_open = new ToolButton(
 					embed::getIconPixmap( "project_open" ),
 					tr( "Open existing project" ),
-					this, SLOT( openProject() ),
+					this, SLOT(openProject()),
 								m_toolBar );
 
 
 	ToolButton * project_open_recent = new ToolButton(
 				embed::getIconPixmap( "project_open_recent" ),
 					tr( "Recently opened projects" ),
-					this, SLOT( emptySlot() ), m_toolBar );
+					this, SLOT(emptySlot()), m_toolBar );
 	project_open_recent->setMenu( new RecentProjectsMenu(this) );
 	project_open_recent->setPopupMode( ToolButton::InstantPopup );
 
 	ToolButton * project_save = new ToolButton(
 					embed::getIconPixmap( "project_save" ),
 					tr( "Save current project" ),
-					this, SLOT( saveProject() ),
+					this, SLOT(saveProject()),
 								m_toolBar );
 
 
@@ -476,13 +476,13 @@ void MainWindow::finalize()
 				embed::getIconPixmap( "project_export" ),
 					tr( "Export current project" ),
 					this,
-							SLOT( onExportProject() ),
+							SLOT(onExportProject()),
 								m_toolBar );
 
 	m_metronomeToggle = new ToolButton(
 				embed::getIconPixmap( "metronome" ),
 				tr( "Metronome" ),
-				this, SLOT( onToggleMetronome() ),
+				this, SLOT(onToggleMetronome()),
 							m_toolBar );
 	m_metronomeToggle->setCheckable(true);
 	m_metronomeToggle->setChecked(Engine::audioEngine()->isMetronomeActive());
@@ -501,7 +501,7 @@ void MainWindow::finalize()
 	ToolButton * song_editor_window = new ToolButton(
 					embed::getIconPixmap( "songeditor" ),
 					tr( "Song Editor" ) + " (Ctrl+1)",
-					this, SLOT( toggleSongEditorWin() ),
+					this, SLOT(toggleSongEditorWin()),
 								m_toolBar );
 	song_editor_window->setShortcut( Qt::CTRL + Qt::Key_1 );
 
@@ -518,7 +518,7 @@ void MainWindow::finalize()
 						embed::getIconPixmap( "piano" ),
 						tr( "Piano Roll" ) +
 									" (Ctrl+3)",
-					this, SLOT( togglePianoRollWin() ),
+					this, SLOT(togglePianoRollWin()),
 								m_toolBar );
 	piano_roll_window->setShortcut( Qt::CTRL + Qt::Key_3 );
 
@@ -527,14 +527,14 @@ void MainWindow::finalize()
 					tr( "Automation Editor" ) +
 									" (Ctrl+4)",
 					this,
-					SLOT( toggleAutomationEditorWin() ),
+					SLOT(toggleAutomationEditorWin()),
 					m_toolBar );
 	automation_editor_window->setShortcut( Qt::CTRL + Qt::Key_4 );
 
 	ToolButton * mixer_window = new ToolButton(
 					embed::getIconPixmap( "mixer" ),
 					tr( "Mixer" ) + " (Ctrl+5)",
-					this, SLOT( toggleMixerWin() ),
+					this, SLOT(toggleMixerWin()),
 					m_toolBar );
 	mixer_window->setShortcut( Qt::CTRL + Qt::Key_5 );
 
@@ -542,7 +542,7 @@ void MainWindow::finalize()
 					embed::getIconPixmap( "controller" ),
 					tr( "Show/hide controller rack" ) +
 								" (Ctrl+6)",
-					this, SLOT( toggleControllerRack() ),
+					this, SLOT(toggleControllerRack()),
 								m_toolBar );
 	controllers_window->setShortcut( Qt::CTRL + Qt::Key_6 );
 
@@ -550,7 +550,7 @@ void MainWindow::finalize()
 					embed::getIconPixmap( "project_notes" ),
 					tr( "Show/hide project notes" ) +
 								" (Ctrl+7)",
-					this, SLOT( toggleProjectNotesWin() ),
+					this, SLOT(toggleProjectNotesWin()),
 								m_toolBar );
 	project_notes_window->setShortcut( Qt::CTRL + Qt::Key_7 );
 
@@ -558,7 +558,7 @@ void MainWindow::finalize()
 					embed::getIconPixmap( "microtuner" ),
 					tr( "Microtuner configuration" ) +
 								" (Ctrl+8)",
-					this, SLOT( toggleMicrotunerWin() ),
+					this, SLOT(toggleMicrotunerWin()),
 								m_toolBar );
 	microtuner_window->setShortcut( Qt::CTRL + Qt::Key_8 );
 
@@ -616,7 +616,7 @@ void MainWindow::finalize()
 	// reset window title every time we change the state of a subwindow to show the correct title
 	for( const QMdiSubWindow * subWindow : workspace()->subWindowList() )
 	{
-		connect( subWindow, SIGNAL( windowStateChanged(Qt::WindowStates,Qt::WindowStates) ), this, SLOT( resetWindowTitle() ) );
+		connect( subWindow, SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates)), this, SLOT(resetWindowTitle()));
 	}
 }
 
@@ -1146,7 +1146,7 @@ void MainWindow::updateViewMenu()
 	// not on top -> top <-> invisible
 	m_viewMenu->addAction(embed::getIconPixmap( "songeditor" ),
 			      tr( "Song Editor" ) + "\tCtrl+1",
-			      this, SLOT( toggleSongEditorWin() )
+			      this, SLOT(toggleSongEditorWin())
 		);
 	m_viewMenu->addAction(embed::getIconPixmap("pattern_track"),
 					tr("Pattern Editor") + "\tCtrl+2",
@@ -1154,35 +1154,35 @@ void MainWindow::updateViewMenu()
 		);
 	m_viewMenu->addAction(embed::getIconPixmap( "piano" ),
 			      tr( "Piano Roll" ) + "\tCtrl+3",
-			      this, SLOT( togglePianoRollWin() )
+			      this, SLOT(togglePianoRollWin())
 		);
 	m_viewMenu->addAction(embed::getIconPixmap( "automation" ),
 			      tr( "Automation Editor" ) + "\tCtrl+4",
 			      this,
-			      SLOT( toggleAutomationEditorWin())
+			      SLOT(toggleAutomationEditorWin())
 		);
 	m_viewMenu->addAction(embed::getIconPixmap( "mixer" ),
 			      tr( "Mixer" ) + "\tCtrl+5",
-			      this, SLOT( toggleMixerWin() )
+			      this, SLOT(toggleMixerWin())
 		);
 	m_viewMenu->addAction(embed::getIconPixmap( "controller" ),
 			      tr( "Controller Rack" ) + "\tCtrl+6",
-			      this, SLOT( toggleControllerRack() )
+			      this, SLOT(toggleControllerRack())
 		);
 	m_viewMenu->addAction(embed::getIconPixmap( "project_notes" ),
 			      tr( "Project Notes" ) + "\tCtrl+7",
-			      this, SLOT( toggleProjectNotesWin() )
+			      this, SLOT(toggleProjectNotesWin())
 		);
 	m_viewMenu->addAction(embed::getIconPixmap( "microtuner" ),
 			      tr( "Microtuner" ) + "\tCtrl+8",
-			      this, SLOT( toggleMicrotunerWin() )
+			      this, SLOT(toggleMicrotunerWin())
 		);
 
 	m_viewMenu->addSeparator();
 	
 	m_viewMenu->addAction(embed::getIconPixmap( "fullscreen" ),
 				tr( "Fullscreen" ) + "\tF11",
-				this, SLOT( toggleFullscreen() ) 
+				this, SLOT(toggleFullscreen())
 		);
 
 	m_viewMenu->addSeparator();
diff --git a/src/gui/MixerLine.cpp b/src/gui/MixerLine.cpp
index bf63a9035..900298496 100644
--- a/src/gui/MixerLine.cpp
+++ b/src/gui/MixerLine.cpp
@@ -134,8 +134,8 @@ MixerLine::MixerLine( QWidget * _parent, MixerView * _mv, int _channelIndex ) :
 	proxyWidget->setRotation( -90 );
 	proxyWidget->setPos( 8, 145 );
 
-	connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) );
-	connect( &Engine::mixer()->mixerChannel( m_channelIndex )->m_muteModel, SIGNAL( dataChanged() ), this, SLOT( update() ) );
+	connect( m_renameLineEdit, SIGNAL(editingFinished()), this, SLOT(renameFinished()));
+	connect( &Engine::mixer()->mixerChannel( m_channelIndex )->m_muteModel, SIGNAL(dataChanged()), this, SLOT(update()));
 }
 
 
@@ -251,18 +251,18 @@ void MixerLine::contextMenuEvent( QContextMenuEvent * )
 	QPointer<CaptionMenu> contextMenu = new CaptionMenu( Engine::mixer()->mixerChannel( m_channelIndex )->m_name, this );
 	if( m_channelIndex != 0 ) // no move-options in master
 	{
-		contextMenu->addAction( tr( "Move &left" ),	this, SLOT( moveChannelLeft() ) );
-		contextMenu->addAction( tr( "Move &right" ), this, SLOT( moveChannelRight() ) );
+		contextMenu->addAction( tr( "Move &left" ),	this, SLOT(moveChannelLeft()));
+		contextMenu->addAction( tr( "Move &right" ), this, SLOT(moveChannelRight()));
 	}
-	contextMenu->addAction( tr( "Rename &channel" ), this, SLOT( renameChannel() ) );
+	contextMenu->addAction( tr( "Rename &channel" ), this, SLOT(renameChannel()));
 	contextMenu->addSeparator();
 
 	if( m_channelIndex != 0 ) // no remove-option in master
 	{
-		contextMenu->addAction( embed::getIconPixmap( "cancel" ), tr( "R&emove channel" ), this, SLOT( removeChannel() ) );
+		contextMenu->addAction( embed::getIconPixmap( "cancel" ), tr( "R&emove channel" ), this, SLOT(removeChannel()));
 		contextMenu->addSeparator();
 	}
-	contextMenu->addAction( embed::getIconPixmap( "cancel" ), tr( "Remove &unused channels" ), this, SLOT( removeUnusedChannels() ) );
+	contextMenu->addAction( embed::getIconPixmap( "cancel" ), tr( "Remove &unused channels" ), this, SLOT(removeUnusedChannels()));
 	contextMenu->addSeparator();
 
 	QMenu colorMenu(tr("Color"), this);
diff --git a/src/gui/MixerView.cpp b/src/gui/MixerView.cpp
index 5368fcf7d..6e3d9f95a 100644
--- a/src/gui/MixerView.cpp
+++ b/src/gui/MixerView.cpp
@@ -134,7 +134,7 @@ MixerView::MixerView() :
 	QPushButton * newChannelBtn = new QPushButton( embed::getIconPixmap( "new_channel" ), QString(), this );
 	newChannelBtn->setObjectName( "newChannelBtn" );
 	newChannelBtn->setFixedSize( mixerLineSize );
-	connect( newChannelBtn, SIGNAL( clicked() ), this, SLOT( addNewChannel() ) );
+	connect( newChannelBtn, SIGNAL(clicked()), this, SLOT(addNewChannel()));
 	ml->addWidget( newChannelBtn, 0, Qt::AlignTop );
 
 
@@ -147,8 +147,8 @@ MixerView::MixerView() :
 	updateGeometry();
 
 	// timer for updating faders
-	connect( getGUI()->mainWindow(), SIGNAL( periodicUpdate() ),
-					this, SLOT( updateFaders() ) );
+	connect( getGUI()->mainWindow(), SIGNAL(periodicUpdate()),
+					this, SLOT(updateFaders()));
 
 
 	// add ourself to workspace
@@ -311,7 +311,7 @@ MixerView::MixerChannelView::MixerChannelView(QWidget * _parent, MixerView * _mv
 				embed::getIconPixmap( "led_off" ) );
 	m_soloBtn->setCheckable( true );
 	m_soloBtn->move( 9,  m_fader->y()-21);
-	connect(&mixerChannel->m_soloModel, SIGNAL( dataChanged() ),
+	connect(&mixerChannel->m_soloModel, SIGNAL(dataChanged()),
 			_mv, SLOT ( toggledSolo() ), Qt::DirectConnection );
 	m_soloBtn->setToolTip(tr("Solo this channel"));
 
diff --git a/src/gui/ModelView.cpp b/src/gui/ModelView.cpp
index 4ccdffd72..b2536fd9c 100644
--- a/src/gui/ModelView.cpp
+++ b/src/gui/ModelView.cpp
@@ -90,8 +90,8 @@ void ModelView::doConnections()
 {
 	if( m_model != nullptr )
 	{
-		QObject::connect( m_model, SIGNAL( dataChanged() ), widget(), SLOT( update() ) );
-		QObject::connect( m_model, SIGNAL( propertiesChanged() ), widget(), SLOT( update() ) );
+		QObject::connect( m_model, SIGNAL(dataChanged()), widget(), SLOT(update()));
+		QObject::connect( m_model, SIGNAL(propertiesChanged()), widget(), SLOT(update()));
 	}
 }
 
diff --git a/src/gui/PluginBrowser.cpp b/src/gui/PluginBrowser.cpp
index 2fd1374da..d6ba73903 100644
--- a/src/gui/PluginBrowser.cpp
+++ b/src/gui/PluginBrowser.cpp
@@ -74,8 +74,8 @@ PluginBrowser::PluginBrowser( QWidget * _parent ) :
 	m_descTree->setIndentation( 10 );
 	m_descTree->setSelectionMode( QAbstractItemView::NoSelection );
 
-	connect( searchBar, SIGNAL( textEdited( const QString & ) ),
-			this, SLOT( onFilterChanged( const QString & ) ) );
+	connect( searchBar, SIGNAL( textEdited( const QString& ) ),
+			this, SLOT( onFilterChanged( const QString& ) ) );
 
 	view_layout->addWidget( hint );
 	view_layout->addWidget( searchBar );
diff --git a/src/gui/ProjectNotes.cpp b/src/gui/ProjectNotes.cpp
index 9a218c571..22e806cdb 100644
--- a/src/gui/ProjectNotes.cpp
+++ b/src/gui/ProjectNotes.cpp
@@ -61,12 +61,12 @@ ProjectNotes::ProjectNotes() :
 	clear();
 
 	connect( m_edit,
-		SIGNAL( currentCharFormatChanged( const QTextCharFormat & ) ),
-		this, SLOT( formatChanged( const QTextCharFormat & ) ) );
-//	connect( m_edit, SIGNAL( currentAlignmentChanged( int ) ),
-//			this, SLOT( alignmentChanged( int ) ) );
-	connect( m_edit, SIGNAL( textChanged() ),
-			Engine::getSong(), SLOT( setModified() ) );
+		SIGNAL( currentCharFormatChanged( const QTextCharFormat& ) ),
+		this, SLOT( formatChanged( const QTextCharFormat& ) ) );
+//	connect( m_edit, SIGNAL(currentAlignmentChanged(int)),
+//			this, SLOT(alignmentChanged(int)));
+	connect( m_edit, SIGNAL(textChanged()),
+			Engine::getSong(), SLOT(setModified()));
 
 	setupActions();
 
@@ -120,31 +120,31 @@ void ProjectNotes::setupActions()
 	a = new QAction( embed::getIconPixmap( "edit_undo" ), tr( "&Undo" ),
 									this );
 	a->setShortcut( tr( "%1+Z" ).arg(UI_CTRL_KEY) );
-	connect( a, SIGNAL( triggered() ), m_edit, SLOT( undo() ) );
+	connect( a, SIGNAL(triggered()), m_edit, SLOT(undo()));
 	tb->addAction( a );
 
 	a = new QAction( embed::getIconPixmap( "edit_redo" ), tr( "&Redo" ),
 									this );
 	a->setShortcut( tr( "%1+Y" ).arg(UI_CTRL_KEY) );
-	connect( a, SIGNAL( triggered() ), m_edit, SLOT( redo() ) );
+	connect( a, SIGNAL(triggered()), m_edit, SLOT(redo()));
 	tb->addAction( a );
 
 	a = new QAction( embed::getIconPixmap( "edit_copy" ), tr( "&Copy" ),
 									this );
 	a->setShortcut( tr( "%1+C" ).arg(UI_CTRL_KEY) );
-	connect( a, SIGNAL( triggered() ), m_edit, SLOT( copy() ) );
+	connect( a, SIGNAL(triggered()), m_edit, SLOT(copy()));
 	tb->addAction( a );
 
 	a = new QAction( embed::getIconPixmap( "edit_cut" ), tr( "Cu&t" ),
 									this );
 	a->setShortcut( tr( "%1+X" ).arg(UI_CTRL_KEY) );
-	connect( a, SIGNAL( triggered() ), m_edit, SLOT( cut() ) );
+	connect( a, SIGNAL(triggered()), m_edit, SLOT(cut()));
 	tb->addAction( a );
 
 	a = new QAction( embed::getIconPixmap( "edit_paste" ), tr( "&Paste" ),
 									this );
 	a->setShortcut( tr( "%1+V" ).arg(UI_CTRL_KEY) );
-	connect( a, SIGNAL( triggered() ), m_edit, SLOT( paste() ) );
+	connect( a, SIGNAL(triggered()), m_edit, SLOT(paste()));
 	tb->addAction( a );
 
 
@@ -154,8 +154,8 @@ void ProjectNotes::setupActions()
 	m_comboFont->setEditable( true );
 	QFontDatabase db;
 	m_comboFont->addItems( db.families() );
-	connect( m_comboFont, SIGNAL( activated( const QString & ) ),
-			m_edit, SLOT( setFontFamily( const QString & ) ) );
+	connect( m_comboFont, SIGNAL( activated( const QString& ) ),
+			m_edit, SLOT( setFontFamily( const QString& ) ) );
 	m_comboFont->lineEdit()->setText( QApplication::font().family() );
 
 	m_comboSize = new QComboBox( tb );
@@ -166,8 +166,8 @@ void ProjectNotes::setupActions()
 	{
 		m_comboSize->addItem( QString::number( *it ) );
 	}
-	connect( m_comboSize, SIGNAL( activated( const QString & ) ),
-		     this, SLOT( textSize( const QString & ) ) );
+	connect( m_comboSize, SIGNAL( activated( const QString& ) ),
+		     this, SLOT( textSize( const QString& ) ) );
 	m_comboSize->lineEdit()->setText( QString::number(
 					QApplication::font().pointSize() ) );
 
@@ -175,28 +175,28 @@ void ProjectNotes::setupActions()
 							tr( "&Bold" ), this );
 	m_actionTextBold->setShortcut( tr( "%1+B" ).arg(UI_CTRL_KEY) );
 	m_actionTextBold->setCheckable( true );
-	connect( m_actionTextBold, SIGNAL( triggered() ), this,
-							SLOT( textBold() ) );
+	connect( m_actionTextBold, SIGNAL(triggered()), this,
+							SLOT(textBold()));
 
 	m_actionTextItalic = new QAction( embed::getIconPixmap( "text_italic" ),
 							tr( "&Italic" ), this );
 	m_actionTextItalic->setShortcut( tr( "%1+I" ).arg(UI_CTRL_KEY) );
 	m_actionTextItalic->setCheckable( true );
-	connect( m_actionTextItalic, SIGNAL( triggered() ), this,
-							SLOT( textItalic() ) );
+	connect( m_actionTextItalic, SIGNAL(triggered()), this,
+							SLOT(textItalic()));
 
 	m_actionTextUnderline = new QAction( embed::getIconPixmap(
 								"text_under" ),
 						tr( "&Underline" ), this );
 	m_actionTextUnderline->setShortcut( tr( "%1+U" ).arg(UI_CTRL_KEY) );
 	m_actionTextUnderline->setCheckable( true );
-	connect( m_actionTextUnderline, SIGNAL( triggered() ), this,
-						SLOT( textUnderline() ) );
+	connect( m_actionTextUnderline, SIGNAL(triggered()), this,
+						SLOT(textUnderline()));
 
 
 	QActionGroup * grp = new QActionGroup( tb );
-	connect( grp, SIGNAL( triggered( QAction * ) ), this,
-					SLOT( textAlign( QAction * ) ) );
+	connect( grp, SIGNAL(triggered(QAction*)), this,
+					SLOT(textAlign(QAction*)));
 
 	m_actionAlignLeft = new QAction( embed::getIconPixmap( "text_left" ),
 						tr( "&Left" ), m_edit );
@@ -230,8 +230,8 @@ void ProjectNotes::setupActions()
 	QPixmap pix( 16, 16 );
 	pix.fill( Qt::black );
 	m_actionTextColor = new QAction( pix, tr( "&Color..." ), this );
-	connect( m_actionTextColor, SIGNAL( triggered() ), this,
-							SLOT( textColor() ) );
+	connect( m_actionTextColor, SIGNAL(triggered()), this,
+							SLOT(textColor()));
 
 	tb->addWidget( m_comboFont );
 	tb->addWidget( m_comboSize );
diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp
index 1aee88082..c8901dda2 100644
--- a/src/gui/SampleTrackWindow.cpp
+++ b/src/gui/SampleTrackWindow.cpp
@@ -75,8 +75,8 @@ SampleTrackWindow::SampleTrackWindow(SampleTrackView * tv) :
 	// setup line edit for changing sample track name
 	m_nameLineEdit = new QLineEdit;
 	m_nameLineEdit->setFont(pointSize<9>(m_nameLineEdit->font()));
-	connect(m_nameLineEdit, SIGNAL(textChanged(const QString &)),
-				this, SLOT(textChanged(const QString &)));
+	connect(m_nameLineEdit, SIGNAL(textChanged(const QString&)),
+				this, SLOT(textChanged(const QString&)));
 
 	m_nameLineEdit->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred));
 	nameLayout->addWidget(m_nameLineEdit);
diff --git a/src/gui/SideBar.cpp b/src/gui/SideBar.cpp
index 0eca4d9f8..e16367a7b 100644
--- a/src/gui/SideBar.cpp
+++ b/src/gui/SideBar.cpp
@@ -94,8 +94,8 @@ SideBar::SideBar( Qt::Orientation _orientation, QWidget * _parent ) :
 	setIconSize( QSize( 16, 16 ) );
 
 	m_btnGroup.setExclusive( false );
-	connect( &m_btnGroup, SIGNAL( buttonClicked( QAbstractButton * ) ),
-				this, SLOT( toggleButton( QAbstractButton * ) ) );
+	connect( &m_btnGroup, SIGNAL(buttonClicked(QAbstractButton*)),
+				this, SLOT(toggleButton(QAbstractButton*)));
 }
 
 
diff --git a/src/gui/SubWindow.cpp b/src/gui/SubWindow.cpp
index add614670..78e4f586c 100644
--- a/src/gui/SubWindow.cpp
+++ b/src/gui/SubWindow.cpp
@@ -63,7 +63,7 @@ SubWindow::SubWindow( QWidget *parent, Qt::WindowFlags windowFlags ) :
 	m_closeBtn->setCursor( Qt::ArrowCursor );
 	m_closeBtn->setAttribute( Qt::WA_NoMousePropagation );
 	m_closeBtn->setToolTip( tr( "Close" ) );
-	connect( m_closeBtn, SIGNAL( clicked( bool ) ), this, SLOT( close() ) );
+	connect( m_closeBtn, SIGNAL(clicked(bool)), this, SLOT(close()));
 
 	m_maximizeBtn = new QPushButton( embed::getIconPixmap( "maximize" ), QString(), this );
 	m_maximizeBtn->resize( m_buttonSize );
@@ -71,7 +71,7 @@ SubWindow::SubWindow( QWidget *parent, Qt::WindowFlags windowFlags ) :
 	m_maximizeBtn->setCursor( Qt::ArrowCursor );
 	m_maximizeBtn->setAttribute( Qt::WA_NoMousePropagation );
 	m_maximizeBtn->setToolTip( tr( "Maximize" ) );
-	connect( m_maximizeBtn, SIGNAL( clicked( bool ) ), this, SLOT( showMaximized() ) );
+	connect( m_maximizeBtn, SIGNAL(clicked(bool)), this, SLOT(showMaximized()));
 
 	m_restoreBtn = new QPushButton( embed::getIconPixmap( "restore" ), QString(), this );
 	m_restoreBtn->resize( m_buttonSize );
@@ -79,7 +79,7 @@ SubWindow::SubWindow( QWidget *parent, Qt::WindowFlags windowFlags ) :
 	m_restoreBtn->setCursor( Qt::ArrowCursor );
 	m_restoreBtn->setAttribute( Qt::WA_NoMousePropagation );
 	m_restoreBtn->setToolTip( tr( "Restore" ) );
-	connect( m_restoreBtn, SIGNAL( clicked( bool ) ), this, SLOT( showNormal() ) );
+	connect( m_restoreBtn, SIGNAL(clicked(bool)), this, SLOT(showNormal()));
 
 	// QLabel for the window title and the shadow effect
 	m_shadow = new QGraphicsDropShadowEffect();
@@ -96,7 +96,7 @@ SubWindow::SubWindow( QWidget *parent, Qt::WindowFlags windowFlags ) :
 	setWindowFlags( Qt::SubWindow | Qt::WindowMaximizeButtonHint |
 		Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint |
 		Qt::CustomizeWindowHint );
-	connect( mdiArea(), SIGNAL( subWindowActivated( QMdiSubWindow* ) ), this, SLOT( focusChanged( QMdiSubWindow* ) ) );
+	connect( mdiArea(), SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(focusChanged(QMdiSubWindow*)));
 }
 
 
diff --git a/src/gui/clips/AutomationClipView.cpp b/src/gui/clips/AutomationClipView.cpp
index b87e7e097..2bc29184c 100644
--- a/src/gui/clips/AutomationClipView.cpp
+++ b/src/gui/clips/AutomationClipView.cpp
@@ -52,10 +52,10 @@ AutomationClipView::AutomationClipView( AutomationClip * _clip,
 	m_clip( _clip ),
 	m_paintPixmap()
 {
-	connect( m_clip, SIGNAL( dataChanged() ),
-			this, SLOT( update() ) );
-	connect( getGUI()->automationEditor(), SIGNAL( currentClipChanged() ),
-			this, SLOT( update() ) );
+	connect( m_clip, SIGNAL(dataChanged()),
+			this, SLOT(update()));
+	connect( getGUI()->automationEditor(), SIGNAL(currentClipChanged()),
+			this, SLOT(update()));
 
 	setAttribute( Qt::WA_OpaquePaintEvent, true );
 
@@ -182,23 +182,23 @@ void AutomationClipView::constructContextMenu( QMenu * _cm )
 	_cm->addSeparator();
 
 	_cm->addAction( embed::getIconPixmap( "edit_erase" ),
-			tr( "Clear" ), m_clip, SLOT( clear() ) );
+			tr( "Clear" ), m_clip, SLOT(clear()));
 	_cm->addSeparator();
 
 	_cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ),
-						this, SLOT( resetName() ) );
+						this, SLOT(resetName()));
 	_cm->addAction( embed::getIconPixmap( "edit_rename" ),
 						tr( "Change name" ),
-						this, SLOT( changeName() ) );
+						this, SLOT(changeName()));
 	_cm->addAction( embed::getIconPixmap( "record" ),
 						tr( "Set/clear record" ),
-						this, SLOT( toggleRecording() ) );
+						this, SLOT(toggleRecording()));
 	_cm->addAction( embed::getIconPixmap( "flip_y" ),
 						tr( "Flip Vertically (Visible)" ),
-						this, SLOT( flipY() ) );
+						this, SLOT(flipY()));
 	_cm->addAction( embed::getIconPixmap( "flip_x" ),
 						tr( "Flip Horizontally (Visible)" ),
-						this, SLOT( flipX() ) );
+						this, SLOT(flipX()));
 	if( !m_clip->m_objects.isEmpty() )
 	{
 		_cm->addSeparator();
@@ -216,8 +216,8 @@ void AutomationClipView::constructContextMenu( QMenu * _cm )
 				m->addAction( a );
 			}
 		}
-		connect( m, SIGNAL( triggered( QAction * ) ),
-				this, SLOT( disconnectObject( QAction * ) ) );
+		connect( m, SIGNAL(triggered(QAction*)),
+				this, SLOT(disconnectObject(QAction*)));
 		_cm->addMenu( m );
 	}
 }
diff --git a/src/gui/clips/ClipView.cpp b/src/gui/clips/ClipView.cpp
index a9afca910..4748986ac 100644
--- a/src/gui/clips/ClipView.cpp
+++ b/src/gui/clips/ClipView.cpp
@@ -121,12 +121,12 @@ ClipView::ClipView( Clip * clip,
 	setAcceptDrops( true );
 	setMouseTracking( true );
 
-	connect( m_clip, SIGNAL( lengthChanged() ),
-			this, SLOT( updateLength() ) );
-	connect( getGUI()->songEditor()->m_editor->zoomingModel(), SIGNAL( dataChanged() ), this, SLOT( updateLength() ) );
-	connect( m_clip, SIGNAL( positionChanged() ),
-			this, SLOT( updatePosition() ) );
-	connect( m_clip, SIGNAL( destroyedClip() ), this, SLOT( close() ) );
+	connect( m_clip, SIGNAL(lengthChanged()),
+			this, SLOT(updateLength()));
+	connect( getGUI()->songEditor()->m_editor->zoomingModel(), SIGNAL(dataChanged()), this, SLOT(updateLength()));
+	connect( m_clip, SIGNAL(positionChanged()),
+			this, SLOT(updatePosition()));
+	connect( m_clip, SIGNAL(destroyedClip()), this, SLOT(close()));
 	setModel( m_clip );
 	connect(m_clip, SIGNAL(colorChanged()), this, SLOT(update()));
 
diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp
index 355363a01..675b350db 100644
--- a/src/gui/clips/MidiClipView.cpp
+++ b/src/gui/clips/MidiClipView.cpp
@@ -52,8 +52,8 @@ MidiClipView::MidiClipView( MidiClip* clip, TrackView* parent ) :
 	// TODO if this option is ever added to the GUI, rename it to legacysepattern
 	m_legacySEPattern(ConfigManager::inst()->value("ui", "legacysebb", "0").toInt())
 {
-	connect( getGUI()->pianoRoll(), SIGNAL( currentMidiClipChanged() ),
-			this, SLOT( update() ) );
+	connect( getGUI()->pianoRoll(), SIGNAL(currentMidiClipChanged()),
+			this, SLOT(update()));
 
 	if( s_stepBtnOn0 == nullptr )
 	{
@@ -149,38 +149,38 @@ void MidiClipView::constructContextMenu( QMenu * _cm )
 	QAction * a = new QAction( embed::getIconPixmap( "piano" ),
 					tr( "Open in piano-roll" ), _cm );
 	_cm->insertAction( _cm->actions()[0], a );
-	connect( a, SIGNAL( triggered( bool ) ),
-					this, SLOT( openInPianoRoll() ) );
+	connect( a, SIGNAL(triggered(bool)),
+					this, SLOT(openInPianoRoll()));
 
 	QAction * b = new QAction( embed::getIconPixmap( "ghost_note" ),
 						tr( "Set as ghost in piano-roll" ), _cm );
 	if( m_clip->empty() ) { b->setEnabled( false ); }
 	_cm->insertAction( _cm->actions()[1], b );
-	connect( b, SIGNAL( triggered( bool ) ),
-					this, SLOT( setGhostInPianoRoll() ) );
+	connect( b, SIGNAL(triggered(bool)),
+					this, SLOT(setGhostInPianoRoll()));
 	_cm->insertSeparator( _cm->actions()[2] );
 	_cm->addSeparator();
 
 	_cm->addAction( embed::getIconPixmap( "edit_erase" ),
-			tr( "Clear all notes" ), m_clip, SLOT( clear() ) );
+			tr( "Clear all notes" ), m_clip, SLOT(clear()));
 	_cm->addSeparator();
 
 	_cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ),
-						this, SLOT( resetName() ) );
+						this, SLOT(resetName()));
 	_cm->addAction( embed::getIconPixmap( "edit_rename" ),
 						tr( "Change name" ),
-						this, SLOT( changeName() ) );
+						this, SLOT(changeName()));
 
 	if ( m_clip->type() == MidiClip::BeatClip )
 	{
 		_cm->addSeparator();
 
 		_cm->addAction( embed::getIconPixmap( "step_btn_add" ),
-			tr( "Add steps" ), m_clip, SLOT( addSteps() ) );
+			tr( "Add steps" ), m_clip, SLOT(addSteps()));
 		_cm->addAction( embed::getIconPixmap( "step_btn_remove" ),
-			tr( "Remove steps" ), m_clip, SLOT( removeSteps() ) );
+			tr( "Remove steps" ), m_clip, SLOT(removeSteps()));
 		_cm->addAction( embed::getIconPixmap( "step_btn_duplicate" ),
-			tr( "Clone Steps" ), m_clip, SLOT( cloneSteps() ) );
+			tr( "Clone Steps" ), m_clip, SLOT(cloneSteps()));
 	}
 }
 
diff --git a/src/gui/clips/PatternClipView.cpp b/src/gui/clips/PatternClipView.cpp
index 3884b3eb6..f65595f52 100644
--- a/src/gui/clips/PatternClipView.cpp
+++ b/src/gui/clips/PatternClipView.cpp
@@ -44,8 +44,8 @@ PatternClipView::PatternClipView(Clip* _clip, TrackView* _tv) :
 	m_patternClip(dynamic_cast<PatternClip*>(_clip)),
 	m_paintPixmap()
 {
-	connect( _clip->getTrack(), SIGNAL( dataChanged() ), 
-			this, SLOT( update() ) );
+	connect( _clip->getTrack(), SIGNAL(dataChanged()), 
+			this, SLOT(update()));
 
 	setStyle( QApplication::style() );
 }
@@ -56,15 +56,15 @@ void PatternClipView::constructContextMenu(QMenu* _cm)
 					tr("Open in Pattern Editor"),
 					_cm );
 	_cm->insertAction( _cm->actions()[0], a );
-	connect( a, SIGNAL( triggered( bool ) ),
-			this, SLOT( openInPatternEditor() ) );
+	connect( a, SIGNAL(triggered(bool)),
+			this, SLOT(openInPatternEditor()));
 	_cm->insertSeparator( _cm->actions()[1] );
 	_cm->addSeparator();
 	_cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ),
-						this, SLOT( resetName() ) );
+						this, SLOT(resetName()));
 	_cm->addAction( embed::getIconPixmap( "edit_rename" ),
 						tr( "Change name" ),
-						this, SLOT( changeName() ) );
+						this, SLOT(changeName()));
 }
 
 
diff --git a/src/gui/clips/SampleClipView.cpp b/src/gui/clips/SampleClipView.cpp
index d2fe7cbaa..5b3228de7 100644
--- a/src/gui/clips/SampleClipView.cpp
+++ b/src/gui/clips/SampleClipView.cpp
@@ -74,7 +74,7 @@ void SampleClipView::constructContextMenu(QMenu* cm)
 
 	/*contextMenu.addAction( embed::getIconPixmap( "record" ),
 				tr( "Set/clear record" ),
-						m_clip, SLOT( toggleRecord() ) );*/
+						m_clip, SLOT(toggleRecord()));*/
 
 	cm->addAction(
 		embed::getIconPixmap("flip_x"),
diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
index 8f8cdd570..fba88643e 100644
--- a/src/gui/editors/AutomationEditor.cpp
+++ b/src/gui/editors/AutomationEditor.cpp
@@ -110,11 +110,11 @@ AutomationEditor::AutomationEditor() :
 	m_crossColor(0, 0, 0),
 	m_backgroundShade(0, 0, 0)
 {
-	connect( this, SIGNAL( currentClipChanged() ),
-				this, SLOT( updateAfterClipChange() ),
+	connect( this, SIGNAL(currentClipChanged()),
+				this, SLOT(updateAfterClipChange()),
 				Qt::QueuedConnection );
-	connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
-						this, SLOT( update() ) );
+	connect( Engine::getSong(), SIGNAL(timeSignatureChanged(int,int)),
+						this, SLOT(update()));
 
 	setAttribute( Qt::WA_OpaquePaintEvent, true );
 
@@ -122,15 +122,15 @@ AutomationEditor::AutomationEditor() :
 	setLayoutDirection( Qt::LeftToRight );
 
 	m_tensionModel = new FloatModel(1.0, 0.0, 1.0, 0.01);
-	connect( m_tensionModel, SIGNAL( dataChanged() ),
-				this, SLOT( setTension() ) );
+	connect( m_tensionModel, SIGNAL(dataChanged()),
+				this, SLOT(setTension()));
 
 	for (auto q : Quantizations) {
 		m_quantizeModel.addItem(QString("1/%1").arg(q));
 	}
 
-	connect( &m_quantizeModel, SIGNAL(dataChanged() ),
-					this, SLOT( setQuantization() ) );
+	connect( &m_quantizeModel, SIGNAL(dataChanged()),
+					this, SLOT(setQuantization()));
 	m_quantizeModel.setValue( m_quantizeModel.findText( "1/8" ) );
 
 	if (s_toolYFlip == nullptr)
@@ -150,22 +150,22 @@ AutomationEditor::AutomationEditor() :
 					Song::Mode_PlayAutomationClip ),
 					m_currentPosition,
 					Song::Mode_PlayAutomationClip, this );
-	connect( this, SIGNAL( positionChanged( const lmms::TimePos & ) ),
-		m_timeLine, SLOT( updatePosition( const lmms::TimePos & ) ) );
-	connect( m_timeLine, SIGNAL( positionChanged( const lmms::TimePos & ) ),
-			this, SLOT( updatePosition( const lmms::TimePos & ) ) );
+	connect( this, SIGNAL( positionChanged( const lmms::TimePos& ) ),
+		m_timeLine, SLOT( updatePosition( const lmms::TimePos& ) ) );
+	connect( m_timeLine, SIGNAL( positionChanged( const lmms::TimePos& ) ),
+			this, SLOT( updatePosition( const lmms::TimePos& ) ) );
 
 	// init scrollbars
 	m_leftRightScroll = new QScrollBar( Qt::Horizontal, this );
 	m_leftRightScroll->setSingleStep( 1 );
-	connect( m_leftRightScroll, SIGNAL( valueChanged( int ) ), this,
-						SLOT( horScrolled( int ) ) );
+	connect( m_leftRightScroll, SIGNAL(valueChanged(int)), this,
+						SLOT(horScrolled(int)));
 
 	m_topBottomScroll = new QScrollBar( Qt::Vertical, this );
 	m_topBottomScroll->setSingleStep( 1 );
 	m_topBottomScroll->setPageStep( 20 );
-	connect( m_topBottomScroll, SIGNAL( valueChanged( int ) ), this,
-						SLOT( verScrolled( int ) ) );
+	connect( m_topBottomScroll, SIGNAL(valueChanged(int)), this,
+						SLOT(verScrolled(int)));
 
 	// init pixmaps
 	if (s_toolDraw == nullptr)
@@ -1914,8 +1914,8 @@ AutomationEditorWindow::AutomationEditorWindow() :
 
 	m_zoomingXComboBox->setModel( &m_editor->m_zoomingXModel );
 
-	connect( &m_editor->m_zoomingXModel, SIGNAL( dataChanged() ),
-			m_editor, SLOT( zoomingXChanged() ) );
+	connect( &m_editor->m_zoomingXModel, SIGNAL(dataChanged()),
+			m_editor, SLOT(zoomingXChanged()));
 
 
 	QLabel * zoom_y_label = new QLabel( zoomToolBar );
@@ -1934,8 +1934,8 @@ AutomationEditorWindow::AutomationEditorWindow() :
 
 	m_zoomingYComboBox->setModel( &m_editor->m_zoomingYModel );
 
-	connect( &m_editor->m_zoomingYModel, SIGNAL( dataChanged() ),
-			m_editor, SLOT( zoomingYChanged() ) );
+	connect( &m_editor->m_zoomingYModel, SIGNAL(dataChanged()),
+			m_editor, SLOT(zoomingYChanged()));
 
 	zoomToolBar->addWidget( zoom_x_label );
 	zoomToolBar->addWidget( m_zoomingXComboBox );
@@ -2014,7 +2014,7 @@ void AutomationEditorWindow::setCurrentClip(AutomationClip* clip)
 	if (clip)
 	{
 		connect(clip, SIGNAL(dataChanged()), this, SLOT(update()));
-		connect( clip, SIGNAL( dataChanged() ), this, SLOT( updateWindowTitle() ) );
+		connect( clip, SIGNAL(dataChanged()), this, SLOT(updateWindowTitle()));
 		connect(clip, SIGNAL(destroyed()), this, SLOT(clearCurrentClip()));
 
 		connect(m_flipXAction, SIGNAL(triggered()), clip, SLOT(flipX()));
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index fd1cd0480..b9f0e1397 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -251,8 +251,8 @@ PianoRoll::PianoRoll() :
 	markScaleAction->setEnabled( false );
 	markChordAction->setEnabled( false );
 
-	connect( this, SIGNAL(semiToneMarkerMenuScaleSetEnabled(bool)), markScaleAction, SLOT(setEnabled(bool)) );
-	connect( this, SIGNAL(semiToneMarkerMenuChordSetEnabled(bool)), markChordAction, SLOT(setEnabled(bool)) );
+	connect( this, SIGNAL(semiToneMarkerMenuScaleSetEnabled(bool)), markScaleAction, SLOT(setEnabled(bool)));
+	connect( this, SIGNAL(semiToneMarkerMenuChordSetEnabled(bool)), markChordAction, SLOT(setEnabled(bool)));
 
 	m_semiToneMarkerMenu->addAction( markSemitoneAction );
 	m_semiToneMarkerMenu->addAction( markAllOctaveSemitonesAction );
@@ -301,42 +301,42 @@ PianoRoll::PianoRoll() :
 						Song::Mode_PlayMidiClip ),
 						m_currentPosition,
 						Song::Mode_PlayMidiClip, this );
-	connect( this, SIGNAL( positionChanged( const lmms::TimePos & ) ),
-		m_timeLine, SLOT( updatePosition( const lmms::TimePos & ) ) );
-	connect( m_timeLine, SIGNAL( positionChanged( const lmms::TimePos & ) ),
-			this, SLOT( updatePosition( const lmms::TimePos & ) ) );
+	connect( this, SIGNAL( positionChanged( const lmms::TimePos& ) ),
+		m_timeLine, SLOT( updatePosition( const lmms::TimePos& ) ) );
+	connect( m_timeLine, SIGNAL( positionChanged( const lmms::TimePos& ) ),
+			this, SLOT( updatePosition( const lmms::TimePos& ) ) );
 
 	// white position line follows timeline marker
 	m_positionLine = new PositionLine(this);
 
 	//update timeline when in step-recording mode
-	connect( &m_stepRecorderWidget, SIGNAL( positionChanged( const lmms::TimePos & ) ),
-			this, SLOT( updatePositionStepRecording( const lmms::TimePos & ) ) );
+	connect( &m_stepRecorderWidget, SIGNAL( positionChanged( const lmms::TimePos& ) ),
+			this, SLOT( updatePositionStepRecording( const lmms::TimePos& ) ) );
 
 	// update timeline when in record-accompany mode
 	connect( Engine::getSong()->getPlayPos( Song::Mode_PlaySong ).m_timeLine,
-				SIGNAL( positionChanged( const lmms::TimePos & ) ),
+				SIGNAL( positionChanged( const lmms::TimePos& ) ),
 			this,
-			SLOT( updatePositionAccompany( const lmms::TimePos & ) ) );
+			SLOT( updatePositionAccompany( const lmms::TimePos& ) ) );
 	// TODO
 /*	connect( engine::getSong()->getPlayPos( Song::Mode_PlayPattern ).m_timeLine,
-				SIGNAL( positionChanged( const lmms::TimePos & ) ),
+				SIGNAL( positionChanged( const lmms::TimePos& ) ),
 			this,
-			SLOT( updatePositionAccompany( const lmms::TimePos & ) ) );*/
+			SLOT( updatePositionAccompany( const lmms::TimePos& ) ) );*/
 
 	removeSelection();
 
 	// init scrollbars
 	m_leftRightScroll = new QScrollBar( Qt::Horizontal, this );
 	m_leftRightScroll->setSingleStep( 1 );
-	connect( m_leftRightScroll, SIGNAL( valueChanged( int ) ), this,
-						SLOT( horScrolled( int ) ) );
+	connect( m_leftRightScroll, SIGNAL(valueChanged(int)), this,
+						SLOT(horScrolled(int)));
 
 	m_topBottomScroll = new QScrollBar( Qt::Vertical, this );
 	m_topBottomScroll->setSingleStep( 1 );
 	m_topBottomScroll->setPageStep( 20 );
-	connect( m_topBottomScroll, SIGNAL( valueChanged( int ) ), this,
-						SLOT( verScrolled( int ) ) );
+	connect( m_topBottomScroll, SIGNAL(valueChanged(int)), this,
+						SLOT(verScrolled(int)));
 
 	// setup zooming-stuff
 	for( float const & zoomLevel : m_zoomLevels )
@@ -344,8 +344,8 @@ PianoRoll::PianoRoll() :
 		m_zoomingModel.addItem( QString( "%1\%" ).arg( zoomLevel * 100 ) );
 	}
 	m_zoomingModel.setValue( m_zoomingModel.findText( "100%" ) );
-	connect( &m_zoomingModel, SIGNAL( dataChanged() ),
-					this, SLOT( zoomingChanged() ) );
+	connect( &m_zoomingModel, SIGNAL(dataChanged()),
+					this, SLOT(zoomingChanged()));
 
 	// zoom y
 	for (float const & zoomLevel : m_zoomYLevels)
@@ -363,8 +363,8 @@ PianoRoll::PianoRoll() :
 	}
 	m_quantizeModel.setValue( m_quantizeModel.findText( "1/16" ) );
 
-	connect( &m_quantizeModel, SIGNAL( dataChanged() ),
-					this, SLOT( quantizeChanged() ) );
+	connect( &m_quantizeModel, SIGNAL(dataChanged()),
+					this, SLOT(quantizeChanged()));
 
 	// Set up note length model
 	m_noteLenModel.addItem( tr( "Last note" ),
@@ -387,8 +387,8 @@ PianoRoll::PianoRoll() :
 	m_noteLenModel.setValue( 0 );
 
 	// Note length change can cause a redraw if Q is set to lock
-	connect( &m_noteLenModel, SIGNAL( dataChanged() ),
-					this, SLOT( noteLengthChanged() ) );
+	connect( &m_noteLenModel, SIGNAL(dataChanged()),
+					this, SLOT(noteLengthChanged()));
 
 	// Set up key selection dropdown
 	m_keyModel.addItem(tr("No key"));
@@ -414,8 +414,8 @@ PianoRoll::PianoRoll() :
 	// connect scale change to key change so it auto-highlights with scale as well
 	connect(&m_scaleModel, &ComboBoxModel::dataChanged, this, &PianoRoll::keyChanged);
 	// change can update m_semiToneMarkerMenu
-	connect( &m_scaleModel, SIGNAL( dataChanged() ),
-						this, SLOT( updateSemiToneMarkerMenu() ) );
+	connect( &m_scaleModel, SIGNAL(dataChanged()),
+						this, SLOT(updateSemiToneMarkerMenu()));
 
 	// Set up chord model
 	m_chordModel.addItem( tr("No chord") );
@@ -430,22 +430,22 @@ PianoRoll::PianoRoll() :
 	m_chordModel.setValue( 0 );
 
 	// change can update m_semiToneMarkerMenu
-	connect( &m_chordModel, SIGNAL( dataChanged() ),
-					this, SLOT( updateSemiToneMarkerMenu() ) );
+	connect( &m_chordModel, SIGNAL(dataChanged()),
+					this, SLOT(updateSemiToneMarkerMenu()));
 
 	setFocusPolicy( Qt::StrongFocus );
 	setFocus();
 	setMouseTracking( true );
 
-	connect( &m_scaleModel, SIGNAL( dataChanged() ),
-					this, SLOT( updateSemiToneMarkerMenu() ) );
+	connect( &m_scaleModel, SIGNAL(dataChanged()),
+					this, SLOT(updateSemiToneMarkerMenu()));
 
-	connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
-						this, SLOT( update() ) );
+	connect( Engine::getSong(), SIGNAL(timeSignatureChanged(int,int)),
+						this, SLOT(update()));
 
 	//connection for selecion from timeline
-	connect( m_timeLine, SIGNAL( regionSelectedFromPixels( int, int ) ),
-			this, SLOT( selectRegionFromPixels( int, int ) ) );
+	connect( m_timeLine, SIGNAL(regionSelectedFromPixels(int,int)),
+			this, SLOT(selectRegionFromPixels(int,int)));
 
 	// Set up snap model
 	m_snapModel.addItem(tr("Nudge"));
@@ -913,12 +913,12 @@ void PianoRoll::setCurrentMidiClip( MidiClip* newMidiClip )
 	resizeEvent( nullptr );
 
 	// make sure to always get informed about the MIDI clip being destroyed
-	connect( m_midiClip, SIGNAL( destroyedMidiClip( lmms::MidiClip* ) ), this, SLOT( hideMidiClip( lmms::MidiClip* ) ) );
+	connect( m_midiClip, SIGNAL(destroyedMidiClip(lmms::MidiClip*)), this, SLOT(hideMidiClip(lmms::MidiClip*)));
 
 	connect( m_midiClip->instrumentTrack(), SIGNAL( midiNoteOn( const lmms::Note& ) ), this, SLOT( startRecordNote( const lmms::Note& ) ) );
 	connect( m_midiClip->instrumentTrack(), SIGNAL( midiNoteOff( const lmms::Note& ) ), this, SLOT( finishRecordNote( const lmms::Note& ) ) );
 	connect( m_midiClip, SIGNAL(dataChanged()), this, SLOT(update()));
-	connect( m_midiClip->instrumentTrack()->pianoModel(), SIGNAL( dataChanged() ), this, SLOT( update() ) );
+	connect( m_midiClip->instrumentTrack()->pianoModel(), SIGNAL(dataChanged()), this, SLOT(update()));
 
 	connect(m_midiClip->instrumentTrack()->firstKeyModel(), SIGNAL(dataChanged()), this, SLOT(update()));
 	connect(m_midiClip->instrumentTrack()->lastKeyModel(), SIGNAL(dataChanged()), this, SLOT(update()));
@@ -4756,7 +4756,7 @@ PianoRollWindow::PianoRollWindow() :
 	selectAction->setShortcut( Qt::SHIFT | Qt::Key_S );
 	pitchBendAction->setShortcut( Qt::SHIFT | Qt::Key_T );
 
-	connect( editModeGroup, SIGNAL( triggered( int ) ), m_editor, SLOT( setEditMode( int ) ) );
+	connect( editModeGroup, SIGNAL(triggered(int)), m_editor, SLOT(setEditMode(int)));
 
 	// Quantize combo button
 	QToolButton* quantizeButton = new QToolButton(notesActionsToolBar);
@@ -4822,9 +4822,9 @@ PianoRollWindow::PianoRollWindow() :
 	copyAction->setShortcut( Qt::CTRL | Qt::Key_C );
 	pasteAction->setShortcut( Qt::CTRL | Qt::Key_V );
 
-	connect( cutAction, SIGNAL( triggered() ), m_editor, SLOT( cutSelectedNotes() ) );
-	connect( copyAction, SIGNAL( triggered() ), m_editor, SLOT( copySelectedNotes() ) );
-	connect( pasteAction, SIGNAL( triggered() ), m_editor, SLOT( pasteNotes() ) );
+	connect( cutAction, SIGNAL(triggered()), m_editor, SLOT(cutSelectedNotes()));
+	connect( copyAction, SIGNAL(triggered()), m_editor, SLOT(copySelectedNotes()));
+	connect( pasteAction, SIGNAL(triggered()), m_editor, SLOT(pasteNotes()));
 
 	copyPasteActionsToolBar->addAction( cutAction );
 	copyPasteActionsToolBar->addAction( copyAction );
@@ -4949,8 +4949,8 @@ PianoRollWindow::PianoRollWindow() :
 	m_clearGhostButton->setIcon( embed::getIconPixmap( "clear_ghost_note" ) );
 	m_clearGhostButton->setToolTip( tr( "Clear ghost notes" ) );
 	m_clearGhostButton->setEnabled( false );
-	connect( m_clearGhostButton, SIGNAL( clicked() ), m_editor, SLOT( clearGhostClip() ) );
-	connect( m_editor, SIGNAL( ghostClipSet( bool ) ), this, SLOT( ghostClipSet( bool ) ) );
+	connect( m_clearGhostButton, SIGNAL(clicked()), m_editor, SLOT(clearGhostClip()));
+	connect( m_editor, SIGNAL(ghostClipSet(bool)), this, SLOT(ghostClipSet(bool)));
 
 	// Wrap label icons and comboboxes in a single widget so when
 	// the window is resized smaller in width it hides both
@@ -5027,8 +5027,8 @@ PianoRollWindow::PianoRollWindow() :
 	setCurrentMidiClip( nullptr );
 
 	// Connections
-	connect( m_editor, SIGNAL( currentMidiClipChanged() ), this, SIGNAL( currentMidiClipChanged() ) );
-	connect( m_editor, SIGNAL( currentMidiClipChanged() ), this, SLOT( updateAfterMidiClipChange() ) );
+	connect( m_editor, SIGNAL(currentMidiClipChanged()), this, SIGNAL(currentMidiClipChanged()));
+	connect( m_editor, SIGNAL(currentMidiClipChanged()), this, SLOT(updateAfterMidiClipChange()));
 }
 
 
@@ -5058,8 +5058,8 @@ void PianoRollWindow::setCurrentMidiClip( MidiClip* clip )
 	{
 		setWindowTitle( tr( "Piano-Roll - %1" ).arg( clip->name() ) );
 		m_fileToolsButton->setEnabled(true);
-		connect( clip->instrumentTrack(), SIGNAL( nameChanged() ), this, SLOT( updateAfterMidiClipChange()) );
-		connect( clip, SIGNAL( dataChanged() ), this, SLOT( updateAfterMidiClipChange() ) );
+		connect( clip->instrumentTrack(), SIGNAL(nameChanged()), this, SLOT(updateAfterMidiClipChange()));
+		connect( clip, SIGNAL(dataChanged()), this, SLOT(updateAfterMidiClipChange()));
 	}
 	else
 	{
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 9c028feba..eaabf52ea 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -88,23 +88,23 @@ SongEditor::SongEditor( Song * song ) :
 					m_song->m_playPos[Song::Mode_PlaySong],
 					m_currentPosition,
 					Song::Mode_PlaySong, this );
-	connect( this, SIGNAL( positionChanged( const lmms::TimePos & ) ),
+	connect( this, SIGNAL( positionChanged( const lmms::TimePos& ) ),
 				m_song->m_playPos[Song::Mode_PlaySong].m_timeLine,
-			SLOT( updatePosition( const lmms::TimePos & ) ) );
-	connect( m_timeLine, SIGNAL( positionChanged( const lmms::TimePos & ) ),
-			this, SLOT( updatePosition( const lmms::TimePos & ) ) );
-	connect( m_timeLine, SIGNAL( regionSelectedFromPixels( int, int ) ),
-			this, SLOT( selectRegionFromPixels( int, int ) ) );
-	connect( m_timeLine, SIGNAL( selectionFinished() ),
-			 this, SLOT( stopRubberBand() ) );
+			SLOT( updatePosition( const lmms::TimePos& ) ) );
+	connect( m_timeLine, SIGNAL( positionChanged( const lmms::TimePos& ) ),
+			this, SLOT( updatePosition( const lmms::TimePos& ) ) );
+	connect( m_timeLine, SIGNAL(regionSelectedFromPixels(int,int)),
+			this, SLOT(selectRegionFromPixels(int,int)));
+	connect( m_timeLine, SIGNAL(selectionFinished()),
+			 this, SLOT(stopRubberBand()));
 
 	m_positionLine = new PositionLine(this);
 	static_cast<QVBoxLayout *>( layout() )->insertWidget( 1, m_timeLine );
 	
-	connect( m_song, SIGNAL( playbackStateChanged() ),
-			 m_positionLine, SLOT( update() ) );
-	connect( this, SIGNAL( zoomingValueChanged( float ) ),
-			 m_positionLine, SLOT( zoomChange( float ) ) );
+	connect( m_song, SIGNAL(playbackStateChanged()),
+			 m_positionLine, SLOT(update()));
+	connect( this, SIGNAL(zoomingValueChanged(float)),
+			 m_positionLine, SLOT(zoomChange(float)));
 			 
 	// Ensure loop markers snap to same increments as clips. Zoom & proportional
 	// snap changes are handled in zoomingChanged() and toggleProportionalSnap()
@@ -129,8 +129,8 @@ SongEditor::SongEditor( Song * song ) :
 						tr( "High quality mode" ),
 						nullptr, nullptr, tb );
 	hq_btn->setCheckable( true );
-	connect( hq_btn, SIGNAL( toggled( bool ) ),
-			this, SLOT( setHighQuality( bool ) ) );
+	connect( hq_btn, SIGNAL(toggled(bool)),
+			this, SLOT(setHighQuality(bool)));
 	hq_btn->setFixedWidth( 42 );
 	getGUI()->mainWindow()->addWidgetToToolBar( hq_btn, 1, col );
 #endif
@@ -159,14 +159,14 @@ SongEditor::SongEditor( Song * song ) :
 	m_masterVolumeSlider->setTickInterval( 50 );
 	m_masterVolumeSlider->setToolTip(tr("Master volume"));
 
-	connect( m_masterVolumeSlider, SIGNAL( logicValueChanged( int ) ), this,
-			SLOT( setMasterVolume( int ) ) );
-	connect( m_masterVolumeSlider, SIGNAL( sliderPressed() ), this,
-			SLOT( showMasterVolumeFloat()) );
-	connect( m_masterVolumeSlider, SIGNAL( logicSliderMoved( int ) ), this,
-			SLOT( updateMasterVolumeFloat( int ) ) );
-	connect( m_masterVolumeSlider, SIGNAL( sliderReleased() ), this,
-			SLOT( hideMasterVolumeFloat() ) );
+	connect( m_masterVolumeSlider, SIGNAL(logicValueChanged(int)), this,
+			SLOT(setMasterVolume(int)));
+	connect( m_masterVolumeSlider, SIGNAL(sliderPressed()), this,
+			SLOT(showMasterVolumeFloat()));
+	connect( m_masterVolumeSlider, SIGNAL(logicSliderMoved(int)), this,
+			SLOT(updateMasterVolumeFloat(int)));
+	connect( m_masterVolumeSlider, SIGNAL(sliderReleased()), this,
+			SLOT(hideMasterVolumeFloat()));
 
 	m_mvsStatus = new TextFloat;
 	m_mvsStatus->setTitle( tr( "Master volume" ) );
@@ -191,14 +191,14 @@ SongEditor::SongEditor( Song * song ) :
 	m_masterPitchSlider->setFixedSize( 26, 60 );
 	m_masterPitchSlider->setTickInterval( 12 );
 	m_masterPitchSlider->setToolTip(tr("Master pitch"));
-	connect( m_masterPitchSlider, SIGNAL( logicValueChanged( int ) ), this,
-			SLOT( setMasterPitch( int ) ) );
-	connect( m_masterPitchSlider, SIGNAL( sliderPressed() ), this,
-			SLOT( showMasterPitchFloat() ) );
-	connect( m_masterPitchSlider, SIGNAL( logicSliderMoved( int ) ), this,
-			SLOT( updateMasterPitchFloat( int ) ) );
-	connect( m_masterPitchSlider, SIGNAL( sliderReleased() ), this,
-			SLOT( hideMasterPitchFloat() ) );
+	connect( m_masterPitchSlider, SIGNAL(logicValueChanged(int)), this,
+			SLOT(setMasterPitch(int)));
+	connect( m_masterPitchSlider, SIGNAL(sliderPressed()), this,
+			SLOT(showMasterPitchFloat()));
+	connect( m_masterPitchSlider, SIGNAL(logicSliderMoved(int)), this,
+			SLOT(updateMasterPitchFloat(int)));
+	connect( m_masterPitchSlider, SIGNAL(sliderReleased()), this,
+			SLOT(hideMasterPitchFloat()));
 
 	m_mpsStatus = new TextFloat;
 	m_mpsStatus->setTitle( tr( "Master pitch" ) );
@@ -231,10 +231,10 @@ SongEditor::SongEditor( Song * song ) :
 	m_leftRightScroll->setSingleStep( 1 );
 	m_leftRightScroll->setPageStep( 20 );
 	static_cast<QVBoxLayout *>( layout() )->addWidget( m_leftRightScroll );
-	connect( m_leftRightScroll, SIGNAL( valueChanged( int ) ),
-					this, SLOT( scrolled( int ) ) );
-	connect( m_song, SIGNAL( lengthChanged( int ) ),
-			this, SLOT( updateScrollBar( int ) ) );
+	connect( m_leftRightScroll, SIGNAL(valueChanged(int)),
+					this, SLOT(scrolled(int)));
+	connect( m_song, SIGNAL(lengthChanged(int)),
+			this, SLOT(updateScrollBar(int)));
 	connect(m_leftRightScroll, SIGNAL(valueChanged(int)),this, SLOT(updateRubberband()));
 	connect(contentWidget()->verticalScrollBar(), SIGNAL(valueChanged(int)),this, SLOT(updateRubberband()));
 	connect(m_timeLine, SIGNAL(selectionFinished()), this, SLOT(stopSelectRegion()));
@@ -247,10 +247,10 @@ SongEditor::SongEditor( Song * song ) :
 	}
 	m_zoomingModel->setInitValue(
 			m_zoomingModel->findText( "100%" ) );
-	connect( m_zoomingModel, SIGNAL( dataChanged() ),
-					this, SLOT( zoomingChanged() ) );
-	connect( m_zoomingModel, SIGNAL( dataChanged() ),
-					m_positionLine, SLOT( update() ) );
+	connect( m_zoomingModel, SIGNAL(dataChanged()),
+					this, SLOT(zoomingChanged()));
+	connect( m_zoomingModel, SIGNAL(dataChanged()),
+					m_positionLine, SLOT(update()));
 
 	//Set up snapping model, 2^i
 	for ( int i = 3; i >= -4; i-- )
@@ -765,9 +765,9 @@ static inline void animateScroll( QScrollBar *scrollBar, int newVal, bool smooth
 		{
 			t = new QTimeLine( 600, scrollBar );
 			t->setFrameRange( scrollBar->value(), newVal );
-			t->connect( t, SIGNAL( finished() ), SLOT( deleteLater() ) );
+			t->connect( t, SIGNAL(finished()), SLOT(deleteLater()));
 
-			scrollBar->connect( t, SIGNAL( frameChanged( int ) ), SLOT( setValue( int ) ) );
+			scrollBar->connect( t, SIGNAL(frameChanged(int)), SLOT(setValue(int)));
 
 			t->start();
 		}
@@ -1023,7 +1023,7 @@ SongEditorWindow::SongEditorWindow(Song* song) :
 	m_setProportionalSnapAction->setCheckable(true);
 	m_setProportionalSnapAction->setChecked(false);
 	connect(m_setProportionalSnapAction, SIGNAL(triggered()), m_editor, SLOT(toggleProportionalSnap()));
-	connect(m_setProportionalSnapAction, SIGNAL(triggered()), this, SLOT(updateSnapLabel()) );
+	connect(m_setProportionalSnapAction, SIGNAL(triggered()), this, SLOT(updateSnapLabel()));
 
 	snapToolBar->addWidget( snap_lbl );
 	snapToolBar->addWidget( m_snappingComboBox );
@@ -1139,7 +1139,7 @@ void SongEditorWindow::adjustUiAfterProjectLoad()
 	// it, it's very annyoing to manually bring up the song editor each time
 	getGUI()->mainWindow()->workspace()->setActiveSubWindow(
 			qobject_cast<QMdiSubWindow *>( parentWidget() ) );
-	connect( qobject_cast<SubWindow *>( parentWidget() ), SIGNAL( focusLost() ), this, SLOT( lostFocus() ) );
+	connect( qobject_cast<SubWindow *>( parentWidget() ), SIGNAL(focusLost()), this, SLOT(lostFocus()));
 	m_editor->scrolled(0);
 }
 
diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index b7aa6d94f..0d3de7d2a 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -89,11 +89,11 @@ TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppb,
 	m_pos.m_timeLine = this;
 
 	QTimer * updateTimer = new QTimer( this );
-	connect( updateTimer, SIGNAL( timeout() ),
-					this, SLOT( updatePosition() ) );
+	connect( updateTimer, SIGNAL(timeout()),
+					this, SLOT(updatePosition()));
 	updateTimer->start( 1000 / 60 );  // 60 fps
-	connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int,int ) ),
-					this, SLOT( update() ) );
+	connect( Engine::getSong(), SIGNAL(timeSignatureChanged(int,int)),
+					this, SLOT(update()));
 }
 
 
@@ -125,17 +125,17 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 	autoScroll->setGeneralToolTip( tr( "Auto scrolling" ) );
 	autoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) );
 	autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) );
-	connect( autoScroll, SIGNAL( changedState( int ) ), this,
-					SLOT( toggleAutoScroll( int ) ) );
+	connect( autoScroll, SIGNAL(changedState(int)), this,
+					SLOT(toggleAutoScroll(int)));
 
 	NStateButton * loopPoints = new NStateButton( _tool_bar );
 	loopPoints->setGeneralToolTip( tr( "Loop points" ) );
 	loopPoints->addState( embed::getIconPixmap( "loop_points_off" ) );
 	loopPoints->addState( embed::getIconPixmap( "loop_points_on" ) );
-	connect( loopPoints, SIGNAL( changedState( int ) ), this,
-					SLOT( toggleLoopPoints( int ) ) );
-	connect( this, SIGNAL( loopPointStateLoaded( int ) ), loopPoints,
-					SLOT( changeState( int ) ) );
+	connect( loopPoints, SIGNAL(changedState(int)), this,
+					SLOT(toggleLoopPoints(int)));
+	connect( this, SIGNAL(loopPointStateLoaded(int)), loopPoints,
+					SLOT(changeState(int)));
 
 	NStateButton * behaviourAtStop = new NStateButton( _tool_bar );
 	behaviourAtStop->addState( embed::getIconPixmap( "back_to_zero" ),
@@ -147,10 +147,10 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 						"started" ) );
 	behaviourAtStop->addState( embed::getIconPixmap( "keep_stop_position" ),
 					tr( "After stopping keep position" ) );
-	connect( behaviourAtStop, SIGNAL( changedState( int ) ), this,
-					SLOT( toggleBehaviourAtStop( int ) ) );
-	connect( this, SIGNAL( loadBehaviourAtStop( int ) ), behaviourAtStop,
-					SLOT( changeState( int ) ) );
+	connect( behaviourAtStop, SIGNAL(changedState(int)), this,
+					SLOT(toggleBehaviourAtStop(int)));
+	connect( this, SIGNAL(loadBehaviourAtStop(int)), behaviourAtStop,
+					SLOT(changeState(int)));
 	behaviourAtStop->changeState( BackToStart );
 
 	_tool_bar->addWidget( autoScroll );
diff --git a/src/gui/editors/TrackContainerView.cpp b/src/gui/editors/TrackContainerView.cpp
index 6c85cf1a3..43309d96b 100644
--- a/src/gui/editors/TrackContainerView.cpp
+++ b/src/gui/editors/TrackContainerView.cpp
@@ -108,10 +108,10 @@ TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
 
 	setAcceptDrops( true );
 
-	connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
-						this, SLOT( realignTracks() ) );
-	connect( m_tc, SIGNAL( trackAdded( lmms::Track * ) ),
-			this, SLOT( createTrackView( lmms::Track * ) ),
+	connect( Engine::getSong(), SIGNAL(timeSignatureChanged(int,int)),
+						this, SLOT(realignTracks()));
+	connect( m_tc, SIGNAL(trackAdded(lmms::Track*)),
+			this, SLOT(createTrackView(lmms::Track*)),
 			Qt::QueuedConnection );
 }
 
@@ -151,9 +151,9 @@ TrackView * TrackContainerView::addTrackView( TrackView * _tv )
 {
 	m_trackViews.push_back( _tv );
 	m_scrollLayout->addWidget( _tv );
-	connect( this, SIGNAL( positionChanged( const lmms::TimePos & ) ),
+	connect( this, SIGNAL( positionChanged( const lmms::TimePos& ) ),
 				_tv->getTrackContentWidget(),
-				SLOT( changePosition( const lmms::TimePos & ) ) );
+				SLOT( changePosition( const lmms::TimePos& ) ) );
 	realignTracks();
 	return( _tv );
 }
diff --git a/src/gui/instrument/EnvelopeAndLfoView.cpp b/src/gui/instrument/EnvelopeAndLfoView.cpp
index cff230e38..a11910b09 100644
--- a/src/gui/instrument/EnvelopeAndLfoView.cpp
+++ b/src/gui/instrument/EnvelopeAndLfoView.cpp
@@ -202,8 +202,8 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) :
 	m_userLfoBtn->setInactiveGraphic( embed::getIconPixmap(
 							"usr_wave_inactive" ) );
 
-	connect( m_userLfoBtn, SIGNAL( toggled( bool ) ),
-				this, SLOT( lfoUserWaveChanged() ) );
+	connect( m_userLfoBtn, SIGNAL(toggled(bool)),
+				this, SLOT(lfoUserWaveChanged()));
 
 	PixmapButton * random_lfo_btn = new PixmapButton( this, nullptr );
 	random_lfo_btn->move( LFO_SHAPES_X+60, LFO_SHAPES_Y );
diff --git a/src/gui/instrument/InstrumentMidiIOView.cpp b/src/gui/instrument/InstrumentMidiIOView.cpp
index f98f58f5a..68491d6e6 100644
--- a/src/gui/instrument/InstrumentMidiIOView.cpp
+++ b/src/gui/instrument/InstrumentMidiIOView.cpp
@@ -73,10 +73,10 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
 	midiInputLayout->addWidget( m_fixedInputVelocitySpinBox );
 	midiInputLayout->addStretch();
 
-	connect( m_midiInputGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
-			m_inputChannelSpinBox, SLOT( setEnabled( bool ) ) );
-	connect( m_midiInputGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
-		m_fixedInputVelocitySpinBox, SLOT( setEnabled( bool ) ) );
+	connect( m_midiInputGroupBox->ledButton(), SIGNAL(toggled(bool)),
+			m_inputChannelSpinBox, SLOT(setEnabled(bool)));
+	connect( m_midiInputGroupBox->ledButton(), SIGNAL(toggled(bool)),
+		m_fixedInputVelocitySpinBox, SLOT(setEnabled(bool)));
 
 
 
@@ -118,12 +118,12 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
 	midiOutputLayout->addWidget( m_fixedOutputNoteSpinBox );
 	midiOutputLayout->addStretch();
 
-	connect( m_midiOutputGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
-		m_fixedOutputVelocitySpinBox, SLOT( setEnabled( bool ) ) );
-	connect( m_midiOutputGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
-			m_outputProgramSpinBox, SLOT( setEnabled( bool ) ) );
-	connect( m_midiOutputGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
-		m_fixedOutputNoteSpinBox, SLOT( setEnabled( bool ) ) );
+	connect( m_midiOutputGroupBox->ledButton(), SIGNAL(toggled(bool)),
+		m_fixedOutputVelocitySpinBox, SLOT(setEnabled(bool)));
+	connect( m_midiOutputGroupBox->ledButton(), SIGNAL(toggled(bool)),
+			m_outputProgramSpinBox, SLOT(setEnabled(bool)));
+	connect( m_midiOutputGroupBox->ledButton(), SIGNAL(toggled(bool)),
+		m_fixedOutputNoteSpinBox, SLOT(setEnabled(bool)));
 
 	if( !Engine::audioEngine()->midiClient()->isRaw() )
 	{
@@ -162,8 +162,8 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
 	m_baseVelocitySpinBox->setEnabled( false );
 	baseVelocityLayout->addWidget( m_baseVelocitySpinBox );
 
-	connect( baseVelocityGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
-			m_baseVelocitySpinBox, SLOT( setEnabled( bool ) ) );
+	connect( baseVelocityGroupBox->ledButton(), SIGNAL(toggled(bool)),
+			m_baseVelocitySpinBox, SLOT(setEnabled(bool)));
 
 	layout->addStretch();
 }
diff --git a/src/gui/instrument/InstrumentTrackWindow.cpp b/src/gui/instrument/InstrumentTrackWindow.cpp
index a457acec8..cead80e7c 100644
--- a/src/gui/instrument/InstrumentTrackWindow.cpp
+++ b/src/gui/instrument/InstrumentTrackWindow.cpp
@@ -108,8 +108,8 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
 	// setup line edit for changing instrument track name
 	m_nameLineEdit = new QLineEdit;
 	m_nameLineEdit->setFont( pointSize<9>( m_nameLineEdit->font() ) );
-	connect( m_nameLineEdit, SIGNAL( textChanged( const QString & ) ),
-				this, SLOT( textChanged( const QString & ) ) );
+	connect( m_nameLineEdit, SIGNAL( textChanged( const QString& ) ),
+				this, SLOT( textChanged( const QString& ) ) );
 
 	m_nameLineEdit->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred));
 	nameAndChangeTrackLayout->addWidget(m_nameLineEdit, 1);
@@ -117,10 +117,10 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
 
 	// set up left/right arrows for changing instrument
 	m_leftRightNav = new LeftRightNav(this);
-	connect( m_leftRightNav, SIGNAL( onNavLeft() ), this,
-						SLOT( viewPrevInstrument() ) );
-	connect( m_leftRightNav, SIGNAL( onNavRight() ), this,
-						SLOT( viewNextInstrument() ) );
+	connect( m_leftRightNav, SIGNAL(onNavLeft()), this,
+						SLOT(viewPrevInstrument()));
+	connect( m_leftRightNav, SIGNAL(onNavRight()), this,
+						SLOT(viewNextInstrument()));
 	// m_leftRightNav->setShortcuts();
 	nameAndChangeTrackLayout->addWidget(m_leftRightNav);
 
@@ -221,7 +221,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
 	QPushButton* saveSettingsBtn = new QPushButton( embed::getIconPixmap( "project_save" ), QString() );
 	saveSettingsBtn->setMinimumSize( 32, 32 );
 
-	connect( saveSettingsBtn, SIGNAL( clicked() ), this, SLOT( saveSettingsBtnClicked() ) );
+	connect( saveSettingsBtn, SIGNAL(clicked()), this, SLOT(saveSettingsBtnClicked()));
 
 	saveSettingsBtn->setToolTip(tr("Save current instrument track settings in a preset file"));
 
@@ -345,13 +345,13 @@ void InstrumentTrackWindow::modelChanged()
 
 	m_nameLineEdit->setText( m_track->name() );
 
-	m_track->disconnect( SIGNAL( nameChanged() ), this );
-	m_track->disconnect( SIGNAL( instrumentChanged() ), this );
+	m_track->disconnect( SIGNAL(nameChanged()), this );
+	m_track->disconnect( SIGNAL(instrumentChanged()), this );
 
-	connect( m_track, SIGNAL( nameChanged() ),
-			this, SLOT( updateName() ) );
-	connect( m_track, SIGNAL( instrumentChanged() ),
-			this, SLOT( updateInstrumentView() ) );
+	connect( m_track, SIGNAL(nameChanged()),
+			this, SLOT(updateName()));
+	connect( m_track, SIGNAL(instrumentChanged()),
+			this, SLOT(updateInstrumentView()));
 
 	m_volumeKnob->setModel( &m_track->m_volumeModel );
 	m_panningKnob->setModel( &m_track->m_panningModel );
diff --git a/src/gui/instrument/InstrumentView.cpp b/src/gui/instrument/InstrumentView.cpp
index 2ca3d9329..23e758cf2 100644
--- a/src/gui/instrument/InstrumentView.cpp
+++ b/src/gui/instrument/InstrumentView.cpp
@@ -59,7 +59,7 @@ void InstrumentView::setModel( Model * _model, bool )
 	{
 		ModelView::setModel( _model );
 		instrumentTrackWindow()->setWindowIcon( model()->logo()->pixmap() );
-		connect( model(), SIGNAL( destroyed( QObject * ) ), this, SLOT( close() ) );
+		connect( model(), SIGNAL(destroyed(QObject*)), this, SLOT(close()));
 	}
 }
 
diff --git a/src/gui/instrument/PianoView.cpp b/src/gui/instrument/PianoView.cpp
index fa5594c68..b6dec8b4f 100644
--- a/src/gui/instrument/PianoView.cpp
+++ b/src/gui/instrument/PianoView.cpp
@@ -141,8 +141,8 @@ PianoView::PianoView(QWidget *parent) :
 	m_pianoScroll->setValue(Octave_3 * Piano::WhiteKeysPerOctave);
 
 	// and connect it to this widget
-	connect( m_pianoScroll, SIGNAL( valueChanged( int ) ),
-			this, SLOT( pianoScrolled( int ) ) );
+	connect( m_pianoScroll, SIGNAL(valueChanged(int)),
+			this, SLOT(pianoScrolled(int)));
 
 	// create a layout for ourselves
 	QVBoxLayout * layout = new QVBoxLayout( this );
diff --git a/src/gui/menus/MidiPortMenu.cpp b/src/gui/menus/MidiPortMenu.cpp
index 328efebd1..88e6a4f30 100644
--- a/src/gui/menus/MidiPortMenu.cpp
+++ b/src/gui/menus/MidiPortMenu.cpp
@@ -35,8 +35,8 @@ MidiPortMenu::MidiPortMenu( MidiPort::Modes _mode ) :
 	m_mode( _mode )
 {
 	setFont( pointSize<9>( font() ) );
-	connect( this, SIGNAL( triggered( QAction * ) ),
-			this, SLOT( activatedPort( QAction * ) ) );
+	connect( this, SIGNAL(triggered(QAction*)),
+			this, SLOT(activatedPort(QAction*)));
 }
 
 
@@ -54,13 +54,13 @@ void MidiPortMenu::modelChanged()
 	MidiPort * mp = castModel<MidiPort>();
 	if( m_mode == MidiPort::Input )
 	{
-		connect( mp, SIGNAL( readablePortsChanged() ),
-				this, SLOT( updateMenu() ) );
+		connect( mp, SIGNAL(readablePortsChanged()),
+				this, SLOT(updateMenu()));
 	}
 	else if( m_mode == MidiPort::Output )
 	{
-		connect( mp, SIGNAL( writablePortsChanged() ),
-				this, SLOT( updateMenu() ) );
+		connect( mp, SIGNAL(writablePortsChanged()),
+				this, SLOT(updateMenu()));
 	}
 	updateMenu();
 }
diff --git a/src/gui/menus/RecentProjectsMenu.cpp b/src/gui/menus/RecentProjectsMenu.cpp
index bbbf79e86..050450dd0 100644
--- a/src/gui/menus/RecentProjectsMenu.cpp
+++ b/src/gui/menus/RecentProjectsMenu.cpp
@@ -19,10 +19,10 @@ RecentProjectsMenu::RecentProjectsMenu(QWidget *parent) :
 {
 	setIcon(embed::getIconPixmap( "project_open_recent" ));
 
-	connect( this, SIGNAL( aboutToShow() ),
-			 this, SLOT(fillMenu() ) );
-	connect( this, SIGNAL( triggered( QAction * ) ),
-			 this, SLOT(openProject(QAction * ) ) );
+	connect( this, SIGNAL(aboutToShow()),
+			 this, SLOT(fillMenu()));
+	connect( this, SIGNAL(triggered(QAction*)),
+			 this, SLOT(openProject(QAction*)));
 }
 
 
diff --git a/src/gui/menus/TemplatesMenu.cpp b/src/gui/menus/TemplatesMenu.cpp
index 1a1ef7c84..a73c81071 100644
--- a/src/gui/menus/TemplatesMenu.cpp
+++ b/src/gui/menus/TemplatesMenu.cpp
@@ -18,9 +18,9 @@ TemplatesMenu::TemplatesMenu(QWidget *parent) :
 {
 	setIcon(embed::getIconPixmap("project_new"));
 
-	connect( this, SIGNAL( aboutToShow() ), SLOT( fillTemplatesMenu() ) );
-	connect( this, SIGNAL( triggered( QAction * ) ),
-		SLOT( createNewProjectFromTemplate( QAction * ) ) );
+	connect( this, SIGNAL(aboutToShow()), SLOT(fillTemplatesMenu()));
+	connect( this, SIGNAL(triggered(QAction*)),
+		SLOT(createNewProjectFromTemplate(QAction*)));
 }
 
 
diff --git a/src/gui/modals/ControllerConnectionDialog.cpp b/src/gui/modals/ControllerConnectionDialog.cpp
index b8d323709..fb86328a1 100644
--- a/src/gui/modals/ControllerConnectionDialog.cpp
+++ b/src/gui/modals/ControllerConnectionDialog.cpp
@@ -143,8 +143,8 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
 	// Midi stuff
 	m_midiGroupBox = new GroupBox( tr( "MIDI CONTROLLER" ), this );
 	m_midiGroupBox->setGeometry( 8, 10, 240, 80 );
-	connect( m_midiGroupBox->model(), SIGNAL( dataChanged() ),
-			this, SLOT( midiToggled() ) );
+	connect( m_midiGroupBox->model(), SIGNAL(dataChanged()),
+			this, SLOT(midiToggled()));
 	
 	m_midiChannelSpinBox = new LcdSpinBox( 2, m_midiGroupBox,
 			tr( "Input channel" ) );
@@ -164,16 +164,16 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
 				m_midiGroupBox, tr("Auto Detect") );
 	m_midiAutoDetectCheckBox->setModel( &m_midiAutoDetect );
 	m_midiAutoDetectCheckBox->move( 8, 60 );
-	connect( &m_midiAutoDetect, SIGNAL( dataChanged() ),
-			this, SLOT( autoDetectToggled() ) );
+	connect( &m_midiAutoDetect, SIGNAL(dataChanged()),
+			this, SLOT(autoDetectToggled()));
 
 	// when using with non-raw-clients we can provide buttons showing
 	// our port-menus when being clicked
 	if( !Engine::audioEngine()->midiClient()->isRaw() )
 	{
 		m_readablePorts = new MidiPortMenu( MidiPort::Input );
-		connect( m_readablePorts, SIGNAL( triggered( QAction * ) ),
-				this, SLOT( enableAutoDetect( QAction * ) ) );
+		connect( m_readablePorts, SIGNAL(triggered(QAction*)),
+				this, SLOT(enableAutoDetect(QAction*)));
 		ToolButton * rp_btn = new ToolButton( m_midiGroupBox );
 		rp_btn->setText( tr( "MIDI-devices to receive "
 						"MIDI-events from" ) );
@@ -187,8 +187,8 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
 	// User stuff
 	m_userGroupBox = new GroupBox( tr( "USER CONTROLLER" ), this );
 	m_userGroupBox->setGeometry( 8, 100, 240, 60 );
-	connect( m_userGroupBox->model(), SIGNAL( dataChanged() ),
-			this, SLOT( userToggled() ) );
+	connect( m_userGroupBox->model(), SIGNAL(dataChanged()),
+			this, SLOT(userToggled()));
 
 	m_userController = new ComboBox( m_userGroupBox, "Controller" );
 	m_userController->setGeometry( 10, 24, 200, ComboBox::DEFAULT_HEIGHT );
@@ -196,10 +196,10 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
 	{
 		m_userController->model()->addItem( c->name() );
 	}
-	connect( m_userController->model(), SIGNAL( dataUnchanged() ),
-			this, SLOT( userSelected() ) );
-	connect( m_userController->model(), SIGNAL( dataChanged() ),
-			this, SLOT( userSelected() ) );
+	connect( m_userController->model(), SIGNAL(dataUnchanged()),
+			this, SLOT(userSelected()));
+	connect( m_userController->model(), SIGNAL(dataChanged()),
+			this, SLOT(userSelected()));
 
 
 	// Mapping functions
@@ -222,14 +222,14 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
 	QPushButton * select_btn = new QPushButton( 
 					embed::getIconPixmap( "add" ),
 					tr( "OK" ), buttons );
-	connect( select_btn, SIGNAL( clicked() ), 
-				this, SLOT( selectController() ) );
+	connect( select_btn, SIGNAL(clicked()), 
+				this, SLOT(selectController()));
 	
 	QPushButton * cancel_btn = new QPushButton( 
 					embed::getIconPixmap( "cancel" ),
 					tr( "Cancel" ), buttons );
-	connect( cancel_btn, SIGNAL( clicked() ),
-				this, SLOT( reject() ) );
+	connect( cancel_btn, SIGNAL(clicked()),
+				this, SLOT(reject()));
 
 	btn_layout->addStretch();
 	btn_layout->addSpacing( 10 );
@@ -376,7 +376,7 @@ void ControllerConnectionDialog::midiToggled()
 				m_readablePorts->setModel( &m_midiController->m_midiPort );
 			}
 
-			connect( m_midiController, SIGNAL( valueChanged() ), this, SLOT( midiValueChanged() ) );
+			connect( m_midiController, SIGNAL(valueChanged()), this, SLOT(midiValueChanged()));
 		}
 	}
 	m_midiAutoDetect.setValue( enabled );
diff --git a/src/gui/modals/EffectSelectDialog.cpp b/src/gui/modals/EffectSelectDialog.cpp
index 22f094827..2b5c0c58d 100644
--- a/src/gui/modals/EffectSelectDialog.cpp
+++ b/src/gui/modals/EffectSelectDialog.cpp
@@ -98,27 +98,27 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
 	m_model.setSourceModel( &m_sourceModel );
 	m_model.setFilterCaseSensitivity( Qt::CaseInsensitive );
 
-	connect( ui->filterEdit, SIGNAL( textChanged( const QString & ) ),
-				&m_model, SLOT( setFilterFixedString( const QString & ) ) );
-	connect( ui->filterEdit, SIGNAL( textChanged( const QString & ) ),
-					this, SLOT( updateSelection() ) );
-	connect( ui->filterEdit, SIGNAL( textChanged( const QString & ) ),
-							SLOT( sortAgain() ) );
+	connect( ui->filterEdit, SIGNAL( textChanged( const QString& ) ),
+				&m_model, SLOT( setFilterFixedString( const QString& ) ) );
+	connect( ui->filterEdit, SIGNAL( textChanged( const QString& ) ),
+					this, SLOT(updateSelection()));
+	connect( ui->filterEdit, SIGNAL( textChanged( const QString& ) ),
+							SLOT(sortAgain()));
 
 	ui->pluginList->setModel( &m_model );
 
 	// setup selection model
 	QItemSelectionModel * selectionModel = new QItemSelectionModel( &m_model );
 	ui->pluginList->setSelectionModel( selectionModel );
-	connect( selectionModel, SIGNAL( currentRowChanged( const QModelIndex &,
+	connect( selectionModel, SIGNAL( currentRowChanged( const QModelIndex&,
 														const QModelIndex & ) ),
-			SLOT( rowChanged( const QModelIndex &, const QModelIndex & ) ) );
-	connect( ui->pluginList, SIGNAL( doubleClicked( const QModelIndex & ) ),
-				SLOT( acceptSelection() ) );
+			SLOT( rowChanged( const QModelIndex &, const QModelIndex& ) ) );
+	connect( ui->pluginList, SIGNAL( doubleClicked( const QModelIndex& ) ),
+				SLOT(acceptSelection()));
 
 	// try to accept current selection when pressing "OK"
-	connect( ui->buttonBox, SIGNAL( accepted() ),
-				this, SLOT( acceptSelection() ) );
+	connect( ui->buttonBox, SIGNAL(accepted()),
+				this, SLOT(acceptSelection()));
 
 	ui->filterEdit->setClearButtonEnabled( true );
 	ui->pluginList->verticalHeader()->setSectionResizeMode(
diff --git a/src/gui/modals/ExportProjectDialog.cpp b/src/gui/modals/ExportProjectDialog.cpp
index fc9113b3f..7671e031e 100644
--- a/src/gui/modals/ExportProjectDialog.cpp
+++ b/src/gui/modals/ExportProjectDialog.cpp
@@ -98,8 +98,8 @@ ExportProjectDialog::ExportProjectDialog( const QString & _file_name,
 	compressionWidget->setVisible(false);
 #endif
 
-	connect( startButton, SIGNAL( clicked() ),
-			this, SLOT( startBtnClicked() ) );
+	connect( startButton, SIGNAL(clicked()),
+			this, SLOT(startBtnClicked()));
 }
 
 
@@ -190,14 +190,14 @@ void ExportProjectDialog::startExport()
 	Engine::getSong()->setRenderBetweenMarkers( renderMarkersCB->isChecked() );
 	Engine::getSong()->setLoopRenderCount(loopCountSB->value());
 
-	connect( m_renderManager.get(), SIGNAL( progressChanged( int ) ),
-			progressBar, SLOT( setValue( int ) ) );
-	connect( m_renderManager.get(), SIGNAL( progressChanged( int ) ),
-			this, SLOT( updateTitleBar( int ) ));
-	connect( m_renderManager.get(), SIGNAL( finished() ),
-			this, SLOT( accept() ) ) ;
-	connect( m_renderManager.get(), SIGNAL( finished() ),
-			getGUI()->mainWindow(), SLOT( resetWindowTitle() ) );
+	connect( m_renderManager.get(), SIGNAL(progressChanged(int)),
+			progressBar, SLOT(setValue(int)));
+	connect( m_renderManager.get(), SIGNAL(progressChanged(int)),
+			this, SLOT(updateTitleBar(int)));
+	connect( m_renderManager.get(), SIGNAL(finished()),
+			this, SLOT(accept())) ;
+	connect( m_renderManager.get(), SIGNAL(finished()),
+			getGUI()->mainWindow(), SLOT(resetWindowTitle()));
 
 	if ( m_multiExport )
 	{
diff --git a/src/gui/modals/RenameDialog.cpp b/src/gui/modals/RenameDialog.cpp
index 76ae9d6bb..0028cd1a0 100644
--- a/src/gui/modals/RenameDialog.cpp
+++ b/src/gui/modals/RenameDialog.cpp
@@ -43,10 +43,10 @@ RenameDialog::RenameDialog( QString & _string ) :
 	m_stringLE->setText( _string );
 	m_stringLE->setGeometry ( 10, 5, 220, 20 );
 	m_stringLE->selectAll();
-	connect( m_stringLE, SIGNAL( textChanged( const QString & ) ), this,
-				SLOT( textChanged( const QString & ) ) );
-	connect( m_stringLE, SIGNAL( returnPressed() ), this,
-							SLOT( accept() ) );
+	connect( m_stringLE, SIGNAL( textChanged( const QString& ) ), this,
+				SLOT( textChanged( const QString& ) ) );
+	connect( m_stringLE, SIGNAL(returnPressed()), this,
+							SLOT(accept()));
 }
 
 
diff --git a/src/gui/modals/SetupDialog.cpp b/src/gui/modals/SetupDialog.cpp
index 33cecedad..9c15f5b53 100644
--- a/src/gui/modals/SetupDialog.cpp
+++ b/src/gui/modals/SetupDialog.cpp
@@ -545,8 +545,8 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
 		setCurrentIndex(m_audioInterfaces->findText(audioDevName));
 	m_audioIfaceSetupWidgets[audioDevName]->show();
 
-	connect(m_audioInterfaces, SIGNAL(activated(const QString &)),
-			this, SLOT(audioInterfaceChanged(const QString &)));
+	connect(m_audioInterfaces, SIGNAL(activated(const QString&)),
+			this, SLOT(audioInterfaceChanged(const QString&)));
 
 	// Advanced setting, hidden for now
 	if(false)
@@ -689,8 +689,8 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
 	m_midiInterfaces->setCurrentIndex(m_midiInterfaces->findText(midiDevName));
 	m_midiIfaceSetupWidgets[midiDevName]->show();
 
-	connect(m_midiInterfaces, SIGNAL(activated(const QString &)),
-			this, SLOT(midiInterfaceChanged(const QString &)));
+	connect(m_midiInterfaces, SIGNAL(activated(const QString&)),
+			this, SLOT(midiInterfaceChanged(const QString&)));
 
 
 	// MIDI autoassign tab.
@@ -761,7 +761,7 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
 
 		lineEdit = new QLineEdit(content, newTw);
 		lineEdit->setGeometry(10, 20, txtLength, 16);
-		connect(lineEdit, SIGNAL(textChanged(const QString &)),
+		connect(lineEdit, SIGNAL(textChanged(const QString&)),
 			this, setSlot);
 
 		QPushButton * selectBtn = new QPushButton(
@@ -776,37 +776,37 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
 	};
 
 	addPathEntry(tr("LMMS working directory"), m_workingDir,
-		SLOT(setWorkingDir(const QString &)),
+		SLOT(setWorkingDir(const QString&)),
 		SLOT(openWorkingDir()),
 		m_workingDirLineEdit);
 	addPathEntry(tr("VST plugins directory"), m_vstDir,
-		SLOT(setVSTDir(const QString &)),
+		SLOT(setVSTDir(const QString&)),
 		SLOT(openVSTDir()),
 		m_vstDirLineEdit);
 	addPathEntry(tr("LADSPA plugins directories"), m_ladspaDir,
-		SLOT(setLADSPADir(const QString &)),
+		SLOT(setLADSPADir(const QString&)),
 		SLOT(openLADSPADir()),
 		m_ladspaDirLineEdit, "add_folder");
 	addPathEntry(tr("SF2 directory"), m_sf2Dir,
-		SLOT(setSF2Dir(const QString &)),
+		SLOT(setSF2Dir(const QString&)),
 		SLOT(openSF2Dir()),
 		m_sf2DirLineEdit);
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	addPathEntry(tr("Default SF2"), m_sf2File,
-		SLOT(setSF2File(const QString &)),
+		SLOT(setSF2File(const QString&)),
 		SLOT(openSF2File()),
 		m_sf2FileLineEdit);
 #endif
 	addPathEntry(tr("GIG directory"), m_gigDir,
-		SLOT(setGIGDir(const QString &)),
+		SLOT(setGIGDir(const QString&)),
 		SLOT(openGIGDir()),
 		m_gigDirLineEdit);
 	addPathEntry(tr("Theme directory"), m_themeDir,
-		SLOT(setThemeDir(const QString &)),
+		SLOT(setThemeDir(const QString&)),
 		SLOT(openThemeDir()),
 		m_themeDirLineEdit);
 	addPathEntry(tr("Background artwork"), m_backgroundPicFile,
-		SLOT(setBackgroundPicFile(const QString &)),
+		SLOT(setBackgroundPicFile(const QString&)),
 		SLOT(openBackgroundPicFile()),
 		m_backgroundPicFileLineEdit);
 
diff --git a/src/gui/modals/VersionedSaveDialog.cpp b/src/gui/modals/VersionedSaveDialog.cpp
index 06a576ea9..d93bd948c 100644
--- a/src/gui/modals/VersionedSaveDialog.cpp
+++ b/src/gui/modals/VersionedSaveDialog.cpp
@@ -80,8 +80,8 @@ VersionedSaveDialog::VersionedSaveDialog( QWidget *parent,
 	}
 
 	// Connect + and - buttons
-	connect( plusButton, SIGNAL( clicked() ), this, SLOT( incrementVersion() ));
-	connect( minusButton, SIGNAL( clicked() ), this, SLOT( decrementVersion() ));
+	connect( plusButton, SIGNAL(clicked()), this, SLOT(incrementVersion()));
+	connect( minusButton, SIGNAL(clicked()), this, SLOT(decrementVersion()));
 }
 
 
diff --git a/src/gui/tracks/InstrumentTrackView.cpp b/src/gui/tracks/InstrumentTrackView.cpp
index 4c16287ed..5d01c8ae0 100644
--- a/src/gui/tracks/InstrumentTrackView.cpp
+++ b/src/gui/tracks/InstrumentTrackView.cpp
@@ -66,14 +66,14 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 	m_tlb->move( 3, 1 );
 	m_tlb->show();
 
-	connect( m_tlb, SIGNAL( toggled( bool ) ),
-			this, SLOT( toggleInstrumentWindow( bool ) ) );
+	connect( m_tlb, SIGNAL(toggled(bool)),
+			this, SLOT(toggleInstrumentWindow(bool)));
 
-	connect( _it, SIGNAL( nameChanged() ),
-			m_tlb, SLOT( update() ) );
+	connect( _it, SIGNAL(nameChanged()),
+			m_tlb, SLOT(update()));
 
-	connect(ConfigManager::inst(), SIGNAL(valueChanged(QString, QString, QString)),
-			this, SLOT(handleConfigChange(QString, QString, QString)));
+	connect(ConfigManager::inst(), SIGNAL(valueChanged(QString,QString,QString)),
+			this, SLOT(handleConfigChange(QString,QString,QString)));
 
 	// creation of widgets for track-settings-widget
 	int widgetWidth;
@@ -128,12 +128,12 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 		m_midiOutputAction = m_midiMenu->addAction( "" );
 		m_midiInputAction->setCheckable( true );
 		m_midiOutputAction->setCheckable( true );
-		connect( m_midiInputAction, SIGNAL( changed() ), this,
-						SLOT( midiInSelected() ) );
-		connect( m_midiOutputAction, SIGNAL( changed() ), this,
-					SLOT( midiOutSelected() ) );
-		connect( &_it->m_midiPort, SIGNAL( modeChanged() ),
-				this, SLOT( midiConfigChanged() ) );
+		connect( m_midiInputAction, SIGNAL(changed()), this,
+						SLOT(midiInSelected()));
+		connect( m_midiOutputAction, SIGNAL(changed()), this,
+					SLOT(midiOutSelected()));
+		connect( &_it->m_midiPort, SIGNAL(modeChanged()),
+				this, SLOT(midiConfigChanged()));
 	}
 
 	m_midiInputAction->setText( tr( "Input" ) );
@@ -154,14 +154,14 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 	m_activityIndicator->setGeometry(
 					 widgetWidth-2*24-11, 2, 8, 28 );
 	m_activityIndicator->show();
-	connect( m_activityIndicator, SIGNAL( pressed() ),
-				this, SLOT( activityIndicatorPressed() ) );
-	connect( m_activityIndicator, SIGNAL( released() ),
-				this, SLOT( activityIndicatorReleased() ) );
-	connect( _it, SIGNAL( newNote() ),
-			 m_activityIndicator, SLOT( activate() ) );
-	connect( _it, SIGNAL( endNote() ),
-	 		m_activityIndicator, SLOT( noteEnd() ) );
+	connect( m_activityIndicator, SIGNAL(pressed()),
+				this, SLOT(activityIndicatorPressed()));
+	connect( m_activityIndicator, SIGNAL(released()),
+				this, SLOT(activityIndicatorReleased()));
+	connect( _it, SIGNAL(newNote()),
+			 m_activityIndicator, SLOT(activate()));
+	connect( _it, SIGNAL(endNote()),
+	 		m_activityIndicator, SLOT(noteEnd()));
 
 	setModel( _it );
 }
@@ -368,7 +368,7 @@ QMenu * InstrumentTrackView::createMixerMenu(QString title, QString newMixerLabe
 
 	QMenu *mixerMenu = new QMenu( title );
 
-	mixerMenu->addAction( newMixerLabel, this, SLOT( createMixerLine() ) );
+	mixerMenu->addAction( newMixerLabel, this, SLOT(createMixerLine()));
 	mixerMenu->addSeparator();
 
 	for (int i = 0; i < Engine::mixer()->numChannels(); ++i)
diff --git a/src/gui/tracks/PatternTrackView.cpp b/src/gui/tracks/PatternTrackView.cpp
index 41195f5db..be039ba79 100644
--- a/src/gui/tracks/PatternTrackView.cpp
+++ b/src/gui/tracks/PatternTrackView.cpp
@@ -46,8 +46,8 @@ PatternTrackView::PatternTrackView(PatternTrack* pt, TrackContainerView* tcv) :
 	m_trackLabel->setIcon( embed::getIconPixmap("pattern_track"));
 	m_trackLabel->move( 3, 1 );
 	m_trackLabel->show();
-	connect( m_trackLabel, SIGNAL( clicked( bool ) ),
-			this, SLOT( clickedTrackLabel() ) );
+	connect( m_trackLabel, SIGNAL(clicked(bool)),
+			this, SLOT(clickedTrackLabel()));
 	setModel(pt);
 }
 
diff --git a/src/gui/tracks/SampleTrackView.cpp b/src/gui/tracks/SampleTrackView.cpp
index 9897b3309..83331ad1e 100644
--- a/src/gui/tracks/SampleTrackView.cpp
+++ b/src/gui/tracks/SampleTrackView.cpp
@@ -53,7 +53,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
 
 	m_tlb = new TrackLabelButton(this, getTrackSettingsWidget());
 	m_tlb->setCheckable(true);
-	connect(m_tlb, SIGNAL(clicked( bool )),
+	connect(m_tlb, SIGNAL(clicked(bool)),
 			this, SLOT(showEffects()));
 	m_tlb->setIcon(embed::getIconPixmap("sample_track"));
 	m_tlb->move(3, 1);
diff --git a/src/gui/tracks/TrackContentWidget.cpp b/src/gui/tracks/TrackContentWidget.cpp
index 03e7487a6..5e6344ec4 100644
--- a/src/gui/tracks/TrackContentWidget.cpp
+++ b/src/gui/tracks/TrackContentWidget.cpp
@@ -71,8 +71,8 @@ TrackContentWidget::TrackContentWidget( TrackView * parent ) :
 	setAcceptDrops( true );
 
 	connect( parent->trackContainerView(),
-			SIGNAL( positionChanged( const lmms::TimePos & ) ),
-			this, SLOT( changePosition( const lmms::TimePos & ) ) );
+			SIGNAL( positionChanged( const lmms::TimePos& ) ),
+			this, SLOT( changePosition( const lmms::TimePos& ) ) );
 
 	setStyle( QApplication::style() );
 
diff --git a/src/gui/tracks/TrackLabelButton.cpp b/src/gui/tracks/TrackLabelButton.cpp
index 6f3d13727..77e678617 100644
--- a/src/gui/tracks/TrackLabelButton.cpp
+++ b/src/gui/tracks/TrackLabelButton.cpp
@@ -62,12 +62,12 @@ TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) :
 		setFixedSize( 160, 29 );
 		m_renameLineEdit->move( 30, ( height() / 2 ) - ( m_renameLineEdit->sizeHint().height() / 2 ) );
 		m_renameLineEdit->setFixedWidth( width() - 33 );
-		connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) );
+		connect( m_renameLineEdit, SIGNAL(editingFinished()), this, SLOT(renameFinished()));
 	}
 	
 	setIconSize( QSize( 24, 24 ) );
-	connect( m_trackView->getTrack(), SIGNAL( dataChanged() ), this, SLOT( update() ) );
-	connect( m_trackView->getTrack(), SIGNAL( nameChanged() ), this, SLOT( nameChanged() ) );
+	connect( m_trackView->getTrack(), SIGNAL(dataChanged()), this, SLOT(update()));
+	connect( m_trackView->getTrack(), SIGNAL(nameChanged()), this, SLOT(nameChanged()));
 }
 
 
diff --git a/src/gui/tracks/TrackOperationsWidget.cpp b/src/gui/tracks/TrackOperationsWidget.cpp
index 2670f891d..bef6ddcbf 100644
--- a/src/gui/tracks/TrackOperationsWidget.cpp
+++ b/src/gui/tracks/TrackOperationsWidget.cpp
@@ -65,7 +65,7 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
 
 	QMenu * toMenu = new QMenu( this );
 	toMenu->setFont( pointSize<9>( toMenu->font() ) );
-	connect( toMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
+	connect( toMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
 
 
 	setObjectName( "automationEnabled" );
@@ -106,13 +106,13 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
 	m_soloBtn->show();
 	m_soloBtn->setToolTip(tr("Solo"));
 
-	connect( this, SIGNAL( trackRemovalScheduled( lmms::gui::TrackView * ) ),
+	connect( this, SIGNAL(trackRemovalScheduled(lmms::gui::TrackView*)),
 			m_trackView->trackContainerView(),
-				SLOT( deleteTrackView( lmms::gui::TrackView * ) ),
+				SLOT(deleteTrackView(lmms::gui::TrackView*)),
 							Qt::QueuedConnection );
 
-	connect( m_trackView->getTrack()->getMutedModel(), SIGNAL( dataChanged() ),
-			this, SLOT( update() ) );
+	connect( m_trackView->getTrack()->getMutedModel(), SIGNAL(dataChanged()),
+			this, SLOT(update()));
 
 	connect(m_trackView->getTrack(), SIGNAL(colorChanged()), this, SLOT(update()));
 }
@@ -330,14 +330,14 @@ void TrackOperationsWidget::updateMenu()
 	toMenu->clear();
 	toMenu->addAction( embed::getIconPixmap( "edit_copy", 16, 16 ),
 						tr( "Clone this track" ),
-						this, SLOT( cloneTrack() ) );
+						this, SLOT(cloneTrack()));
 	toMenu->addAction( embed::getIconPixmap( "cancel", 16, 16 ),
 						tr( "Remove this track" ),
-						this, SLOT( removeTrack() ) );
+						this, SLOT(removeTrack()));
 
 	if( ! m_trackView->trackContainerView()->fixedClips() )
 	{
-		toMenu->addAction( tr( "Clear this track" ), this, SLOT( clearTrack() ) );
+		toMenu->addAction( tr( "Clear this track" ), this, SLOT(clearTrack()));
 	}
 	if (QMenu *mixerMenu = m_trackView->createMixerMenu(tr("Channel %1: %2"), tr("Assign to new Mixer Channel")))
 	{
@@ -351,8 +351,8 @@ void TrackOperationsWidget::updateMenu()
 	}
 	if( dynamic_cast<AutomationTrackView *>( m_trackView ) )
 	{
-		toMenu->addAction( tr( "Turn all recording on" ), this, SLOT( recordingOn() ) );
-		toMenu->addAction( tr( "Turn all recording off" ), this, SLOT( recordingOff() ) );
+		toMenu->addAction( tr( "Turn all recording on" ), this, SLOT(recordingOn()));
+		toMenu->addAction( tr( "Turn all recording off" ), this, SLOT(recordingOff()));
 	}
 
 	toMenu->addSeparator();
diff --git a/src/gui/tracks/TrackView.cpp b/src/gui/tracks/TrackView.cpp
index 61d598f6e..2065b0b53 100644
--- a/src/gui/tracks/TrackView.cpp
+++ b/src/gui/tracks/TrackView.cpp
@@ -88,20 +88,20 @@ TrackView::TrackView( Track * track, TrackContainerView * tcv ) :
 	setAttribute( Qt::WA_DeleteOnClose, true );
 
 
-	connect( m_track, SIGNAL( destroyedTrack() ), this, SLOT( close() ) );
+	connect( m_track, SIGNAL(destroyedTrack()), this, SLOT(close()));
 	connect( m_track,
-		SIGNAL( clipAdded( lmms::Clip * ) ),
-			this, SLOT( createClipView( lmms::Clip * ) ),
+		SIGNAL(clipAdded(lmms::Clip*)),
+			this, SLOT(createClipView(lmms::Clip*)),
 			Qt::QueuedConnection );
 
-	connect( &m_track->m_mutedModel, SIGNAL( dataChanged() ),
-			&m_trackContentWidget, SLOT( update() ) );
+	connect( &m_track->m_mutedModel, SIGNAL(dataChanged()),
+			&m_trackContentWidget, SLOT(update()));
 
 	connect(&m_track->m_mutedModel, SIGNAL(dataChanged()),
 			this, SLOT(muteChanged()));
 
-	connect( &m_track->m_soloModel, SIGNAL( dataChanged() ),
-			m_track, SLOT( toggleSolo() ), Qt::DirectConnection );
+	connect( &m_track->m_soloModel, SIGNAL(dataChanged()),
+			m_track, SLOT(toggleSolo()), Qt::DirectConnection );
 
 	// create views for already existing clips
 	for( Track::clipVector::iterator it = m_track->m_clips.begin(); it != m_track->m_clips.end(); ++it )
@@ -196,7 +196,7 @@ void TrackView::modelChanged()
 {
 	m_track = castModel<Track>();
 	Q_ASSERT( m_track != nullptr );
-	connect( m_track, SIGNAL( destroyedTrack() ), this, SLOT( close() ) );
+	connect( m_track, SIGNAL(destroyedTrack()), this, SLOT(close()));
 	m_trackOperationsWidget.m_muteBtn->setModel( &m_track->m_mutedModel );
 	m_trackOperationsWidget.m_soloBtn->setModel( &m_track->m_soloModel );
 	ModelView::modelChanged();
diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp
index 29af4af86..49602a24f 100644
--- a/src/gui/widgets/AutomatableButton.cpp
+++ b/src/gui/widgets/AutomatableButton.cpp
@@ -246,8 +246,8 @@ void automatableButtonGroup::activateButton( AutomatableButton * _btn )
 
 void automatableButtonGroup::modelChanged()
 {
-	connect( model(), SIGNAL( dataChanged() ),
-			this, SLOT( updateButtons() ) );
+	connect( model(), SIGNAL(dataChanged()),
+			this, SLOT(updateButtons()));
 	IntModelView::modelChanged();
 	updateButtons();
 }
diff --git a/src/gui/widgets/AutomatableSlider.cpp b/src/gui/widgets/AutomatableSlider.cpp
index b7af54b32..13cd9771f 100644
--- a/src/gui/widgets/AutomatableSlider.cpp
+++ b/src/gui/widgets/AutomatableSlider.cpp
@@ -42,10 +42,10 @@ AutomatableSlider::AutomatableSlider( QWidget * _parent,
 {
 	setWindowTitle( _name );
 
-	connect( this, SIGNAL( valueChanged( int ) ),
-					this, SLOT( changeValue( int ) ) );
-	connect( this, SIGNAL( sliderMoved( int ) ),
-					this, SLOT( moveSlider( int ) ) );
+	connect( this, SIGNAL(valueChanged(int)),
+					this, SLOT(changeValue(int)));
+	connect( this, SIGNAL(sliderMoved(int)),
+					this, SLOT(moveSlider(int)));
 }
 
 
@@ -109,8 +109,8 @@ void AutomatableSlider::modelChanged()
 {
 	QSlider::setRange( model()->minValue(), model()->maxValue() );
 	updateSlider();
-	connect( model(), SIGNAL( dataChanged() ),
-				this, SLOT( updateSlider() ) );
+	connect( model(), SIGNAL(dataChanged()),
+				this, SLOT(updateSlider()));
 }
 
 
diff --git a/src/gui/widgets/CPULoadWidget.cpp b/src/gui/widgets/CPULoadWidget.cpp
index 01c36994e..3f465d347 100644
--- a/src/gui/widgets/CPULoadWidget.cpp
+++ b/src/gui/widgets/CPULoadWidget.cpp
@@ -51,8 +51,8 @@ CPULoadWidget::CPULoadWidget( QWidget * _parent ) :
 	m_temp = QPixmap( width(), height() );
 	
 
-	connect( &m_updateTimer, SIGNAL( timeout() ),
-					this, SLOT( updateCpuLoad() ) );
+	connect( &m_updateTimer, SIGNAL(timeout()),
+					this, SLOT(updateCpuLoad()));
 	m_updateTimer.start( 100 );	// update cpu-load at 10 fps
 }
 
diff --git a/src/gui/widgets/ComboBox.cpp b/src/gui/widgets/ComboBox.cpp
index ab6b29b9d..7b6121b23 100644
--- a/src/gui/widgets/ComboBox.cpp
+++ b/src/gui/widgets/ComboBox.cpp
@@ -72,8 +72,8 @@ ComboBox::ComboBox( QWidget * _parent, const QString & _name ) :
 	setFont( pointSize<9>( font() ) );
 	m_menu.setFont( pointSize<8>( m_menu.font() ) );
 
-	connect( &m_menu, SIGNAL( triggered( QAction * ) ),
-				this, SLOT( setItem( QAction * ) ) );
+	connect( &m_menu, SIGNAL(triggered(QAction*)),
+				this, SLOT(setItem(QAction*)));
 
 	setWindowTitle( _name );
 	doConnections();
diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp
index f5639ff70..63d295ad1 100644
--- a/src/gui/widgets/Graph.cpp
+++ b/src/gui/widgets/Graph.cpp
@@ -52,11 +52,11 @@ Graph::Graph( QWidget * _parent, graphStyle _style, int _width,
 
 	graphModel * gModel = castModel<graphModel>();
 
-	QObject::connect( gModel, SIGNAL( samplesChanged( int, int ) ),
-			this, SLOT( updateGraph( int, int ) ) );
+	QObject::connect( gModel, SIGNAL(samplesChanged(int,int)),
+			this, SLOT(updateGraph(int,int)));
 
-	QObject::connect( gModel, SIGNAL( lengthChanged() ),
-			this, SLOT( updateGraph() ) );
+	QObject::connect( gModel, SIGNAL(lengthChanged()),
+			this, SLOT(updateGraph()));
 }
 
 void Graph::setForeground( const QPixmap &_pixmap )
@@ -435,11 +435,11 @@ void Graph::modelChanged()
 {
 	graphModel * gModel = castModel<graphModel>();
 
-	QObject::connect( gModel, SIGNAL( samplesChanged( int, int ) ),
-			this, SLOT( updateGraph( int, int ) ) );
+	QObject::connect( gModel, SIGNAL(samplesChanged(int,int)),
+			this, SLOT(updateGraph(int,int)));
 
-	QObject::connect( gModel, SIGNAL( lengthChanged() ),
-			this, SLOT( updateGraph() ) );
+	QObject::connect( gModel, SIGNAL(lengthChanged()),
+			this, SLOT(updateGraph()));
 }
 
 
diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp
index f6a1163a7..5a3d220ed 100644
--- a/src/gui/widgets/Knob.cpp
+++ b/src/gui/widgets/Knob.cpp
@@ -515,7 +515,7 @@ void Knob::contextMenuEvent( QContextMenuEvent * )
 	addDefaultActions( &contextMenu );
 	contextMenu.addAction( QPixmap(),
 		model()->isScaleLogarithmic() ? tr( "Set linear" ) : tr( "Set logarithmic" ),
-		this, SLOT( toggleScale() ) );
+		this, SLOT(toggleScale()));
 	contextMenu.addSeparator();
 	contextMenu.exec( QCursor::pos() );
 }
@@ -829,11 +829,11 @@ void Knob::doConnections()
 {
 	if( model() != nullptr )
 	{
-		QObject::connect( model(), SIGNAL( dataChanged() ),
-					this, SLOT( friendlyUpdate() ) );
+		QObject::connect( model(), SIGNAL(dataChanged()),
+					this, SLOT(friendlyUpdate()));
 
-		QObject::connect( model(), SIGNAL( propertiesChanged() ),
-						this, SLOT( update() ) );
+		QObject::connect( model(), SIGNAL(propertiesChanged()),
+						this, SLOT(update()));
 	}
 }
 
diff --git a/src/gui/widgets/Oscilloscope.cpp b/src/gui/widgets/Oscilloscope.cpp
index cd028f637..bec45c162 100644
--- a/src/gui/widgets/Oscilloscope.cpp
+++ b/src/gui/widgets/Oscilloscope.cpp
@@ -91,17 +91,17 @@ void Oscilloscope::setActive( bool _active )
 	if( m_active )
 	{
 		connect( getGUI()->mainWindow(),
-					SIGNAL( periodicUpdate() ),
-					this, SLOT( update() ) );
+					SIGNAL(periodicUpdate()),
+					this, SLOT(update()));
 		connect( Engine::audioEngine(),
-			SIGNAL( nextAudioBuffer( const lmms::surroundSampleFrame* ) ),
-			this, SLOT( updateAudioBuffer( const lmms::surroundSampleFrame* ) ) );
+			SIGNAL(nextAudioBuffer(const lmms::surroundSampleFrame*)),
+			this, SLOT(updateAudioBuffer(const lmms::surroundSampleFrame*)) );
 	}
 	else
 	{
 		disconnect( getGUI()->mainWindow(),
-					SIGNAL( periodicUpdate() ),
-					this, SLOT( update() ) );
+					SIGNAL(periodicUpdate()),
+					this, SLOT(update()));
 		disconnect( Engine::audioEngine(),
 			SIGNAL( nextAudioBuffer( const lmms::surroundSampleFrame* ) ),
 			this, SLOT( updateAudioBuffer( const lmms::surroundSampleFrame* ) ) );
diff --git a/src/gui/widgets/TabBar.cpp b/src/gui/widgets/TabBar.cpp
index 007f78194..ccb879db6 100644
--- a/src/gui/widgets/TabBar.cpp
+++ b/src/gui/widgets/TabBar.cpp
@@ -55,7 +55,7 @@ TabButton * TabBar::addTab( QWidget * _w, const QString & _text, int _id,
 	QString caption = ( _text_is_tooltip ) ? QString( "" ) : _text;
 	// create tab-button
 	TabButton * b = new TabButton( caption, _id, this );
-	connect( b, SIGNAL( clicked( int ) ), this, SLOT( tabClicked( int ) ) );
+	connect( b, SIGNAL(clicked(int)), this, SLOT(tabClicked(int)));
 	b->setIconSize( QSize( 48, 48 ) );
 	b->setFixedSize( 64, 64 );
 	b->show();
diff --git a/src/gui/widgets/TempoSyncKnob.cpp b/src/gui/widgets/TempoSyncKnob.cpp
index 47da424d4..86ee6df3c 100644
--- a/src/gui/widgets/TempoSyncKnob.cpp
+++ b/src/gui/widgets/TempoSyncKnob.cpp
@@ -75,10 +75,10 @@ void TempoSyncKnob::modelChanged()
 	{
 		m_custom->setModel( &model()->m_custom );
 	}
-	connect( model(), SIGNAL( syncModeChanged( lmms::TempoSyncKnobModel::TempoSyncMode ) ),
-			this, SLOT( updateDescAndIcon() ) );
-	connect( this, SIGNAL( sliderMoved( float ) ),
-			model(), SLOT( disableSync() ) );
+	connect( model(), SIGNAL(syncModeChanged(lmms::TempoSyncKnobModel::TempoSyncMode)),
+			this, SLOT(updateDescAndIcon()));
+	connect( this, SIGNAL(sliderMoved(float)),
+			model(), SLOT(disableSync()));
 	updateDescAndIcon();
 }
 
@@ -101,8 +101,8 @@ void TempoSyncKnob::contextMenuEvent( QContextMenuEvent * )
 	if( limit / 8.0f <= model()->maxValue() )
 	{
 
-	connect( syncMenu, SIGNAL( triggered( QAction * ) ),
-			model(), SLOT( setTempoSync( QAction * ) ) );
+	connect( syncMenu, SIGNAL(triggered(QAction*)),
+			model(), SLOT(setTempoSync(QAction*)));
 	syncMenu->addAction( embed::getIconPixmap( "note_none" ),
 		tr( "No Sync" ) )->setData( (int) TempoSyncKnobModel::SyncNone );
 	if( limit / 0.125f <= model()->maxValue() )
@@ -146,7 +146,7 @@ void TempoSyncKnob::contextMenuEvent( QContextMenuEvent * )
 				(int) TempoSyncKnobModel::SyncThirtysecondNote );
 	syncMenu->addAction( embed::getIconPixmap( "dont_know" ),
 				tr( "Custom..." ),
-				this, SLOT( showCustom() )
+				this, SLOT(showCustom())
 						)->setData(
 					(int) TempoSyncKnobModel::SyncCustom );
 	contextMenu.addSeparator();
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index a43c91c80..6b9871d3e 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -81,7 +81,7 @@ void TextFloat::setPixmap( const QPixmap & _pixmap )
 
 void TextFloat::setVisibilityTimeOut( int _msecs )
 {
-	QTimer::singleShot( _msecs, this, SLOT( hide() ) );
+	QTimer::singleShot( _msecs, this, SLOT(hide()));
 	show();
 }
 
@@ -106,7 +106,7 @@ TextFloat * TextFloat::displayMessage( const QString & _msg, int _timeout,
 	if( _timeout > 0 )
 	{
 		tf->setAttribute( Qt::WA_DeleteOnClose, true );
-		QTimer::singleShot( _timeout, tf, SLOT( close() ) );
+		QTimer::singleShot( _timeout, tf, SLOT(close()));
 	}
 	return( tf );
 }
diff --git a/src/gui/widgets/TimeDisplayWidget.cpp b/src/gui/widgets/TimeDisplayWidget.cpp
index c2cd11b1b..cefa0fa8f 100644
--- a/src/gui/widgets/TimeDisplayWidget.cpp
+++ b/src/gui/widgets/TimeDisplayWidget.cpp
@@ -55,8 +55,8 @@ TimeDisplayWidget::TimeDisplayWidget() :
 	// update labels of LCD spinboxes
 	setDisplayMode( m_displayMode );
 
-	connect( getGUI()->mainWindow(), SIGNAL( periodicUpdate() ),
-					this, SLOT( updateTime() ) );
+	connect( getGUI()->mainWindow(), SIGNAL(periodicUpdate()),
+					this, SLOT(updateTime()));
 }
 
 void TimeDisplayWidget::setDisplayMode( DisplayMode displayMode )
diff --git a/src/gui/widgets/ToolButton.cpp b/src/gui/widgets/ToolButton.cpp
index 4feb038f0..366fd21f2 100644
--- a/src/gui/widgets/ToolButton.cpp
+++ b/src/gui/widgets/ToolButton.cpp
@@ -38,7 +38,7 @@ ToolButton::ToolButton( const QPixmap & _pixmap, const QString & _tooltip,
 
 	if( _receiver != nullptr && _slot != nullptr )
 	{
-		connect( this, SIGNAL( clicked() ), _receiver, _slot );
+		connect( this, SIGNAL(clicked()), _receiver, _slot );
 	}
 	setToolTip(_tooltip);
 	setIcon( _pixmap );
diff --git a/src/tracks/MidiClip.cpp b/src/tracks/MidiClip.cpp
index ef693ba5b..5b017a7f9 100644
--- a/src/tracks/MidiClip.cpp
+++ b/src/tracks/MidiClip.cpp
@@ -132,8 +132,8 @@ void MidiClip::resizeToFirstTrack()
 
 void MidiClip::init()
 {
-	connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ),
-				this, SLOT( changeTimeSignature() ) );
+	connect( Engine::getSong(), SIGNAL(timeSignatureChanged(int,int)),
+				this, SLOT(changeTimeSignature()));
 	saveJournallingState( false );
 
 	updateLength();
diff --git a/src/tracks/PatternTrack.cpp b/src/tracks/PatternTrack.cpp
index df7766c57..851db7f6c 100644
--- a/src/tracks/PatternTrack.cpp
+++ b/src/tracks/PatternTrack.cpp
@@ -51,7 +51,7 @@ PatternTrack::PatternTrack(TrackContainer* tc) :
 	Engine::patternStore()->setCurrentPattern(patternNum);
 	Engine::patternStore()->updateComboBox();
 
-	connect( this, SIGNAL( nameChanged() ),
+	connect( this, SIGNAL(nameChanged()),
 		Engine::patternStore(), SLOT(updateComboBox()));
 }