Whole code base: various cleanups, removed SINGLE_SOURCE_COMPILE relicts

* cleaned up code and improved coding style * removed old SINGLE_SOURCE_COMPILE macro relicts * use QString::toUtf8() instead of QString::toAscii() wherever possible (cherry picked from commit 0bb54199b0)
2009-08-04 12:32:36 +02:00
parent f969b7d892
commit edf2d4d104
108 changed files with 99 additions and 380 deletions
--- a/include/instrument.h
+++ b/include/instrument.h
@@ -2,8 +2,8 @@
 * instrument.h - declaration of class instrument, which provides a
 *                standard interface for all instrument plugins
 *
- * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -23,7 +23,6 @@
 *
 */

-
 #ifndef _INSTRUMENT_H
 #define _INSTRUMENT_H

@@ -80,20 +79,20 @@ public:
 	// if no envelope is active - such instruments can re-implement this
 	// method for returning how many frames they at least like to have for
 	// release
-	virtual f_cnt_t desiredReleaseFrames( void ) const
+	virtual f_cnt_t desiredReleaseFrames() const
 	{
 		return 0;
 	}

 	// return false if instrument is not bendable
-	inline virtual bool isBendable( void ) const
+	inline virtual bool isBendable() const
 	{
 		return true;
 	}

 	// return true if instruments reacts to MIDI events passed to
 	// handleMidiEvent() rather than playNote() & Co
-	inline virtual bool isMidiBased( void ) const
+	inline virtual bool isMidiBased() const
 	{
 		return false;
 	}
@@ -106,7 +105,7 @@ public:
 		return false;
 	}

-	virtual QString fullDisplayName( void ) const;
+	virtual QString fullDisplayName() const;

 	// --------------------------------------------------------------------
 	// provided functions:
@@ -121,7 +120,7 @@ public:


 protected:
-	inline instrumentTrack * getInstrumentTrack( void ) const
+	inline instrumentTrack * getInstrumentTrack() const
 	{
 		return m_instrumentTrack;
 	}
@@ -137,5 +136,4 @@ private:

 } ;

-
 #endif
--- a/include/midi.h
+++ b/include/midi.h
@@ -2,7 +2,7 @@
 * midi.h - constants, structs etc. concerning MIDI
 *
 * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
 *
 */

-
 #ifndef _MIDI_H
 #define _MIDI_H

--- a/include/sample_buffer.h
+++ b/include/sample_buffer.h
@@ -2,7 +2,7 @@
 * sample_buffer.h - container-class sampleBuffer
 *
 * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ public:
 	class EXPORT handleState
 	{
 	public:
-		handleState( bool _varying_pitch = FALSE );
+		handleState( bool _varying_pitch = false );
 		virtual ~handleState();


@@ -66,16 +66,16 @@ public:
 	// constructor which either loads sample _audio_file or decodes
 	// base64-data out of string
 	sampleBuffer( const QString & _audio_file = QString(),
-						bool _is_base64_data = FALSE );
+						bool _is_base64_data = false );
 	sampleBuffer( const sampleFrame * _data, const f_cnt_t _frames );
 	sampleBuffer( const f_cnt_t _frames );
-	
+
 	virtual ~sampleBuffer();

 	bool play( sampleFrame * _ab, handleState * _state,
 				const fpp_t _frames,
 				const float _freq,
-				const bool _looped = FALSE );
+				const bool _looped = false );

 	void visualize( QPainter & _p, const QRect & _dr, const QRect & _clip );
 	inline void visualize( QPainter & _p, const QRect & _dr )
@@ -83,17 +83,17 @@ public:
 		visualize( _p, _dr, _dr );
 	}

-	inline const QString & audioFile( void ) const
+	inline const QString & audioFile() const
 	{
 		return m_audioFile;
 	}

-	inline f_cnt_t startFrame( void ) const
+	inline f_cnt_t startFrame() const
 	{
 		return m_startFrame;
 	}

-	inline f_cnt_t endFrame( void ) const
+	inline f_cnt_t endFrame() const
 	{
 		return m_endFrame;
 	}
@@ -112,22 +112,22 @@ public:
 		m_varLock.unlock();
 	}

-	inline f_cnt_t frames( void ) const
+	inline f_cnt_t frames() const
 	{
 		return m_frames;
 	}

-	inline float amplification( void ) const
+	inline float amplification() const
 	{
 		return m_amplification;
 	}

-	inline bool reversed( void ) const
+	inline bool reversed() const
 	{
 		return m_reversed;
 	}

-	inline float frequency( void ) const
+	inline float frequency() const
 	{
 		return m_frequency;
 	}
@@ -146,12 +146,12 @@ public:
 		m_varLock.unlock();
 	}

-	inline const sampleFrame * data( void ) const
+	inline const sampleFrame * data() const
 	{
 		return m_data;
 	}

-	QString openAudioFile( void ) const;
+	QString openAudioFile() const;

 	QString & toBase64( QString & _dst ) const;

@@ -170,7 +170,7 @@ public:
 	}

 	void normalizeSampleRate( const sample_rate_t _src_sr,
-						bool _keep_settings = FALSE );
+						bool _keep_settings = false );

 	inline sample_t userWaveSample( const float _sample ) const
 	{
@@ -207,7 +207,7 @@ public slots:


 private:
-	void update( bool _keep_settings = FALSE );
+	void update( bool _keep_settings = false );


 	f_cnt_t decodeSampleSF( const char * _f, int_sample_t * & _buf,
@@ -222,7 +222,6 @@ private:
 						ch_cnt_t & _channels,
 						sample_rate_t & _sample_rate );

-
 	QString m_audioFile;
 	sampleFrame * m_origData;
 	f_cnt_t m_origFrames;
@@ -245,7 +244,7 @@ private:


 signals:
-	void sampleUpdated( void );
+	void sampleUpdated();

 } ;

--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -41,8 +41,6 @@
 #include "string_pair_drag.h"
 #include "mmp.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


@@ -212,13 +210,13 @@ pluginView * audioFileProcessor::instantiateView( QWidget * _parent )


 void audioFileProcessor::setAudioFile( const QString & _audio_file,
-								bool _rename )
+													bool _rename )
 {
 	// is current channel-name equal to previous-filename??
-	if( _rename && 
+	if( _rename &&
 		( getInstrumentTrack()->name() ==
 			QFileInfo( m_sampleBuffer.audioFile() ).fileName() ||
-		   	m_sampleBuffer.audioFile() == "" ) )
+				m_sampleBuffer.audioFile().isEmpty() ) )
 	{
 		// then set it to new one
 		getInstrumentTrack()->setName( QFileInfo( _audio_file
--- a/plugins/bass_booster/bass_booster.cpp
+++ b/plugins/bass_booster/bass_booster.cpp
@@ -1,7 +1,7 @@
 /*
 * bass_booster.cpp - bass-booster-effect-plugin
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -25,8 +25,6 @@

 #include "bass_booster.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/bit_invader/bit_invader.cpp
+++ b/plugins/bit_invader/bit_invader.cpp
@@ -39,7 +39,6 @@
 #include "tooltip.h"
 #include "song.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"

 extern "C"
--- a/plugins/flp_import/flp_import.cpp
+++ b/plugins/flp_import/flp_import.cpp
@@ -1,10 +1,10 @@
 /*
 * flp_import.cpp - support for importing FLP-files
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public
 * License as published by the Free Software Foundation; either
@@ -22,7 +22,6 @@
 *
 */

-
 #include <QtXml/QDomDocument>
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>
@@ -1723,9 +1722,8 @@ p->putValue( jt->pos, value, false );
 			continue;
 		}
 		effectChain * ec = &engine::getFxMixer()->
-					getEffectChannel( it->fxChannel )->
-								m_fxChain;
-		printf("adding %s to %d\n", effName.toAscii().constData(),
+					getEffectChannel( it->fxChannel )->m_fxChain;
+		printf("adding %s to %d\n", effName.toUtf8().constData(),
 								it->fxChannel );
 		for( effectKeyList::iterator jt = effKeys.begin();
 						jt != effKeys.end(); ++jt )
--- a/plugins/kicker/kicker.cpp
+++ b/plugins/kicker/kicker.cpp
@@ -1,7 +1,7 @@
 /*
 * kicker.cpp - bassdrum-synthesizer
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -33,7 +33,6 @@
 #include "note_play_handle.h"
 #include "sweep_oscillator.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/ladspa_browser/ladspa_browser.cpp
+++ b/plugins/ladspa_browser/ladspa_browser.cpp
@@ -37,13 +37,10 @@
 #include "tab_bar.h"
 #include "tab_button.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"



-
 extern "C"
 {

--- a/plugins/ladspa_effect/ladspa_effect.cpp
+++ b/plugins/ladspa_effect/ladspa_effect.cpp
@@ -38,8 +38,6 @@
 #include "automation_pattern.h"
 #include "controller_connection.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/lb302/lb302.cpp
+++ b/plugins/lb302/lb302.cpp
@@ -44,7 +44,6 @@
 #include "templates.h"
 #include "tooltip.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"
 #include "moc_lb302.cxx"

--- a/plugins/lb303/lb303.cpp
+++ b/plugins/lb303/lb303.cpp
@@ -40,7 +40,6 @@
 #include "templates.h"
 #include "audio_port.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"
 #include "moc_lb303.cxx"

--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -39,7 +39,6 @@
 #include "templates.h"
 #include "tooltip.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/papu/papu_instrument.cpp
+++ b/plugins/papu/papu_instrument.cpp
@@ -36,7 +36,6 @@
 #include "tooltip.h"
 #include "graph.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"

 extern "C"
--- a/plugins/patman/patman.cpp
+++ b/plugins/patman/patman.cpp
@@ -22,7 +22,6 @@
 *
 */

-
 #include "patman.h"

 #include <QtGui/QFileDialog>
@@ -40,7 +39,6 @@
 #include "string_pair_drag.h"
 #include "tooltip.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/peak_controller_effect/peak_controller_effect.cpp
+++ b/plugins/peak_controller_effect/peak_controller_effect.cpp
@@ -1,5 +1,5 @@
 /*
- * stereo_matrix.cpp - stereo-matrix-effect-plugin
+ * peak_controller_effect.cpp - PeakController effect plugin
 *
 * Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail/dot/com>
 * 
@@ -28,8 +28,6 @@
 #include "peak_controller.h"
 #include "peak_controller_effect.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/peak_controller_effect/peak_controller_effect.h
+++ b/plugins/peak_controller_effect/peak_controller_effect.h
@@ -1,5 +1,5 @@
 /*
- * stereo_matrix.h - stereo-matrix-effect-plugin
+ * peak_controller_effect.h - PeakController effect plugin
 *
 * Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail/dot/com>
 * 
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -43,7 +43,6 @@
 #include "tooltip.h"
 #include "lcd_spinbox.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/sid/sid_instrument.cpp
+++ b/plugins/sid/sid_instrument.cpp
@@ -40,7 +40,6 @@
 #include "pixmap_button.h"
 #include "tooltip.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"

 #define C64_PAL_CYCLES_PER_SEC  985248
--- a/plugins/spectrum_analyzer/spectrum_analyzer.cpp
+++ b/plugins/spectrum_analyzer/spectrum_analyzer.cpp
@@ -1,7 +1,7 @@
 /*
 * spectrum_analyzer.cpp - spectrum analyzer plugin
 *
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -22,11 +22,8 @@
 *
 */

-
 #include "spectrum_analyzer.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/stereo_enhancer/stereo_enhancer.cpp
+++ b/plugins/stereo_enhancer/stereo_enhancer.cpp
@@ -1,7 +1,7 @@
 /*
 * stereo_enhancer.cpp - stereo-enhancer-effect-plugin
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -25,8 +25,6 @@

 #include "stereo_enhancer.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/stereo_matrix/stereo_matrix.cpp
+++ b/plugins/stereo_matrix/stereo_matrix.cpp
@@ -25,8 +25,6 @@

 #include "stereo_matrix.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -22,7 +22,6 @@
 *
 */

-
 #include "mallets.h"

 #include <QtCore/QDir>
@@ -36,7 +35,6 @@
 #include "gui_templates.h"
 #include "instrument_track.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/triple_oscillator/triple_oscillator.cpp
+++ b/plugins/triple_oscillator/triple_oscillator.cpp
@@ -39,8 +39,6 @@
 #include "song_editor.h"
 #include "tooltip.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -22,7 +22,6 @@
 *
 */

-
 #include "vestige.h"

 #include <QtGui/QDropEvent>
@@ -42,7 +41,6 @@
 #include "text_float.h"
 #include "tooltip.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/vibed/vibed.cpp
+++ b/plugins/vibed/vibed.cpp
@@ -22,7 +22,6 @@
 *
 */

-
 #include <QtXml/QDomDocument>
 #include <QtCore/QMap>
 #include <QtGui/QWhatsThis>
@@ -40,7 +39,6 @@
 #include "volume.h"
 #include "song.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/vst_base/vst_plugin.cpp
+++ b/plugins/vst_base/vst_plugin.cpp
@@ -244,7 +244,7 @@ void vstPlugin::loadSettings( const QDomElement & _this )
 	if( _this.hasAttribute( "chunk" ) )
 	{
 		loadChunk( QByteArray::fromBase64(
-				_this.attribute( "chunk" ).toAscii() ) );
+				_this.attribute( "chunk" ).toUtf8() ) );
 	}
 	else if( num_params > 0 )
 	{
--- a/plugins/vst_effect/vst_effect.cpp
+++ b/plugins/vst_effect/vst_effect.cpp
@@ -1,7 +1,7 @@
 /*
 * vst_effect.cpp - class for handling VST effect plugins
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -22,7 +22,6 @@
 *
 */

-
 #include "vst_effect.h"

 #include <QtGui/QMessageBox>
@@ -31,8 +30,6 @@
 #include "text_float.h"
 #include "vst_subplugin_features.h"

-
-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"


--- a/plugins/zynaddsubfx/zynaddsubfx.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx.cpp
@@ -39,7 +39,6 @@
 #include "string_pair_drag.h"
 #include "remote_zynaddsubfx.h"

-#undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"
 #include "moc_zynaddsubfx.cxx"

--- a/src/core/audio/audio_file_device.cpp
+++ b/src/core/audio/audio_file_device.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * audio_file_device.cpp - base-class for audio-device-classes which write
 *                         their output into a file
@@ -90,4 +88,3 @@ Sint32 audioFileDevice::writeData( const void * _data, Sint32 _len )



-#endif
--- a/src/core/audio/audio_file_ogg.cpp
+++ b/src/core/audio/audio_file_ogg.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * audio_file_ogg.cpp - audio-device which encodes wave-stream and writes it
 *                      into an OGG-file. This is used for song-export.
@@ -270,4 +268,3 @@ void audioFileOgg::finishEncoding( void )
 #endif


-#endif
--- a/src/core/audio/audio_portaudio.cpp
+++ b/src/core/audio/audio_portaudio.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * audio_portaudio.cpp - device-class that performs PCM-output via PortAudio
 *
@@ -537,4 +535,3 @@ void audioPortAudio::setupWidget::saveSettings( void )

 #include "moc_audio_portaudio.cxx"

-#endif
--- a/src/core/audio/audio_sample_recorder.cpp
+++ b/src/core/audio/audio_sample_recorder.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * audio_sample_recorder.cpp - device-class that implements recording
 *                             surround-audio-buffers into RAM, maybe later
@@ -116,4 +114,3 @@ void audioSampleRecorder::writeBuffer( const surroundSampleFrame * _ab,



-#endif
--- a/src/core/base64.cpp
+++ b/src/core/base64.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * base64.cpp - namespace base64 with methods for encoding/decoding binary data
 *              to/from base64
@@ -76,4 +74,3 @@ QVariant decode( const QString & _b64, QVariant::Type _force_type )

 } ;

-#endif
--- a/src/core/clipboard.cpp
+++ b/src/core/clipboard.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * clipboard.cpp - the clipboard for patterns, notes etc.
 *
@@ -59,4 +57,3 @@ const QDomElement * clipboard::getContent( const QString & _node_name )



-#endif
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * controller.cpp - implementation of class controller which handles
 *                  remote-control of automatableModels
@@ -259,4 +257,3 @@ controllerDialog * controller::createDialog( QWidget * _parent )
 #include "moc_controller.cxx"


-#endif
--- a/src/core/controller_connection.cpp
+++ b/src/core/controller_connection.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * controller_connection.cpp - implementation of class controller connection 
 *            which handles the link between automatableModels and controllers
@@ -228,4 +226,3 @@ controllerDialog * controller::createDialog( QWidget * _parent )
 #include "moc_controller_connection.cxx"


-#endif
--- a/src/core/effect.cpp
+++ b/src/core/effect.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * effect.cpp - base-class for effects
 *
@@ -206,4 +204,3 @@ void effect::resample( int _i, const sampleFrame * _src_buf,
 }


-#endif
--- a/src/core/effect_chain.cpp
+++ b/src/core/effect_chain.cpp
@@ -2,7 +2,7 @@
 * effect_chain.cpp - class for processing and effects chain
 *
 * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -201,7 +201,7 @@ bool effectChain::processAudioBuffer( sampleFrame * _buf, const fpp_t _frames )
 				it = m_effects.end()-1;
 				printf( "numerical overflow after processing "
 					"plugin \"%s\"\n", ( *it )->
-					publicName().toAscii().constData() );
+					publicName().toUtf8().constData() );
 				break;
 			}
 		}
--- a/src/core/envelope_and_lfo_parameters.cpp
+++ b/src/core/envelope_and_lfo_parameters.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * envelope_and_lfo_parameters.cpp - class envelopeAndLFOParameters
 *
@@ -499,4 +497,3 @@ void envelopeAndLFOParameters::updateSampleVars( void )
 #include "moc_envelope_and_lfo_parameters.cxx"


-#endif
--- a/src/core/import_filter.cpp
+++ b/src/core/import_filter.cpp
@@ -1,9 +1,7 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * import_filter.cpp - base-class for all import-filters (MIDI, FLP etc)
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -59,7 +57,7 @@ void importFilter::import( const QString & _file_to_import,

 	bool successful = FALSE;

-	char * s = qstrdup( _file_to_import.toAscii().constData() );
+	char * s = qstrdup( _file_to_import.toUtf8().constData() );

 	// do not record changes while importing files
 	const bool j = engine::getProjectJournal()->isJournalling();
@@ -127,5 +125,3 @@ bool importFilter::openFile( void )



-
-#endif
--- a/src/core/instrument.cpp
+++ b/src/core/instrument.cpp
@@ -123,7 +123,7 @@ void instrument::applyRelease( sampleFrame * buf, const notePlayHandle * _n )



-QString instrument::fullDisplayName( void ) const
+QString instrument::fullDisplayName() const
 {
 	return getInstrumentTrack()->displayName();
 }
--- a/src/core/instrument_sound_shaping.cpp
+++ b/src/core/instrument_sound_shaping.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * instrument_sound_shaping.cpp - class instrumentSoundShaping
 *
@@ -409,4 +407,3 @@ void instrumentSoundShaping::loadSettings( const QDomElement & _this )

 #include "moc_instrument_sound_shaping.cxx"

-#endif
--- a/src/core/journalling_object.cpp
+++ b/src/core/journalling_object.cpp
@@ -1,9 +1,7 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * journalling_object.cpp - implementation of journalling-object related stuff
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -37,11 +35,11 @@



-journallingObject::journallingObject( void ) :
+journallingObject::journallingObject() :
 	m_id( engine::getProjectJournal()->allocID( this ) ),
 	m_journalEntries(),
 	m_currentJournalEntry( m_journalEntries.end() ),
-	m_journalling( TRUE ),
+	m_journalling( true ),
 	m_journallingStateStack()
 {
 }
@@ -60,9 +58,9 @@ journallingObject::~journallingObject()



-void journallingObject::undo( void )
+void journallingObject::undo()
 {
-	if( m_journalEntries.empty() == TRUE )
+	if( m_journalEntries.empty() == true )
 	{
 		return;
 	}
@@ -76,9 +74,9 @@ void journallingObject::undo( void )



-void journallingObject::redo( void )
+void journallingObject::redo()
 {
-	if( m_journalEntries.empty() == TRUE )
+	if( m_journalEntries.empty() == true )
 	{
 		return;
 	}
@@ -97,7 +95,7 @@ QDomElement journallingObject::saveState( QDomDocument & _doc,
 {
 	QDomElement _this = serializingObject::saveState( _doc, _parent );
 	saveJournal( _doc, _this );
-	return( _this );
+	return _this;
 }


@@ -107,7 +105,7 @@ void journallingObject::restoreState( const QDomElement & _this )
 {
 	serializingObject::restoreState( _this );

-	saveJournallingState( FALSE );
+	saveJournallingState( false );

 	// search for journal-node
 	QDomNode node = _this.firstChild();
@@ -118,7 +116,7 @@ void journallingObject::restoreState( const QDomElement & _this )
 			loadJournal( node.toElement() );
 		}
 		node = node.nextSibling();
-        }
+	}

 	restoreJournallingState();
 }
@@ -158,7 +156,7 @@ void journallingObject::changeID( jo_id_t _id )
 								displayName();
 			}
 			fprintf( stderr, "JO-ID %d already in use by %s!\n",
-				(int) _id, used_by.toAscii().constData() );
+				(int) _id, used_by.toUtf8().constData() );
 			return;
 		}
 		engine::getProjectJournal()->forgetAboutID( id() );
@@ -183,7 +181,7 @@ void journallingObject::saveJournal( QDomDocument & _doc,
 	journal_de.setAttribute( "entries", m_journalEntries.size() );
 	journal_de.setAttribute( "curentry", (int)( m_currentJournalEntry -
 						m_journalEntries.begin() ) );
-	journal_de.setAttribute( "metadata", TRUE );
+	journal_de.setAttribute( "metadata", true );

 	for( journalEntryVector::const_iterator it = m_journalEntries.begin();
 					it != m_journalEntries.end(); ++it )
@@ -236,5 +234,3 @@ void journallingObject::loadJournal( const QDomElement & _this )
 }


-
-#endif
--- a/src/core/lfo_controller.cpp
+++ b/src/core/lfo_controller.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * lfo_controller.cpp - implementation of class controller which handles
 *                      remote-control of automatableModels
@@ -250,5 +248,3 @@ controllerDialog * lfoController::createDialog( QWidget * _parent )
 #include "moc_lfo_controller.cxx"


-#endif
-
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * main.cpp - just main.cpp which is starting up app...
 *
@@ -186,7 +184,7 @@ int main( int argc, char * * argv )
 			QFile f( argv[i + 1] );
 			f.open( QIODevice::ReadOnly );
 			QString d = qUncompress( f.readAll() );
-			printf( "%s\n", d.toAscii().constData() );
+			printf( "%s\n", d.toUtf8().constData() );
 			return( 0 );
 		}
 		else if( argc > i && ( QString( argv[i] ) == "--render" ||
@@ -495,4 +493,4 @@ int main( int argc, char * * argv )
 }


-#endif
+/* vim: set tw=0 noexpandtab: */
--- a/src/core/midi/midi_alsa_raw.cpp
+++ b/src/core/midi/midi_alsa_raw.cpp
@@ -1,10 +1,8 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * midi_alsa_raw.cpp - midi-client for RawMIDI via ALSA
 *
- * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -24,11 +22,9 @@
 *
 */

-
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>

-
 #include "midi_alsa_raw.h"
 #include "config_mgr.h"
 #include "gui_templates.h"
@@ -210,5 +206,3 @@ void midiALSARaw::setupWidget::saveSettings( void )

 #endif

-#endif
-
--- a/src/core/midi/midi_alsa_seq.cpp
+++ b/src/core/midi/midi_alsa_seq.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * midi_alsa_seq.cpp - ALSA-sequencer-client
 *
@@ -655,4 +653,3 @@ void midiALSASeq::setupWidget::saveSettings( void )

 #endif

-#endif
--- a/src/core/midi/midi_client.cpp
+++ b/src/core/midi/midi_client.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * midi_client.cpp - base-class for MIDI-clients like ALSA-sequencer-client
 *
@@ -338,4 +336,3 @@ Uint8 midiClientRaw::eventLength( const Uint8 _event )
 }


-#endif
--- a/src/core/midi/midi_oss.cpp
+++ b/src/core/midi/midi_oss.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * midi_oss.cpp - OSS-raw-midi-client
 *
@@ -148,4 +146,3 @@ void midiOSS::setupWidget::saveSettings( void )
 #endif


-#endif
--- a/src/core/mmp.cpp
+++ b/src/core/mmp.cpp
@@ -191,7 +191,7 @@ bool multimediaProject::writeFile( const QString & _fn )
 	QString xml = "<?xml version=\"1.0\"?>\n" + toString( 2 );
 	if( fn.section( '.', -1 ) == "mmpz" )
 	{
-		outfile.write( qCompress( xml.toAscii() ) );
+		outfile.write( qCompress( xml.toUtf8() ) );
 	}
 	else
 	{
@@ -668,7 +668,7 @@ void multimediaProject::upgrade( void )
 	{
 		m_head.setAttribute( "mastervol", 100 );
 	}
-//printf("%s\n", toString( 2 ).toAscii().constData());
+//printf("%s\n", toString( 2 ).toUtf8().constData());
 }


--- a/src/core/note.cpp
+++ b/src/core/note.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * note.cpp - implementation of class note
 *
@@ -235,7 +233,7 @@ void note::loadSettings( const QDomElement & _this )
 			break;

 		case ChangePanning:
-			setVolume( getPanning() - _je.data().toInt() );
+			setPanning( getPanning() - _je.data().toInt() );
 			break;

 		case ChangeLength:
@@ -287,4 +285,3 @@ bool note::hasDetuningInfo( void ) const



-#endif
--- a/src/core/oscillator.cpp
+++ b/src/core/oscillator.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * oscillator.cpp - implementation of powerful oscillator-class
 *
@@ -552,4 +550,3 @@ inline sample_t oscillator::getSample<oscillator::UserDefinedWave>(



-#endif
--- a/src/core/peak_controller.cpp
+++ b/src/core/peak_controller.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * lfo_controller.cpp - implementation of class controller which handles
 *                      remote-control of automatableModels
@@ -134,6 +132,3 @@ controllerDialog * peakController::createDialog( QWidget * _parent )

 #include "moc_peak_controller.cxx"

-
-#endif
-
--- a/src/core/plugin.cpp
+++ b/src/core/plugin.cpp
@@ -166,13 +166,13 @@ void plugin::getDescriptorsOfAvailPlugins( QVector<descriptor> & _plugin_descs )
 		}
 		descriptor * plugin_desc =
 			(descriptor *) plugin_lib.resolve(
-					desc_name.toAscii().constData() );
+					desc_name.toUtf8().constData() );
 		if( plugin_desc == NULL )
 		{
 			printf( "LMMS-plugin %s does not have a "
 				"plugin-descriptor named %s!\n",
-				f.absoluteFilePath().toAscii().constData(),
-					desc_name.toAscii().constData() );
+				f.absoluteFilePath().toUtf8().constData(),
+					desc_name.toUtf8().constData() );
 			continue;
 		}
 		_plugin_descs.push_back( *plugin_desc );
--- a/src/core/project_journal.cpp
+++ b/src/core/project_journal.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * project_journal.cpp - implementation of project-journal
 *
@@ -171,4 +169,3 @@ void projectJournal::clearJournal( void )



-#endif
--- a/src/core/project_version.cpp
+++ b/src/core/project_version.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * project_version.cpp - compare versions in import upgrades
 *
@@ -82,4 +80,3 @@ int projectVersion::compare( const projectVersion & _v1,



-#endif
--- a/src/core/sample_buffer.cpp
+++ b/src/core/sample_buffer.cpp
@@ -1,10 +1,8 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * sample_buffer.cpp - container-class sampleBuffer
 *
 * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -64,7 +62,6 @@
 #include "templates.h"


-
 sampleBuffer::sampleBuffer( const QString & _audio_file,
 							bool _is_base64_data ) :
 	m_audioFile( ( _is_base64_data == true ) ? "" : _audio_file ),
@@ -178,10 +175,10 @@ void sampleBuffer::update( bool _keep_settings )
 			m_loopEndFrame = m_endFrame = m_frames;
 		}
 	}
-	else if( m_audioFile != "" )
+	else if( !m_audioFile.isEmpty() )
 	{
 		QString file = tryToMakeAbsolute( m_audioFile );
-		char * f = qstrdup( file.toAscii().constData() );
+		char * f = qstrdup( file.toUtf8().constData() );
 		int_sample_t * buf = NULL;
 		ch_cnt_t channels = DEFAULT_CHANNELS;
 		sample_rate_t samplerate = engine::getMixer()->baseSampleRate();
@@ -723,12 +720,12 @@ void sampleBuffer::visualize( QPainter & _p, const QRect & _dr,



-QString sampleBuffer::openAudioFile( void ) const
+QString sampleBuffer::openAudioFile() const
 {
 	QFileDialog ofd( NULL, tr( "Open audio file" ) );

 	QString dir;
-	if( m_audioFile != "" )
+	if( !m_audioFile.isEmpty() )
 	{
 		QString f = m_audioFile;
 		if( QFileInfo( f ).isRelative() )
@@ -768,7 +765,7 @@ QString sampleBuffer::openAudioFile( void ) const
 		//<< tr( "MOD-Files (*.mod)" )
 		;
 	ofd.setFilters( types );
-	if( m_audioFile != "" )
+	if( !m_audioFile.isEmpty() )
 	{
 		// select previously opened file
 		ofd.selectFile( QFileInfo( m_audioFile ).fileName() );
@@ -794,7 +791,7 @@ QString sampleBuffer::openAudioFile( void ) const
 FLAC__StreamEncoderWriteStatus flacStreamEncoderWriteCallback(
 					const FLAC__StreamEncoder *
 								/*_encoder*/,
-					const FLAC__byte _buffer[], 
+					const FLAC__byte _buffer[],
 					unsigned int/* _samples*/,
 					unsigned int _bytes,
 					unsigned int/* _current_frame*/,
@@ -1005,7 +1002,7 @@ FLAC__StreamDecoderWriteStatus flacStreamDecoderWriteCallback(
 		static_cast<flacStreamDecoderClientData *>(
 					_client_data )->write_buffer->write(
 				(const char *) sframe, sizeof( sframe ) );
-	} 
+	}
 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }

@@ -1073,14 +1070,14 @@ void sampleBuffer::loadFromBase64( const QString & _data )
 	orig_data = ba_writer.buffer();
 	printf("%d\n", (int) orig_data.size() );

-	m_origFrames = orig_data.size() / sizeof( sampleFrame ); 
+	m_origFrames = orig_data.size() / sizeof( sampleFrame );
 	delete[] m_origData;
 	m_origData = new sampleFrame[m_origFrames];
 	memcpy( m_origData, orig_data.data(), orig_data.size() );

 #else /* LMMS_HAVE_FLAC_STREAM_DECODER_H */

-	m_origFrames = dsize / sizeof( sampleFrame ); 
+	m_origFrames = dsize / sizeof( sampleFrame );
 	delete[] m_origData;
 	m_origData = new sampleFrame[m_origFrames];
 	memcpy( m_origData, dst, dsize );
@@ -1089,7 +1086,7 @@ void sampleBuffer::loadFromBase64( const QString & _data )

 	delete[] dst;

-	m_audioFile = "";
+	m_audioFile = QString();
 	update();
 }

@@ -1210,4 +1207,4 @@ sampleBuffer::handleState::~handleState()
 #include "moc_sample_buffer.cxx"


-#endif
+/* vim: set tw=0 noexpandtab: */
--- a/src/core/sample_play_handle.cpp
+++ b/src/core/sample_play_handle.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * sample_play_handle.cpp - implementation of class samplePlayHandle
 *
@@ -169,4 +167,3 @@ f_cnt_t samplePlayHandle::totalFrames( void ) const



-#endif
--- a/src/core/sample_record_handle.cpp
+++ b/src/core/sample_record_handle.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * sample_record_handle.cpp - implementation of class sampleRecordHandle
 *
@@ -154,4 +152,3 @@ void sampleRecordHandle::writeBuffer( const sampleFrame * _ab,



-#endif
--- a/src/core/surround_area.cpp
+++ b/src/core/surround_area.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * surround_area.cpp - a widget for setting position of a channel +
 *                     calculation of volume for each speaker
@@ -285,4 +283,3 @@ automationPattern * surroundAreaModel::automationPatternY( void )
 #include "moc_surround_area.cxx"


-#endif
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * timeline.cpp - class timeLine, representing a time-line with position marker
 *
@@ -380,4 +378,3 @@ void timeLine::mouseReleaseEvent( QMouseEvent * _me )
 #include "moc_timeline.cxx"


-#endif
--- a/src/core/tool.cpp
+++ b/src/core/tool.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * tool.cpp - base class for all tool plugins (graphs, extensions, etc)
 *
@@ -82,4 +80,3 @@ toolView::toolView( tool * _tool ) :
 }


-#endif
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * track.cpp - implementation of classes concerning tracks -> neccessary for
 *             all track-like objects (beat/bassline, sample-track...)
@@ -2442,4 +2440,3 @@ void trackView::createTCOView( trackContentObject * _tco )
 #include "moc_track.cxx"


-#endif
--- a/src/gui/automation_editor.cpp
+++ b/src/gui/automation_editor.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * automation_editor.cpp - implementation of automationEditor which is used for
 *                         actual setting of dynamic values
@@ -2164,4 +2162,3 @@ void automationEditor::update( void )
 #include "moc_automation_editor.cxx"


-#endif
--- a/src/gui/controller_connection_dialog.cpp
+++ b/src/gui/controller_connection_dialog.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * controller_connection_dialog.cpp - dialog allowing the user to create and
 *	modify links between controllers and models
@@ -433,4 +431,3 @@ void controllerConnectionDialog::enableAutoDetect( QAction * _a )

 #include "moc_controller_connection_dialog.cxx"

-#endif
--- a/src/gui/controller_dialog.cpp
+++ b/src/gui/controller_dialog.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * controller_dialog.cpp - per-controller-specific view for changing a
 * controller's settings
@@ -55,4 +53,3 @@ void controllerDialog::closeEvent( QCloseEvent * _ce )

 #include "moc_controller_dialog.cxx"

-#endif
--- a/src/gui/effect_control_dialog.cpp
+++ b/src/gui/effect_control_dialog.cpp
@@ -1,11 +1,9 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * effect_control_dialog.cpp - base-class for effect-dialogs for displaying
 *                            and editing control port values
 *
- * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -25,7 +23,6 @@
 *
 */

-
 #include <QtGui/QMessageBox>
 #include <QtGui/QCloseEvent>

@@ -56,13 +53,10 @@ effectControlDialog::~effectControlDialog()
 void effectControlDialog::closeEvent( QCloseEvent * _ce )
 {
 	_ce->ignore();
-	emit( closed() );
+	emit closed();
 }



-
 #include "moc_effect_control_dialog.cxx"

-#endif
-
--- a/src/gui/effect_select_dialog.cpp
+++ b/src/gui/effect_select_dialog.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * effect_select_dialog.cpp - dialog to choose effect plugin
 *
@@ -316,4 +314,3 @@ void effectListWidget::updateSelection( void )

 #include "moc_effect_select_dialog.cxx"

-#endif
--- a/src/gui/embed.cpp
+++ b/src/gui/embed.cpp
@@ -1,10 +1,8 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * embed.cpp - misc stuff for using embedded resources (linked into binary)
 *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -70,7 +68,7 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h )
 		if( p.isNull() )
 		{
 			const embed::descriptor & e = findEmbeddedData(
-						name.toAscii().constData() );
+									name.toUtf8().constData() );
 			// found?
 			if( QString( e.name ) == name )
 			{
@@ -100,4 +98,3 @@ QString getText( const char * _name )
 }


-#endif
--- a/src/gui/export_project_dialog.cpp
+++ b/src/gui/export_project_dialog.cpp
@@ -1,10 +1,8 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * export_project_dialog.cpp - implementation of dialog for exporting project
 *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -24,11 +22,9 @@
 *
 */

-
 #include <QtCore/QFileInfo>
 #include <QtGui/QMessageBox>

-
 #include "export_project_dialog.h"
 #include "engine.h"
 #include "main_window.h"
@@ -71,7 +67,7 @@ exportProjectDialog::~exportProjectDialog()



-void exportProjectDialog::reject( void )
+void exportProjectDialog::reject()
 {
 	if( m_renderer == NULL )
 	{
@@ -98,7 +94,7 @@ void exportProjectDialog::closeEvent( QCloseEvent * _ce )



-void exportProjectDialog::startBtnClicked( void )
+void exportProjectDialog::startBtnClicked()
 {
 	projectRenderer::ExportFileFormats ft = projectRenderer::NumFileFormats;

@@ -177,4 +173,4 @@ void exportProjectDialog::updateTitleBar( int _prog )
 #include "moc_export_project_dialog.cxx"


-#endif
+/* vim: set tw=0 noexpandtab: */
--- a/src/gui/lfo_controller_dialog.cpp
+++ b/src/gui/lfo_controller_dialog.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * lfo_controller_dialog.cpp - per-controller-specific view for changing a
 * controller's settings
@@ -313,4 +311,3 @@ void lfoControllerDialog::modelChanged( void )
 }


-#endif
--- a/src/gui/peak_controller_dialog.cpp
+++ b/src/gui/peak_controller_dialog.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * lfo_controller_dialog.cpp - per-controller-specific view for changing a
 * controller's settings
@@ -110,4 +108,3 @@ void peakControllerDialog::modelChanged( void )
 }


-#endif
--- a/src/gui/plugin_browser.cpp
+++ b/src/gui/plugin_browser.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * plugin_browser.cpp - implementation of the plugin-browser
 *
@@ -225,4 +223,3 @@ void pluginDescWidget::updateHeight( void )
 #include "moc_plugin_browser.cxx"


-#endif
--- a/src/gui/song_editor.cpp
+++ b/src/gui/song_editor.cpp
@@ -1,10 +1,8 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * song_editor.cpp - basic window for song-editing
 *
 * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -24,7 +22,6 @@
 *
 */

-
 #include <QtGui/QAction>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QKeyEvent>
@@ -713,4 +710,4 @@ bool songEditor::allowRubberband( void ) const
 #include "moc_song_editor.cxx"


-#endif
+/* vim: set tw=0 noexpandtab: */
--- a/src/gui/string_pair_drag.cpp
+++ b/src/gui/string_pair_drag.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * string_pair_drag.cpp - class stringPairDrag which provides general support
 *                        for drag'n'drop of string-pairs and which is the base
@@ -111,4 +109,3 @@ QString stringPairDrag::decodeValue( QDropEvent * _de )
 }


-#endif
--- a/src/gui/widgets/automatable_button.cpp
+++ b/src/gui/widgets/automatable_button.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * automatable_button.cpp - implementation of class automatableButton and
 *                          automatableButtonGroup
@@ -258,4 +256,3 @@ void automatableButtonGroup::updateButtons( void )

 #include "moc_automatable_button.cxx"

-#endif
--- a/src/gui/widgets/automatable_slider.cpp
+++ b/src/gui/widgets/automatable_slider.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * automatable_slider.cpp - implementation of class automatableSlider
 *
@@ -149,4 +147,3 @@ void automatableSlider::updateSlider( void )

 #include "moc_automatable_slider.cxx"

-#endif
--- a/src/gui/widgets/caption_menu.cpp
+++ b/src/gui/widgets/caption_menu.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * caption_menu.cpp - context menu with a caption
 *
@@ -50,4 +48,3 @@ captionMenu::~captionMenu()
 #include "moc_caption_menu.cxx"


-#endif
--- a/src/gui/widgets/combobox.cpp
+++ b/src/gui/widgets/combobox.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * combobox.cpp - implementation of LMMS-combobox
 *
@@ -249,4 +247,3 @@ void comboBox::setItem( QAction * _item )
 #include "moc_combobox.cxx"


-#endif
--- a/src/gui/widgets/controller_rack_view.cpp
+++ b/src/gui/widgets/controller_rack_view.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * controller_rack_view.cpp - view for song's controllers
 *
@@ -183,4 +181,3 @@ void controllerRackView::addController( void )

 #include "moc_controller_rack_view.cxx"

-#endif
--- a/src/gui/widgets/controller_view.cpp
+++ b/src/gui/widgets/controller_view.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * controller_view.cpp - view-component for an controller
 *
@@ -214,4 +212,3 @@ void controllerView::displayHelp( void )

 #include "moc_controller_view.cxx"

-#endif
--- a/src/gui/widgets/cpuload_widget.cpp
+++ b/src/gui/widgets/cpuload_widget.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * cpuload_widget.cpp - widget for displaying CPU-load (partly based on
 *                      Hydrogen's CPU-load-widget)
@@ -106,4 +104,3 @@ void cpuloadWidget::updateCpuLoad()
 #include "moc_cpuload_widget.cxx"


-#endif
--- a/src/gui/widgets/effect_rack_view.cpp
+++ b/src/gui/widgets/effect_rack_view.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * effect_rack_view.cpp - view for effectChain-model
 *
@@ -259,4 +257,3 @@ void effectRackView::modelChanged( void )

 #include "moc_effect_rack_view.cxx"

-#endif
--- a/src/gui/widgets/envelope_and_lfo_view.cpp
+++ b/src/gui/widgets/envelope_and_lfo_view.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * envelope_and_lfo_view.cpp - widget which is m_used by envelope/lfo/filter-
 *                               tab of channel-window
@@ -584,4 +582,3 @@ void envelopeAndLFOView::lfoUserWaveChanged( void )
 #include "moc_envelope_and_lfo_view.cxx"


-#endif
--- a/src/gui/widgets/fade_button.cpp
+++ b/src/gui/widgets/fade_button.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * fade_button.cpp - implementation of fade-button
 *
@@ -123,4 +121,3 @@ void fadeButton::signalUpdate( void )
 #include "moc_fade_button.cxx"


-#endif
--- a/src/gui/widgets/group_box.cpp
+++ b/src/gui/widgets/group_box.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * group_box.cpp - groupbox for LMMS
 *
@@ -147,4 +145,3 @@ void groupBox::updatePixmap( void )
 #include "moc_group_box.cxx"


-#endif
--- a/src/gui/widgets/instrument_function_views.cpp
+++ b/src/gui/widgets/instrument_function_views.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * instrument_function_views.cpp - view for instrument-functions-tab
 *
@@ -206,4 +204,3 @@ void arpeggiatorView::modelChanged( void )

 #include "moc_instrument_function_views.cxx"

-#endif
--- a/src/gui/widgets/instrument_sound_shaping_view.cpp
+++ b/src/gui/widgets/instrument_sound_shaping_view.cpp
@@ -76,7 +76,7 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) :
 		m_envLFOViews[i] = new envelopeAndLFOView( m_targetsTabWidget );
 		m_targetsTabWidget->addTab( m_envLFOViews[i],
 						tr( __targetNames[i][0]
-						.toAscii().constData() ) );
+						.toUtf8().constData() ) );
 	}


--- a/src/gui/widgets/kmultitabbar.cpp
+++ b/src/gui/widgets/kmultitabbar.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * kmultitabbar.cpp - widget for horizontal and vertical tabs
 *
@@ -917,4 +915,3 @@ QList<KMultiTabBarButton *>* KMultiTabBar::buttons() {return &m_buttons;}



-#endif
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -1,9 +1,7 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * knob.cpp - powerful knob-widget
 *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -81,7 +79,7 @@ knob::knob( int _knob_num, QWidget * _parent, const QString & _name ) :
 	if( m_knobNum != knobStyled )
 	{
 		m_knobPixmap = new QPixmap( embed::getIconPixmap( QString( "knob0" +
-			QString::number( m_knobNum + 1 ) ).toAscii().constData() ) );
+			QString::number( m_knobNum + 1 ) ).toUtf8().constData() ) );

 		setFixedSize( m_knobPixmap->width(), m_knobPixmap->height() );
 	}
@@ -669,5 +667,3 @@ void knob::displayHelp( void )

 #include "moc_knob.cxx"

-
-#endif
--- a/src/gui/widgets/lcd_spinbox.cpp
+++ b/src/gui/widgets/lcd_spinbox.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * lcd_spinbox.cpp - class lcdSpinBox, an improved QLCDNumber
 *
@@ -83,7 +81,7 @@ lcdSpinBox::lcdSpinBox( int _num_digits, const QString & _lcd_style,

 	// We should make a factory for these or something.
 	m_lcdPixmap = new QPixmap( embed::getIconPixmap( QString( "lcd_" +
-			_lcd_style ).toAscii().constData() ) );
+			_lcd_style ).toUtf8().constData() ) );

 	m_cellWidth = m_lcdPixmap->size().width() / lcdSpinBox::charsPerPixmap;
 	m_cellHeight = m_lcdPixmap->size().height() / 2;
@@ -341,5 +339,3 @@ void lcdSpinBox::wheelEvent( QWheelEvent * _we )

 #include "moc_lcd_spinbox.cxx"

-
-#endif
--- a/src/gui/widgets/led_checkbox.cpp
+++ b/src/gui/widgets/led_checkbox.cpp
@@ -1,10 +1,8 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * led_checkbox.cpp - class ledCheckBox, an improved QCheckBox
 *
- * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
 * This program is free software; you can redistribute it and/or
@@ -52,7 +50,7 @@ ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent,
 		_color = Yellow;
 	}
 	m_ledOnPixmap = new QPixmap( embed::getIconPixmap(
-					names[_color].toAscii().constData() ) );
+					names[_color].toUtf8().constData() ) );
 	m_ledOffPixmap = new QPixmap( embed::getIconPixmap( "led_off" ) );

 	setFont( pointSize<7>( font() ) );
@@ -97,4 +95,3 @@ void ledCheckBox::paintEvent( QPaintEvent * )

 #include "moc_led_checkbox.cxx"

-#endif
--- a/src/gui/widgets/nstate_button.cpp
+++ b/src/gui/widgets/nstate_button.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * nstate_button.cpp - implementation of n-state-button
 *
@@ -105,4 +103,3 @@ void nStateButton::mousePressEvent( QMouseEvent * _me )
 #include "moc_nstate_button.cxx"


-#endif
--- a/src/gui/widgets/pixmap_button.cpp
+++ b/src/gui/widgets/pixmap_button.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * pixmap_button.cpp - implementation of pixmap-button (often used as "themed"
 *                     checkboxes/radiobuttons etc)
@@ -138,4 +136,3 @@ void pixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update )
 #include "moc_pixmap_button.cxx"


-#endif
--- a/src/gui/widgets/project_notes.cpp
+++ b/src/gui/widgets/project_notes.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * project_notes.cpp - implementation of project-notes-editor
 *
@@ -399,4 +397,3 @@ void projectNotes::loadSettings( const QDomElement & _this )
 #include "moc_project_notes.cxx"


-#endif
--- a/src/gui/widgets/rubberband.cpp
+++ b/src/gui/widgets/rubberband.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * rubberband.cpp - rubberband - either own implementation for Qt3 or wrapper
 *                               for Qt4
@@ -107,4 +105,3 @@ QVector<selectableObject *> rubberBand::selectableObjects( void ) const
 #include "moc_rubberband.cxx"


-#endif
--- a/src/gui/widgets/tab_bar.cpp
+++ b/src/gui/widgets/tab_bar.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * tab_bar.cpp - implementation of tab-bar
 *
@@ -248,4 +246,3 @@ bool tabBar::allHidden( void )
 #include "moc_tab_button.cxx"


-#endif
--- a/src/gui/widgets/tab_widget.cpp
+++ b/src/gui/widgets/tab_widget.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * tab_widget.cpp - tabwidget for LMMS
 *
@@ -234,4 +232,3 @@ void tabWidget::wheelEvent( QWheelEvent * _we )
 #include "moc_tab_widget.cxx"


-#endif
--- a/src/gui/widgets/tempo_sync_knob.cpp
+++ b/src/gui/widgets/tempo_sync_knob.cpp
@@ -1,5 +1,3 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
 * tempo_sync_knob.cpp - adds bpm to ms conversion for knob class
 *
@@ -491,4 +489,3 @@ void tempoSyncKnob::showCustom( void )
 #include "moc_tempo_sync_knob.cxx"


-#endif
--- a/Show More
+++ b/Show More