Added initial Qt5 support

LMMS now properly builds and runs with Qt5. Various deprecated functions
had to be replaced like QString::toAscii()/fromAscii(). Also occurences
of FALSE/TRUE have been replaced with false/true.

LmmsStyle now derives from QProxyStyle and sets a style instance as base
style (Plastique for Qt4, Fusion for Qt5).

MOC files are not included anymore but added as regular source files.

What's missing is support for embedding VST plugins into a subwindow
inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5.

Build instructions can be found in INSTALL.Qt5

Minimum version requirement for Qt4 has been raised to 4.6.0 for best
API compatibility between Qt4 and Qt5.

src/core/AutomatableModel.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "AutomatableModel.h"
 #include "AutomationPattern.h"
@@ -715,5 +715,5 @@ float AutomatableModel::globalAutomationValueAt( const MidiTime& time )
 }
 
 
-#include "moc_AutomatableModel.cxx"
+
 

src/core/AutomationPattern.cpp

@@ -24,9 +24,9 @@
  *
  */
 
-#include <QtXml/QDomElement>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
+#include <QDomElement>
+#include <QMouseEvent>
+#include <QPainter>
 
 #include "AutomationPattern.h"
 #include "AutomationPatternView.h"
@@ -783,4 +783,4 @@ void AutomationPattern::generateTangents( timeMap::const_iterator it,
 
 
 
-#include "moc_AutomationPattern.cxx"
+

src/core/ComboBoxModel.cpp

@@ -66,5 +66,5 @@ int ComboBoxModel::findText( const QString& txt ) const
 
 
 
-#include "moc_ComboBoxModel.cxx"
+
 

src/core/Controller.cpp

@@ -24,9 +24,9 @@
  *
  */
 
-#include <QtXml/QDomElement>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QDomElement>
+#include <QObject>
+#include <QVector>
 
 
 #include "song.h"
@@ -346,6 +346,6 @@ int Controller::connectionCount() const{
 
 
 
-#include "moc_Controller.cxx"
+
 
 

src/core/ControllerConnection.cpp

@@ -24,9 +24,9 @@
  *
  */
 
-#include <QtXml/QDomElement>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QDomElement>
+#include <QObject>
+#include <QVector>
 
 
 #include "song.h"
@@ -222,5 +222,5 @@ void ControllerConnection::deleteConnection()
 }
 
 
-#include "moc_ControllerConnection.cxx"
+
 

src/core/DataFile.cpp

@@ -28,11 +28,11 @@
 
 #include <math.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtGui/QMessageBox>
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QMessageBox>
 
 
 #include "config_mgr.h"

src/core/Effect.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "Effect.h"
 #include "engine.h"

src/core/EffectChain.cpp

@@ -24,7 +24,7 @@
  */
 
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "EffectChain.h"
 #include "Effect.h"
@@ -255,5 +255,5 @@ void EffectChain::clear()
 
 
 
-#include "moc_EffectChain.cxx"
+
 

src/core/EnvelopeAndLfoParameters.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "EnvelopeAndLfoParameters.h"
 #include "debug.h"
@@ -530,6 +530,6 @@ void EnvelopeAndLfoParameters::updateSampleVars()
 
 
 
-#include "moc_EnvelopeAndLfoParameters.cxx"
+
 
 

src/core/FxMixer.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "FxMixer.h"
 #include "MixerWorkerThread.h"

src/core/ImportFilter.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 #include "ImportFilter.h"
 #include "engine.h"

src/core/InlineAutomation.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "InlineAutomation.h"
 

src/core/InstrumentFunctions.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "InstrumentFunctions.h"
 #include "embed.h"
@@ -523,4 +523,4 @@ void InstrumentFunctionArpeggio::loadSettings( const QDomElement & _this )
 }
 
 
-#include "moc_InstrumentFunctions.cxx"
+

src/core/InstrumentSoundShaping.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "InstrumentSoundShaping.h"
 #include "basic_filters.h"
@@ -384,5 +384,5 @@ void InstrumentSoundShaping::loadSettings( const QDomElement & _this )
 
 
 
-#include "moc_InstrumentSoundShaping.cxx"
+
 

src/core/JournallingObject.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include <cstdio>
 

src/core/LadspaControl.cpp

@@ -320,4 +320,4 @@ void LadspaControl::setLink( bool _state )
 
 
 
-#include "moc_LadspaControl.cxx"
+

src/core/LfoController.cpp

@@ -24,9 +24,9 @@
  */
 
 #include <math.h>
-#include <QtXml/QDomElement>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QDomElement>
+#include <QObject>
+#include <QVector>
 
 
 #include "song.h"
@@ -229,6 +229,6 @@ ControllerDialog * LfoController::createDialog( QWidget * _parent )
 }
 
 
-#include "moc_LfoController.cxx"
+
 
 

src/core/MeterModel.cpp

@@ -79,5 +79,5 @@ void MeterModel::loadSettings( const QDomElement & _this,
 
 
 
-#include "moc_MeterModel.cxx"
+
 

src/core/Mixer.cpp

@@ -947,5 +947,5 @@ void Mixer::fifoWriter::run()
 
 
 
-#include "moc_Mixer.cxx"
+
 

src/core/Model.cpp

@@ -46,5 +46,5 @@ QString Model::fullDisplayName() const
 
 
 
-#include "moc_Model.cxx"
+
 

src/core/PeakController.cpp

@@ -24,9 +24,9 @@
  */
 
 #include <cstdio>
-#include <QtXml/QDomElement>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QDomElement>
+#include <QObject>
+#include <QVector>
 #include <QMessageBox>
 
 
@@ -252,5 +252,5 @@ ControllerDialog * PeakController::createDialog( QWidget * _parent )
 }
 
 
-#include "moc_PeakController.cxx"
+
 

src/core/Piano.cpp

@@ -126,5 +126,5 @@ void Piano::handleKeyRelease( int key )
 
 
 
-#include "moc_Piano.cxx"
+
 

src/core/Plugin.cpp

@@ -24,9 +24,9 @@
  *
  */
 
-#include <QtCore/QDir>
-#include <QtCore/QLibrary>
-#include <QtGui/QMessageBox>
+#include <QDir>
+#include <QLibrary>
+#include <QMessageBox>
 
 #include "Plugin.h"
 #include "embed.h"

src/core/PresetPreviewPlayHandle.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QMutexLocker>
+#include <QFileInfo>
+#include <QMutexLocker>
 
 #include "PresetPreviewPlayHandle.h"
 #include "debug.h"
@@ -47,9 +47,9 @@ public:
 		m_previewNote( NULL ),
 		m_dataMutex()
 	{
-		setJournalling( FALSE );
+		setJournalling( false );
 		m_previewInstrumentTrack = dynamic_cast<InstrumentTrack *>( track::create( track::InstrumentTrack, this ) );
-		m_previewInstrumentTrack->setJournalling( FALSE );
+		m_previewInstrumentTrack->setJournalling( false );
 	}
 
 	virtual ~PreviewTrackContainer()
@@ -124,7 +124,7 @@ PresetPreviewPlayHandle::PresetPreviewPlayHandle( const QString & _preset_file,
 
 
 	const bool j = engine::projectJournal()->isJournalling();
-	engine::projectJournal()->setJournalling( FALSE );
+	engine::projectJournal()->setJournalling( false );
 
 	engine::setSuppressMessages( true );
 

src/core/ProjectRenderer.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "ProjectRenderer.h"
 #include "song.h"
@@ -228,5 +228,5 @@ void ProjectRenderer::updateConsoleProgress()
 
 
 
-#include "moc_ProjectRenderer.cxx"
+
 

src/core/RemotePlugin.cpp

@@ -25,7 +25,7 @@
 #define COMPILE_REMOTE_PLUGIN_BASE
 //#define DEBUG_REMOTE_PLUGIN
 #ifdef DEBUG_REMOTE_PLUGIN
-#include <QtCore/QDebug>
+#include <QDebug>
 #endif
 
 #include "RemotePlugin.h"
@@ -33,7 +33,7 @@
 #include "engine.h"
 #include "config_mgr.h"
 
-#include <QtCore/QDir>
+#include <QDir>
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
@@ -395,5 +395,5 @@ bool RemotePlugin::processMessage( const message & _m )
 
 
 
-#include "moc_RemotePlugin.cxx"
+
 

src/core/RingBuffer.cpp

@@ -321,4 +321,4 @@ void RingBuffer::updateSamplerate()
 	unlock();
 }
 
-#include "moc_RingBuffer.cxx"
+

src/core/SampleBuffer.cpp

@@ -26,11 +26,11 @@
 #include "SampleBuffer.h"
 
 
-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPainter>
+#include <QBuffer>
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QPainter>
 
 
 #include <cstring>
@@ -991,7 +991,7 @@ QString SampleBuffer::openAudioFile() const
 		<< tr( "RAW-Files (*.raw)" )
 		//<< tr( "MOD-Files (*.mod)" )
 		;
-	ofd.setFilters( types );
+	ofd.setNameFilters( types );
 	if( !m_audioFile.isEmpty() )
 	{
 		// select previously opened file
@@ -1468,7 +1468,7 @@ SampleBuffer::handleState::~handleState()
 
 
 
-#include "moc_SampleBuffer.cxx"
+
 
 
 /* vim: set tw=0 noexpandtab: */

src/core/SerializingObject.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "SerializingObject.h"
 

src/core/TempoSyncKnobModel.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include <QtGui/QAction>
-#include <QtXml/QDomElement>
+#include <QAction>
+#include <QDomElement>
 
 #include "TempoSyncKnobModel.h"
 #include "engine.h"
@@ -181,6 +181,6 @@ void TempoSyncKnobModel::updateCustom()
 
 
 
-#include "moc_TempoSyncKnobModel.cxx"
+
 
 

src/core/TrackContainer.cpp

@@ -24,9 +24,9 @@
  */
 
 
-#include <QtGui/QApplication>
-#include <QtGui/QProgressDialog>
-#include <QtXml/QDomElement>
+#include <QApplication>
+#include <QProgressDialog>
+#include <QDomElement>
 
 #include "TrackContainer.h"
 #include "InstrumentTrack.h"
@@ -241,5 +241,5 @@ DummyTrackContainer::DummyTrackContainer() :
 
 
 
-#include "moc_TrackContainer.cxx"
+
 

src/core/VstSyncController.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "config_mgr.h"
 #include "engine.h"
@@ -196,5 +196,5 @@ void VstSyncController::updateSampleRate()
 
 
 
-#include "moc_VstSyncController.cxx"
+
 

src/core/audio/AudioAlsa.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QLineEdit>
-#include <QtGui/QLabel>
+#include <QLineEdit>
+#include <QLabel>
 
 #include "AudioAlsa.h"
 
@@ -53,7 +53,7 @@ AudioAlsa::AudioAlsa( bool & _success_ful, Mixer*  _mixer ) :
 	int err;
 
 	if( ( err = snd_pcm_open( &m_handle,
-					probeDevice().toAscii().constData(),
+					probeDevice().toLatin1().constData(),
 						SND_PCM_STREAM_PLAYBACK,
 						0 ) ) < 0 )
 	{
@@ -208,7 +208,7 @@ void AudioAlsa::applyQualitySettings()
 
 		int err;
 		if( ( err = snd_pcm_open( &m_handle,
-					probeDevice().toAscii().constData(),
+					probeDevice().toLatin1().constData(),
 						SND_PCM_STREAM_PLAYBACK,
 								0 ) ) < 0 )
 		{

src/core/audio/AudioFileDevice.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 #include "AudioFileDevice.h"
 #include "export_project_dialog.h"

src/core/audio/AudioJack.cpp

@@ -26,9 +26,9 @@
 
 #ifdef LMMS_HAVE_JACK
 
-#include <QtGui/QLineEdit>
-#include <QtGui/QLabel>
-#include <QtGui/QMessageBox>
+#include <QLineEdit>
+#include <QLabel>
+#include <QMessageBox>
 
 #include <stdlib.h>
 
@@ -140,7 +140,7 @@ bool AudioJack::initJackClient()
 
 	const char * serverName = NULL;
 	jack_status_t status;
-	m_client = jack_client_open( clientName.toAscii().constData(),
+	m_client = jack_client_open( clientName.toLatin1().constData(),
 						JackNullOption, &status,
 								serverName );
 	if( m_client == NULL )
@@ -156,7 +156,7 @@ bool AudioJack::initJackClient()
 	{
 		printf( "there's already a client with name '%s', so unique "
 			"name '%s' was assigned\n", clientName.
-							toAscii().constData(),
+							toLatin1().constData(),
 					jack_get_client_name( m_client ) );
 	}
 
@@ -179,7 +179,7 @@ bool AudioJack::initJackClient()
 				( ( ch % 2 ) ? "R" : "L" ) +
 				QString::number( ch / 2 + 1 );
 		m_outputPorts.push_back( jack_port_register( m_client,
-						name.toAscii().constData(),
+						name.toLatin1().constData(),
 						JACK_DEFAULT_AUDIO_TYPE,
 						JackPortIsOutput, 0 ) );
 		if( m_outputPorts.back() == NULL )
@@ -284,7 +284,7 @@ void AudioJack::registerPort( AudioPort * _port )
 	for( ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch )
 	{
 		m_portMap[_port].ports[ch] = jack_port_register( m_client,
-						name[ch].toAscii().constData(),
+						name[ch].toLatin1().constData(),
 						JACK_DEFAULT_AUDIO_TYPE,
 							JackPortIsOutput, 0 );
 	}
@@ -325,7 +325,7 @@ void AudioJack::renamePort( AudioPort * _port )
 		for( ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch )
 		{
 			jack_port_set_name( m_portMap[_port].ports[ch],
-					name[ch].toAscii().constData() );
+					name[ch].toLatin1().constData() );
 		}
 	}
 #endif
@@ -479,7 +479,7 @@ void AudioJack::setupWidget::saveSettings()
 
 
 
-#include "moc_AudioJack.cxx"
+
 
 #endif
 

src/core/audio/AudioOss.cpp

@@ -26,9 +26,9 @@
 
 #ifdef LMMS_HAVE_OSS
 
-#include <QtCore/QFileInfo>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QFileInfo>
+#include <QLabel>
+#include <QLineEdit>
 
 #include "endian_handling.h"
 #include "LcdSpinBox.h"
@@ -80,7 +80,7 @@ AudioOss::AudioOss( bool & _success_ful, Mixer*  _mixer ) :
 {
 	_success_ful = false;
 
-	m_audioFD = open( probeDevice().toAscii().constData(), O_WRONLY, 0 );
+	m_audioFD = open( probeDevice().toLatin1().constData(), O_WRONLY, 0 );
 
 	if( m_audioFD == -1 )
 	{

src/core/audio/AudioPortAudio.cpp

@@ -38,8 +38,8 @@ void AudioPortAudioSetupUtil::updateChannels()
 
 #ifdef LMMS_HAVE_PORTAUDIO
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 #include "engine.h"
 #include "debug.h"
@@ -487,5 +487,5 @@ void AudioPortAudio::setupWidget::saveSettings()
 
 #endif
 
-#include "moc_AudioPortAudio.cxx"
+
 

src/core/audio/AudioPulseAudio.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QLineEdit>
-#include <QtGui/QLabel>
+#include <QLineEdit>
+#include <QLabel>
 
 #include "AudioPulseAudio.h"
 

src/core/audio/AudioSdl.cpp

@@ -26,8 +26,8 @@
 
 #ifdef LMMS_HAVE_SDL
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 #include "engine.h"
 #include "debug.h"

src/core/base64.cpp

@@ -28,8 +28,8 @@
 #include "base64.h"
 #include "lmms_basics.h"
 
-#include <QtCore/QBuffer>
-#include <QtCore/QVariant>
+#include <QBuffer>
+#include <QVariant>
 
 namespace base64
 {

src/core/bb_track_container.cpp

@@ -262,5 +262,5 @@ void bbTrackContainer::createTCOsForBB( int _bb )
 
 
 
-#include "moc_bb_track_container.cxx"
+
 

src/core/config_mgr.cpp

@@ -22,11 +22,11 @@
  *
  */
 
-#include <QtXml/QDomElement>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtGui/QMessageBox>
-#include <QtGui/QApplication>
+#include <QDomElement>
+#include <QDir>
+#include <QFile>
+#include <QMessageBox>
+#include <QApplication>
 
 #include "lmmsversion.h"
 #include "config_mgr.h"
@@ -210,7 +210,7 @@ void configManager::setValue( const QString & _class,
 
 
 #ifdef LMMS_BUILD_WIN32
-#include <QtCore/QLibrary>
+#include <QLibrary>
 #include <shlobj.h>
 
 // taken from qt-win-opensource-src-4.2.2/src/corelib/io/qsettings.cpp

src/core/ladspa_manager.cpp

@@ -24,11 +24,11 @@
  *
  */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLibrary>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QLibrary>
 
 #include <math.h>
 

src/core/main.cpp

@@ -27,18 +27,18 @@
 #include "lmmsversion.h"
 #include "versioninfo.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLocale>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtCore/QTranslator>
-#include <QtGui/QApplication>
-#include <QtGui/QBitmap>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPainter>
-#include <QtGui/QSplashScreen>
+#include <QDir>
+#include <QFileInfo>
+#include <QLocale>
+#include <QProcess>
+#include <QTimer>
+#include <QTranslator>
+#include <QApplication>
+#include <QBitmap>
+#include <QDesktopWidget>
+#include <QMessageBox>
+#include <QPainter>
+#include <QSplashScreen>
 
 #ifdef LMMS_HAVE_SCHED_H
 #include <sched.h>

src/core/midi/MidiAlsaRaw.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 #include "MidiAlsaRaw.h"
 #include "config_mgr.h"
@@ -41,7 +41,7 @@ MidiAlsaRaw::MidiAlsaRaw() :
 {
 	int err;
 	if( ( err = snd_rawmidi_open( m_inputp, m_outputp,
-					probeDevice().toAscii().constData(),
+					probeDevice().toLatin1().constData(),
 								0 ) ) < 0 )
 	{
 		printf( "cannot open MIDI-device: %s\n", snd_strerror( err ) );

src/core/midi/MidiAlsaSeq.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 #include "MidiAlsaSeq.h"
 #include "config_mgr.h"
@@ -82,7 +82,7 @@ MidiAlsaSeq::MidiAlsaSeq() :
 {
 	int err;
 	if( ( err = snd_seq_open( &m_seqHandle,
-					probeDevice().toAscii().constData(),
+					probeDevice().toLatin1().constData(),
 						SND_SEQ_OPEN_DUPLEX, 0 ) ) < 0 )
 	{
 		fprintf( stderr, "cannot open sequencer: %s\n",
@@ -378,7 +378,7 @@ void MidiAlsaSeq::subscribeReadablePort( MidiPort * _port,
 
 	snd_seq_addr_t sender;
 	if( snd_seq_parse_address( m_seqHandle, &sender,
-			_dest.section( ' ', 0, 0 ).toAscii().constData() ) )
+			_dest.section( ' ', 0, 0 ).toLatin1().constData() ) )
 	{
 		fprintf( stderr, "error parsing sender-address!\n" );
 
@@ -429,7 +429,7 @@ void MidiAlsaSeq::subscribeWritablePort( MidiPort * _port,
 
 	snd_seq_addr_t dest;
 	if( snd_seq_parse_address( m_seqHandle, &dest,
-			_dest.section( ' ', 0, 0 ).toAscii().constData() ) )
+			_dest.section( ' ', 0, 0 ).toLatin1().constData() ) )
 	{
 		fprintf( stderr, "error parsing dest-address!\n" );
 		m_seqMutex.unlock();
@@ -735,7 +735,7 @@ void MidiAlsaSeq::setupWidget::saveSettings()
 }
 
 
-#include "moc_MidiAlsaSeq.cxx"
+
 
 
 #endif

src/core/midi/MidiController.cpp

@@ -23,9 +23,9 @@
  *
  */
 
-#include <QtXml/QDomElement>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QDomElement>
+#include <QObject>
+#include <QVector>
 
 #include "song.h"
 #include "engine.h"
@@ -157,5 +157,5 @@ ControllerDialog * MidiController::createDialog( QWidget * _parent )
 }
 
 
-#include "moc_MidiController.cxx"
+
 

src/core/midi/MidiOss.cpp

@@ -28,8 +28,8 @@
 #ifdef LMMS_HAVE_OSS
 
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 
 #ifdef LMMS_HAVE_STDLIB_H

src/core/midi/MidiPort.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "MidiPort.h"
 #include "MidiClient.h"
@@ -405,5 +405,5 @@ void MidiPort::updateOutputProgram()
 
 
 
-#include "moc_MidiPort.cxx"
+
 

src/core/midi/MidiWinMM.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 #include "MidiWinMM.h"
 #include "config_mgr.h"
@@ -147,7 +147,7 @@ void MidiWinMM::subscribeReadablePort( MidiPort* port, const QString& dest, bool
 {
 	if( subscribe && port->isInputEnabled() == false )
 	{
-		qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toAscii().constData() );
+		qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toLatin1().constData() );
 		return;
 	}
 
@@ -165,7 +165,7 @@ void MidiWinMM::subscribeWritablePort( MidiPort* port, const QString& dest, bool
 {
 	if( subscribe && port->isOutputEnabled() == false )
 	{
-		qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toAscii().constData() );
+		qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toLatin1().constData() );
 		return;
 	}
 
@@ -324,7 +324,7 @@ MidiWinMM::setupWidget::~setupWidget()
 
 
 
-#include "moc_MidiWinMM.cxx"
+
 
 
 #endif

src/core/note.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include <math.h>
 

src/core/song.cpp

@@ -22,10 +22,10 @@
  *
  */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtGui/QMessageBox>
+#include <QCoreApplication>
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
 #include <QApplication>
 
 #include <math.h>
@@ -1182,7 +1182,7 @@ void song::exportProject(bool multiExport)
 			types << tr( __fileEncodeDevices[idx].m_description );
 			++idx;
 		}
-		efd.setFilters( types );
+		efd.setNameFilters( types );
 		QString base_filename;
 		if( !m_fileName.isEmpty() )
 		{
@@ -1282,6 +1282,6 @@ void song::removeController( Controller * _controller )
 }
 
 
-#include "moc_song.cxx"
+
 
 

src/core/timeline.cpp

@@ -23,12 +23,12 @@
  */
 
 
-#include <QtXml/QDomElement>
-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
+#include <QDomElement>
+#include <QTimer>
+#include <QApplication>
+#include <QLayout>
+#include <QMouseEvent>
+#include <QPainter>
 
 
 #include "timeline.h"
@@ -391,6 +391,6 @@ void timeLine::mouseReleaseEvent( QMouseEvent* event )
 
 
 
-#include "moc_timeline.cxx"
+
 
 

src/core/track.cpp

@@ -40,11 +40,11 @@
 #include <assert.h>
 #include <cstdio>
 
-#include <QtGui/QLayout>
-#include <QtGui/QMenu>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QStyleOption>
+#include <QLayout>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QStyleOption>
 
 
 #include "AutomationPattern.h"
@@ -487,7 +487,7 @@ void trackContentObjectView::dropEvent( QDropEvent * _de )
 	}
 
 	// Don't allow pasting a tco into itself.
-	QWidget * qwSource = _de->source();
+	QObject* qwSource = _de->source();
 	if( qwSource != NULL &&
 	    dynamic_cast<trackContentObjectView *>( qwSource ) == this )
 	{
@@ -2718,6 +2718,6 @@ void trackView::createTCOView( trackContentObject * _tco )
 
 
 
-#include "moc_track.cxx"
+
 
 

src/gui/AutomatableModelView.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QMenu>
-#include <QtGui/QMouseEvent>
+#include <QMenu>
+#include <QMouseEvent>
 
 #include "AutomatableModelView.h"
 #include "AutomationPattern.h"
@@ -241,4 +241,4 @@ void AutomatableModelViewSlots::unlinkAllModels()
 }
 
 
-#include "moc_AutomatableModelView.cxx"
+

src/gui/AutomationEditor.cpp

@@ -27,16 +27,16 @@
 
 #include "AutomationEditor.h"
 
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiArea>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyleOption>
-#include <QtGui/QWheelEvent>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLayout>
+#include <QMdiArea>
+#include <QPainter>
+#include <QScrollBar>
+#include <QStyleOption>
+#include <QWheelEvent>
 #include <QToolTip>
 
 
@@ -94,9 +94,9 @@ AutomationEditor::AutomationEditor() :
 	m_drawLastTick( 0 ),
 	m_ppt( DEFAULT_PPT ),
 	m_y_delta( DEFAULT_Y_DELTA ),
-	m_y_auto( TRUE ),
+	m_y_auto( true ),
 	m_editMode( DRAW ),
-	m_scrollBack( FALSE ),
+	m_scrollBack( false ),
 	m_gridColor( 0,0,0 ),
 	m_graphColor(),
 	m_vertexColor( 0,0,0 ),
@@ -145,7 +145,7 @@ AutomationEditor::AutomationEditor() :
 	m_toolBar = new QWidget( this );
 	m_toolBar->setFixedHeight( 32 );
 	m_toolBar->move( 0, 0 );
-	m_toolBar->setAutoFillBackground( TRUE );
+	m_toolBar->setAutoFillBackground( true );
 	QPalette pal;
 	pal.setBrush( m_toolBar->backgroundRole(),
 					embed::getIconPixmap( "toolbar_bg" ) );
@@ -197,14 +197,14 @@ AutomationEditor::AutomationEditor() :
 					tr( "Draw mode (Shift+D)" ),
 					this, SLOT( drawButtonToggled() ),
 					m_toolBar );
-	m_drawButton->setCheckable( TRUE );
-	m_drawButton->setChecked( TRUE );
+	m_drawButton->setCheckable( true );
+	m_drawButton->setChecked( true );
 
 	m_eraseButton = new toolButton( embed::getIconPixmap( "edit_erase" ),
 					tr( "Erase mode (Shift+E)" ),
 					this, SLOT( eraseButtonToggled() ),
 					m_toolBar );
-	m_eraseButton->setCheckable( TRUE );
+	m_eraseButton->setCheckable( true );
 
 	//TODO: m_selectButton and m_moveButton are broken.
 	/*m_selectButton = new toolButton( embed::getIconPixmap(
@@ -212,20 +212,20 @@ AutomationEditor::AutomationEditor() :
 					tr( "Select mode (Shift+S)" ),
 					this, SLOT( selectButtonToggled() ),
 					m_toolBar );
-	m_selectButton->setCheckable( TRUE );
+	m_selectButton->setCheckable( true );
 
 	m_moveButton = new toolButton( embed::getIconPixmap( "edit_move" ),
 					tr( "Move selection mode (Shift+M)" ),
 					this, SLOT( moveButtonToggled() ),
 					m_toolBar );
-	m_moveButton->setCheckable( TRUE );*/
+	m_moveButton->setCheckable( true );*/
 
 	QButtonGroup * tool_button_group = new QButtonGroup( this );
 	tool_button_group->addButton( m_drawButton );
 	tool_button_group->addButton( m_eraseButton );
 	//tool_button_group->addButton( m_selectButton );
 	//tool_button_group->addButton( m_moveButton );
-	tool_button_group->setExclusive( TRUE );
+	tool_button_group->setExclusive( true );
 
 	m_drawButton->setWhatsThis(
 		tr( "Click here and draw-mode will be activated. In this "
@@ -430,7 +430,7 @@ AutomationEditor::AutomationEditor() :
 	setWindowIcon( embed::getIconPixmap( "automation" ) );
 	setCurrentPattern( NULL );
 
-	setMouseTracking( TRUE );
+	setMouseTracking( true );
 
 	setMinimumSize( tb_layout->minimumSize().width(), 128 );
 
@@ -678,7 +678,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 		/*case Qt::Key_A:
 			if( _ke->modifiers() & Qt::ControlModifier )
 			{
-				m_selectButton->setChecked( TRUE );
+				m_selectButton->setChecked( true );
 				selectAll();
 				update();
 				_ke->accept();
@@ -688,7 +688,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 		case Qt::Key_D:
 			if( _ke->modifiers() & Qt::ShiftModifier )
 			{
-				m_drawButton->setChecked( TRUE );
+				m_drawButton->setChecked( true );
 				_ke->accept();
 			}
 			break;
@@ -696,7 +696,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 		case Qt::Key_E:
 			if( _ke->modifiers() & Qt::ShiftModifier )
 			{
-				m_eraseButton->setChecked( TRUE );
+				m_eraseButton->setChecked( true );
 				_ke->accept();
 			}
 			break;
@@ -704,7 +704,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 		/*case Qt::Key_S:
 			if( _ke->modifiers() & Qt::ShiftModifier )
 			{
-				m_selectButton->setChecked( TRUE );
+				m_selectButton->setChecked( true );
 				_ke->accept();
 			}
 			break;
@@ -712,7 +712,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 		case Qt::Key_M:
 			if( _ke->modifiers() & Qt::ShiftModifier )
 			{
-				m_moveButton->setChecked( TRUE );
+				m_moveButton->setChecked( true );
 				_ke->accept();
 			}
 			break;*/
@@ -939,7 +939,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent * _me )
 			{
 				// when clicking right in select-move, we
 				// switch to move-mode
-				m_moveButton->setChecked( TRUE );
+				m_moveButton->setChecked( true );
 			}
 			else if( _me->button() == Qt::LeftButton &&
 							m_editMode == MOVE )
@@ -959,7 +959,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent * _me )
 			{
 				// when clicking right in select-move, we
 				// switch to draw-mode
-				m_drawButton->setChecked( TRUE );
+				m_drawButton->setChecked( true );
 			}
 
 			update();
@@ -1142,7 +1142,7 @@ void AutomationEditor::mouseMoveEvent( QMouseEvent * _me )
 			m_selectedTick = pos_ticks - m_selectStartTick;
 			if( (int) m_selectStartTick + m_selectedTick < 0 )
 			{
-				m_selectedTick = -qRound( m_selectStartTick );
+				m_selectedTick = -m_selectStartTick;
 			}
 			m_selectedLevels = level - m_selectStartLevel;
 			if( level <= m_selectStartLevel )
@@ -1254,7 +1254,7 @@ void AutomationEditor::mouseMoveEvent( QMouseEvent * _me )
 				new_selValuesForMove[
 					m_pattern->putValue( new_value_pos,
 						it.value () + level_diff,
-									FALSE )]
+									false )]
 						= it.value() + level_diff;
 			}
 			m_selValuesForMove = new_selValuesForMove;
@@ -1304,7 +1304,7 @@ void AutomationEditor::mouseMoveEvent( QMouseEvent * _me )
 			if( (int) m_selectStartTick + m_selectedTick <
 									0 )
 			{
-				m_selectedTick = -qRound( m_selectStartTick );
+				m_selectedTick = -m_selectStartTick;
 			}
 
 			float level = getLevel( _me->y() );
@@ -1597,7 +1597,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
 					break;
 				}
 
-				bool is_selected = FALSE;
+				bool is_selected = false;
 				// if we're in move-mode, we may only draw
 				// values in selected area, that have originally
 				// been selected and not values that are now in
@@ -1606,7 +1606,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
 				{
 					if( m_selValuesForMove.contains( it.key() ) )
 					{
-						is_selected = TRUE;
+						is_selected = true;
 					}
 				}
 				else if( it.value() >= selLevel_start &&
@@ -1614,7 +1614,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
 					it.key() >= sel_pos_start &&
 					it.key() + len_ticks <= sel_pos_end )
 				{
-					is_selected = TRUE;
+					is_selected = true;
 				}
 				
 				float *values = m_pattern->valuesAfter( it.key() );
@@ -1647,7 +1647,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
 	else
 	{
 		QFont f = p.font();
-		f.setBold( TRUE );
+		f.setBold( true );
 		p.setFont( pointSize<14>( f ) );
 		p.setPen( QApplication::palette().color( QPalette::Active,
 							QPalette::BrightText ) );
@@ -1981,7 +1981,7 @@ void AutomationEditor::stop()
 	{
 		engine::getSong()->stop();
 	}
-	m_scrollBack = TRUE;
+	m_scrollBack = true;
 }
 
 
@@ -2292,7 +2292,7 @@ void AutomationEditor::deleteSelectedValues()
 		m_pattern->removeValue( it.key() );
 	}
 
-	if( update_after_delete == TRUE )
+	if( update_after_delete == true )
 	{
 		engine::getSong()->setModified();
 		update();
@@ -2308,7 +2308,7 @@ void AutomationEditor::updatePosition( const MidiTime & _t )
 	if( ( engine::getSong()->isPlaying() &&
 			engine::getSong()->playMode() ==
 					song::Mode_PlayAutomationPattern ) ||
-							m_scrollBack == TRUE )
+							m_scrollBack == true )
 	{
 		const int w = width() - VALUES_WIDTH;
 		if( _t > m_currentPosition + w * MidiTime::ticksPerTact() / m_ppt )
@@ -2323,7 +2323,7 @@ void AutomationEditor::updatePosition( const MidiTime & _t )
 			m_leftRightScroll->setValue( t.getTact() *
 							MidiTime::ticksPerTact() );
 		}
-		m_scrollBack = FALSE;
+		m_scrollBack = false;
 	}
 }
 
@@ -2420,6 +2420,6 @@ void AutomationEditor::updateTopBottomLevels()
 
 
 
-#include "moc_AutomationEditor.cxx"
+
 
 

src/gui/AutomationPatternView.cpp

@@ -22,9 +22,9 @@
  *
  */
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QMenu>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QMenu>
 
 #include "AutomationPatternView.h"
 #include "AutomationEditor.h"
@@ -433,5 +433,5 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax )
 
 
 
-#include "moc_AutomationPatternView.cxx"
+
 

src/gui/ControllerConnectionDialog.cpp

@@ -23,10 +23,10 @@
  *
  */
 
-#include <QtGui/QLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QScrollArea>
+#include <QLayout>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QScrollArea>
 #include <QMessageBox>
 
 #include "ControllerConnectionDialog.h"
@@ -432,5 +432,5 @@ void ControllerConnectionDialog::enableAutoDetect( QAction * _a )
 
 
 
-#include "moc_ControllerConnectionDialog.cxx"
+
 

src/gui/ControllerDialog.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtGui/QCloseEvent>
+#include <QCloseEvent>
 
 #include "ControllerDialog.h"
 #include "Controller.h"
@@ -51,5 +51,5 @@ void ControllerDialog::closeEvent( QCloseEvent * _ce )
 }
 
 
-#include "moc_ControllerDialog.cxx"
+
 

src/gui/EffectControlDialog.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include <QtGui/QMessageBox>
-#include <QtGui/QCloseEvent>
+#include <QMessageBox>
+#include <QCloseEvent>
 
 #include "EffectControlDialog.h"
 #include "EffectControls.h"
@@ -57,5 +57,5 @@ void EffectControlDialog::closeEvent( QCloseEvent * _ce )
 
 
 
-#include "moc_EffectControlDialog.cxx"
+
 

src/gui/EffectSelectDialog.cpp

@@ -212,5 +212,5 @@ void EffectSelectDialog::updateSelection()
 
 
 
-#include "moc_EffectSelectDialog.cxx"
+
 

src/gui/FxMixerView.cpp

@@ -25,17 +25,17 @@
 #include <QtGlobal>
 #include <QDebug>
 
-#include <QtGui/QButtonGroup>
-#include <QtGui/QInputDialog>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPainter>
-#include <QtGui/QPushButton>
-#include <QtGui/QToolButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QStyle>
-#include <QtGui/QKeyEvent>
+#include <QButtonGroup>
+#include <QInputDialog>
+#include <QLayout>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QPainter>
+#include <QPushButton>
+#include <QToolButton>
+#include <QScrollArea>
+#include <QStyle>
+#include <QKeyEvent>
 
 #include "FxMixerView.h"
 #include "knob.h"
@@ -506,5 +506,5 @@ void FxMixerView::updateFaders()
 
 
 
-#include "moc_FxMixerView.cxx"
+
 

src/gui/InstrumentView.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtGui/QIcon>
+#include <QIcon>
 
 #include "InstrumentView.h"
 #include "embed.h"
@@ -36,7 +36,7 @@ InstrumentView::InstrumentView( Instrument * _Instrument, QWidget * _parent ) :
 {
 	setModel( _Instrument );
 	setFixedSize( 250, 250 );
-	setAttribute( Qt::WA_DeleteOnClose, TRUE );
+	setAttribute( Qt::WA_DeleteOnClose, true );
 }
 
 

src/gui/LfoControllerDialog.cpp

@@ -23,11 +23,11 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPainter>
+#include <QLabel>
+#include <QPushButton>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QPainter>
 
 #include "caption_menu.h"
 #include "gui_templates.h"

src/gui/LmmsPalette.cpp

@@ -96,4 +96,4 @@ QPalette LmmsPalette::palette() const
 }
 
 
-#include "moc_LmmsPalette.cxx"
+

src/gui/LmmsStyle.cpp

@@ -24,12 +24,13 @@
  */
 
 
-#include <QtCore/QFile>
-#include <QtGui/QApplication>
-#include <QtGui/QFrame>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmapCache>
-#include <QtGui/QStyleOption>
+#include <QFile>
+#include <QApplication>
+#include <QFrame>
+#include <QPainter>
+#include <QPixmapCache>
+#include <QStyleFactory>
+#include <QStyleOption>
 
 #include "LmmsStyle.h"
 #include "LmmsPalette.h"
@@ -197,13 +198,19 @@ void drawPath( QPainter *p, const QPainterPath &path,
 
 
 LmmsStyle::LmmsStyle() :
-	QPlastiqueStyle()
+	QProxyStyle()
 {
 	QFile file( "resources:style.css" );
 	file.open( QIODevice::ReadOnly );
 	qApp->setStyleSheet( file.readAll() );
 
 	if( s_palette != NULL ) { qApp->setPalette( *s_palette ); }
+
+#if QT_VERSION >= 0x050000
+	setBaseStyle( QStyleFactory::create( "Fusion" ) );
+#else
+	setBaseStyle( QStyleFactory::create( "Plastique" ) );
+#endif
 }
 
 
@@ -213,7 +220,7 @@ QPalette LmmsStyle::standardPalette( void ) const
 {
 	if( s_palette != NULL) { return * s_palette; }
 
-	QPalette pal = QPlastiqueStyle::standardPalette();
+	QPalette pal = QProxyStyle::standardPalette();
 
 	return( pal );
 }
@@ -402,7 +409,7 @@ void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option,
 		break;
 
 	default:
-		QPlastiqueStyle::drawControl( element, option, painter, widget );
+		QProxyStyle::drawControl( element, option, painter, widget );
 		break;
 	}
 }
@@ -429,7 +436,7 @@ void LmmsStyle::drawComplexControl( ComplexControl control,
 						QColor( 192, 192, 192 ) );
 			so.palette.setColor( QPalette::Text,
 							QColor( 64, 64, 64 ) );
-			QPlastiqueStyle::drawComplexControl( control, &so,
+			QProxyStyle::drawComplexControl( control, &so,
 							painter, widget );
 			return;
 		}
@@ -440,7 +447,7 @@ void LmmsStyle::drawComplexControl( ComplexControl control,
 							QPalette::Background ) );
 
 	}*/
-	QPlastiqueStyle::drawComplexControl( control, option, painter, widget );
+	QProxyStyle::drawComplexControl( control, option, painter, widget );
 }
 
 
@@ -551,8 +558,7 @@ void LmmsStyle::drawPrimitive( PrimitiveElement element,
 	}
 	else
 	{
-		QPlastiqueStyle::drawPrimitive( element, option, painter,
-								widget );
+		QProxyStyle::drawPrimitive( element, option, painter, widget );
 	}
 
 }
@@ -579,8 +585,7 @@ int LmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option,
 			return 24;
 
 		default:
-			return QPlastiqueStyle::pixelMetric( _metric, _option,
-								_widget );
+			return QProxyStyle::pixelMetric( _metric, _option, _widget );
 	}
 }
 
@@ -605,13 +610,13 @@ QSize LmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option
 		}
 	}
 
-	return QPlastiqueStyle::sizeFromContents( type, option, size, widget );
+	return QProxyStyle::sizeFromContents( type, option, size, widget );
 }
 */
 /*
 QRect LmmsStyle::subControlRect( ComplexControl control, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const
 {
-	QRect rect = QPlastiqueStyle::subControlRect( control, option, subControl, widget );
+	QRect rect = QProxyStyle::subControlRect( control, option, subControl, widget );
 
 	switch( control )
 	{

src/gui/MainWindow.cpp

@@ -23,17 +23,17 @@
  */
 
 
-#include <QtXml/QDomElement>
-#include <QtCore/QUrl>
-#include <QtGui/QApplication>
-#include <QtGui/QCloseEvent>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMessageBox>
-#include <QtGui/QSplitter>
-#include <QtGui/QWhatsThis>
+#include <QDomElement>
+#include <QUrl>
+#include <QApplication>
+#include <QCloseEvent>
+#include <QDesktopServices>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QSplitter>
+#include <QWhatsThis>
 
 #include "lmmsversion.h"
 #include "MainWindow.h"
@@ -91,7 +91,7 @@ MainWindow::MainWindow() :
 	SideBar * sideBar = new SideBar( Qt::Vertical, w );
 
 	QSplitter * splitter = new QSplitter( Qt::Horizontal, w );
-	splitter->setChildrenCollapsible( FALSE );
+	splitter->setChildrenCollapsible( false );
 
 	QString wdir = configManager::inst()->workingDir();
 	sideBar->appendTab( new pluginBrowser( splitter ) );
@@ -319,7 +319,7 @@ void MainWindow::finalize()
 	QMenu * help_menu = new QMenu( this );
 	menuBar()->addMenu( help_menu )->setText( tr( "&Help" ) );
 	// May use offline help
-	if( TRUE )
+	if( true )
 	{
 		help_menu->addAction( embed::getIconPixmap( "help" ),
 						tr( "Online help" ),
@@ -580,7 +580,7 @@ bool MainWindow::mayChangeProject()
 
 	if( !engine::getSong()->isModified() )
 	{
-		return( TRUE );
+		return( true );
 	}
 
 	QMessageBox mb( tr( "Project not saved" ),
@@ -600,10 +600,10 @@ bool MainWindow::mayChangeProject()
 	}
 	else if( answer == QMessageBox::Discard )
 	{
-		return( TRUE );
+		return( true );
 	}
 
-	return( FALSE );
+	return( false );
 }
 
 
@@ -611,9 +611,9 @@ bool MainWindow::mayChangeProject()
 
 void MainWindow::clearKeyModifiers()
 {
-	m_keyMods.m_ctrl = FALSE;
-	m_keyMods.m_shift = FALSE;
-	m_keyMods.m_alt = FALSE;
+	m_keyMods.m_ctrl = false;
+	m_keyMods.m_shift = false;
+	m_keyMods.m_alt = false;
 }
 
 
@@ -766,7 +766,7 @@ bool MainWindow::saveProject()
 	{
 		engine::getSong()->guiSaveProject();
 	}
-	return( TRUE );
+	return( true );
 }
 
 
@@ -793,9 +793,9 @@ bool MainWindow::saveProjectAs()
 	{
 		engine::getSong()->guiSaveProjectAs(
 						sfd.selectedFiles()[0] );
-		return( TRUE );
+		return( true );
 	}
-	return( FALSE );
+	return( false );
 }
 
 
@@ -1020,9 +1020,9 @@ void MainWindow::keyPressEvent( QKeyEvent * _ke )
 {
 	switch( _ke->key() )
 	{
-		case Qt::Key_Control: m_keyMods.m_ctrl = TRUE; break;
-		case Qt::Key_Shift: m_keyMods.m_shift = TRUE; break;
-		case Qt::Key_Alt: m_keyMods.m_alt = TRUE; break;
+		case Qt::Key_Control: m_keyMods.m_ctrl = true; break;
+		case Qt::Key_Shift: m_keyMods.m_shift = true; break;
+		case Qt::Key_Alt: m_keyMods.m_alt = true; break;
 		default:
 		{
 			InstrumentTrackWindow * w =
@@ -1046,9 +1046,9 @@ void MainWindow::keyReleaseEvent( QKeyEvent * _ke )
 {
 	switch( _ke->key() )
 	{
-		case Qt::Key_Control: m_keyMods.m_ctrl = FALSE; break;
-		case Qt::Key_Shift: m_keyMods.m_shift = FALSE; break;
-		case Qt::Key_Alt: m_keyMods.m_alt = FALSE; break;
+		case Qt::Key_Control: m_keyMods.m_ctrl = false; break;
+		case Qt::Key_Shift: m_keyMods.m_shift = false; break;
+		case Qt::Key_Alt: m_keyMods.m_alt = false; break;
 		default:
 			if( InstrumentTrackView::topLevelInstrumentTrackWindow() )
 			{
@@ -1149,5 +1149,5 @@ void MainWindow::autoSave()
 }
 
 
-#include "moc_MainWindow.cxx"
+
 

src/gui/ModelView.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

src/gui/PeakControllerDialog.cpp

@@ -24,11 +24,11 @@
  */
 
 
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPainter>
+#include <QLabel>
+#include <QPushButton>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QPainter>
 
 #include "caption_menu.h"
 #include "gui_templates.h"

src/gui/PianoRoll.cpp

@@ -24,17 +24,17 @@
  *
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiArea>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyleOption>
-#include <QtGui/QWheelEvent>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLayout>
+#include <QMdiArea>
+#include <QPainter>
+#include <QScrollBar>
+#include <QStyleOption>
+#include <QWheelEvent>
 #include <QString>
 #include <QSignalMapper>
 
@@ -4255,6 +4255,6 @@ note * PianoRoll::noteUnderMouse()
 
 
 
-#include "moc_PianoRoll.cxx"
+
 
 

src/gui/PianoView.cpp

@@ -37,11 +37,11 @@
  */
 
 
-#include <QtGui/QCursor>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QVBoxLayout>
+#include <QCursor>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QVBoxLayout>
 
 
 #include "PianoView.h"
@@ -918,5 +918,5 @@ void PianoView::paintEvent( QPaintEvent * )
 
 
 
-#include "moc_PianoView.cxx"
+
 

src/gui/SongEditor.cpp

@@ -22,16 +22,16 @@
  *
  */
 
-#include <QtCore/QTimeLine>
-#include <QtGui/QAction>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollBar>
+#include <QTimeLine>
+#include <QAction>
+#include <QButtonGroup>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLayout>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QPainter>
+#include <QScrollBar>
 
 #include <math.h>
 
@@ -134,7 +134,7 @@ SongEditor::SongEditor( song * _song ) :
 	toolButton * hq_btn = new toolButton( embed::getIconPixmap( "hq_mode" ),
 						tr( "High quality mode" ),
 						NULL, NULL, tb );
-	hq_btn->setCheckable( TRUE );
+	hq_btn->setCheckable( true );
 	connect( hq_btn, SIGNAL( toggled( bool ) ),
 			this, SLOT( setHighQuality( bool ) ) );
 	hq_btn->setFixedWidth( 42 );
@@ -145,7 +145,7 @@ SongEditor::SongEditor( song * _song ) :
 
 	engine::mainWindow()->addSpacingToToolBar( 10 );
 
-	m_timeSigDisplay = new MeterDialog( this, TRUE );
+	m_timeSigDisplay = new MeterDialog( this, true );
 	m_timeSigDisplay->setModel( &m_s->m_timeSigModel );
 	engine::mainWindow()->addWidgetToToolBar( m_timeSigDisplay );
 
@@ -485,13 +485,13 @@ void SongEditor::stop()
 void SongEditor::keyPressEvent( QKeyEvent * _ke )
 {
 	if( /*_ke->modifiers() & Qt::ShiftModifier*/
-		engine::mainWindow()->isShiftPressed() == TRUE &&
+		engine::mainWindow()->isShiftPressed() == true &&
 						_ke->key() == Qt::Key_Insert )
 	{
 		m_s->insertBar();
 	}
 	else if(/* _ke->modifiers() & Qt::ShiftModifier &&*/
-			engine::mainWindow()->isShiftPressed() == TRUE &&
+			engine::mainWindow()->isShiftPressed() == true &&
 						_ke->key() == Qt::Key_Delete )
 	{
 		m_s->removeBar();
@@ -538,7 +538,7 @@ void SongEditor::keyPressEvent( QKeyEvent * _ke )
 
 void SongEditor::wheelEvent( QWheelEvent * _we )
 {
-	if( engine::mainWindow()->isCtrlPressed() == TRUE )
+	if( engine::mainWindow()->isCtrlPressed() == true )
 	{
 		if( _we->delta() > 0 )
 		{
@@ -562,7 +562,7 @@ void SongEditor::wheelEvent( QWheelEvent * _we )
 		// and make sure, all TCO's are resized and relocated
 		realignTracks();
 	}
-	else if( engine::mainWindow()->isShiftPressed() == TRUE )
+	else if( engine::mainWindow()->isShiftPressed() == true )
 	{
 		m_leftRightScroll->setValue( m_leftRightScroll->value() -
 							_we->delta() / 30 );
@@ -581,7 +581,7 @@ void SongEditor::wheelEvent( QWheelEvent * _we )
 void SongEditor::masterVolumeChanged( int _new_val )
 {
 	masterVolumeMoved( _new_val );
-	if( m_mvsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE
+	if( m_mvsStatus->isVisible() == false && m_s->m_loadingProject == false
 					&& m_masterVolumeSlider->showStatus() )
 	{
 		m_mvsStatus->moveGlobal( m_masterVolumeSlider,
@@ -624,7 +624,7 @@ void SongEditor::masterVolumeReleased( void )
 void SongEditor::masterPitchChanged( int _new_val )
 {
 	masterPitchMoved( _new_val );
-	if( m_mpsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE
+	if( m_mpsStatus->isVisible() == false && m_s->m_loadingProject == false
 					&& m_masterPitchSlider->showStatus() )
 	{
 		m_mpsStatus->moveGlobal( m_masterPitchSlider,
@@ -795,7 +795,7 @@ bool SongEditor::allowRubberband() const
 
 
 
-#include "moc_SongEditor.cxx"
+
 
 
 /* vim: set tw=0 noexpandtab: */

src/gui/ToolPluginView.cpp

@@ -26,8 +26,8 @@
 #include "ToolPlugin.h"
 #include "ToolPluginView.h"
 
-#include <QtGui/QIcon>
-#include <QtGui/QMdiArea>
+#include <QIcon>
+#include <QMdiArea>
 
 #include "embed.h"
 #include "engine.h"

src/gui/TrackContainerView.cpp

@@ -23,12 +23,12 @@
  */
 
 
-#include <QtGui/QApplication>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiArea>
-#include <QtGui/QProgressDialog>
-#include <QtGui/QScrollBar>
-#include <QtGui/QWheelEvent>
+#include <QApplication>
+#include <QLayout>
+#include <QMdiArea>
+#include <QProgressDialog>
+#include <QScrollBar>
+#include <QWheelEvent>
 
 
 #include "TrackContainerView.h"
@@ -458,5 +458,5 @@ void TrackContainerView::scrollArea::wheelEvent( QWheelEvent * _we )
 
 
 
-#include "moc_TrackContainerView.cxx"
+
 

src/gui/bb_editor.cpp

@@ -23,10 +23,10 @@
  */
 
 
-#include <QtGui/QKeyEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiArea>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLayout>
+#include <QMdiArea>
 
 #include "bb_editor.h"
 #include "bb_track_container.h"
@@ -323,5 +323,5 @@ void bbEditor::keyPressEvent( QKeyEvent * _ke )
 
 
 
-#include "moc_bb_editor.cxx"
+
 

src/gui/dialogs/FileDialog.cpp

@@ -22,10 +22,10 @@
  *
  */
 
-#include <QtCore/QList>
-#include <QtCore/QUrl>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QListView>
+#include <QList>
+#include <QUrl>
+#include <QDesktopServices>
+#include <QListView>
 
 #include "config_mgr.h"
 #include "FileDialog.h"
@@ -41,15 +41,27 @@ FileDialog::FileDialog( QWidget *parent, const QString &caption,
 
 	// Add additional locations to the sidebar
 	QList<QUrl> urls = sidebarUrls();
+#if QT_VERSION >= 0x050000
+	urls << QUrl::fromLocalFile( QStandardPaths::writableLocation( QStandardPaths::DesktopLocation ) );
+#else
 	urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::DesktopLocation ) );
+#endif
 	// Find downloads directory
 	QDir downloadDir( QDir::homePath() + "/Downloads" );
 	if ( ! downloadDir.exists() )
+#if QT_VERSION >= 0x050000
+		downloadDir = QStandardPaths::writableLocation( QStandardPaths::DownloadLocation );
+#else
 		downloadDir = QDesktopServices::storageLocation( QDesktopServices::DocumentsLocation ) + "/Downloads";
+#endif
 	if ( downloadDir.exists() )
 		urls << QUrl::fromLocalFile( downloadDir.absolutePath() );
 
+#if QT_VERSION >= 0x050000
+	urls << QUrl::fromLocalFile( QStandardPaths::writableLocation( QStandardPaths::MusicLocation ) );
+#else
 	urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) );
+#endif
 	urls << QUrl::fromLocalFile( configManager::inst()->workingDir() );
 
 	setSidebarUrls(urls);
@@ -65,4 +77,4 @@ void FileDialog::clearSelection()
 }
 
 
-#include "moc_FileDialog.cxx"
+

src/gui/dialogs/VersionedSaveDialog.cpp

@@ -23,10 +23,10 @@
  */
 
 
-#include <QtGui/QLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QLineEdit>
+#include <QLayout>
+#include <QPushButton>
+#include <QFontMetrics>
+#include <QLineEdit>
 
 #include "VersionedSaveDialog.h"
 
@@ -136,4 +136,4 @@ void VersionedSaveDialog::decrementVersion()
 	selectFile( file );
 }
 
-#include "moc_VersionedSaveDialog.cxx"
+

src/gui/embed.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <QtGui/QImage>
+#include <QImage>
 #include <QHash>
 #include <QImageReader>
 #include <QList>

src/gui/export_project_dialog.cpp

@@ -22,9 +22,9 @@
  *
  */
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtGui/QMessageBox>
+#include <QFileInfo>
+#include <QDir>
+#include <QMessageBox>
 
 #include "export_project_dialog.h"
 #include "song.h"
@@ -343,7 +343,7 @@ void exportProjectDialog::updateTitleBar( int _prog )
 
 
 
-#include "moc_export_project_dialog.cxx"
+
 
 
 /* vim: set tw=0 noexpandtab: */

src/gui/file_browser.cpp

@@ -24,13 +24,13 @@
  */
 
 
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMenu>
-#include <QtGui/QPushButton>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
+#include <QPushButton>
+#include <QMdiArea>
+#include <QMdiSubWindow>
 
 #include "file_browser.h"
 #include "bb_track_container.h"
@@ -1053,5 +1053,5 @@ QString fileItem::extension( const QString & _file )
 
 
 
-#include "moc_file_browser.cxx"
+
 

src/gui/plugin_browser.cpp

@@ -22,10 +22,10 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QPainter>
-#include <QtGui/QCursor>
-#include <QtGui/QMouseEvent>
+#include <QLabel>
+#include <QPainter>
+#include <QCursor>
+#include <QMouseEvent>
 
 #include "plugin_browser.h"
 #include "embed.h"
@@ -224,6 +224,6 @@ void pluginDescWidget::updateHeight()
 
 
 
-#include "moc_plugin_browser.cxx"
+
 
 

src/gui/setup_dialog.cpp

@@ -22,14 +22,14 @@
  *
  */
 
-#include <QtGui/QComboBox>
-#include <QtGui/QImageReader>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMessageBox>
-#include <QtGui/QSlider>
-#include <QtGui/QWhatsThis>
+#include <QComboBox>
+#include <QImageReader>
+#include <QLabel>
+#include <QLayout>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QSlider>
+#include <QWhatsThis>
 
 #include "setup_dialog.h"
 #include "tab_bar.h"
@@ -620,7 +620,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	for( AswMap::iterator it = m_audioIfaceSetupWidgets.begin();
 				it != m_audioIfaceSetupWidgets.end(); ++it )
 	{
-		m_audioIfaceNames[tr( it.key().toAscii())] = it.key();
+		m_audioIfaceNames[tr( it.key().toLatin1())] = it.key();
 	}
 	for( trMap::iterator it = m_audioIfaceNames.begin();
 				it != m_audioIfaceNames.end(); ++it )
@@ -631,7 +631,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 		m_audioInterfaces->addItem( it.key() );
 	}
 	m_audioInterfaces->setCurrentIndex( m_audioInterfaces->findText(
-			tr( engine::mixer()->audioDevName().toAscii() ) ) );
+			tr( engine::mixer()->audioDevName().toLatin1() ) ) );
 	m_audioIfaceSetupWidgets[engine::mixer()->audioDevName()]->show();
 
 	connect( m_audioInterfaces, SIGNAL( activated( const QString & ) ),
@@ -700,7 +700,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	for( MswMap::iterator it = m_midiIfaceSetupWidgets.begin();
 				it != m_midiIfaceSetupWidgets.end(); ++it )
 	{
-		m_midiIfaceNames[tr( it.key().toAscii())] = it.key();
+		m_midiIfaceNames[tr( it.key().toLatin1())] = it.key();
 	}
 	for( trMap::iterator it = m_midiIfaceNames.begin();
 				it != m_midiIfaceNames.end(); ++it )
@@ -712,7 +712,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	}
 
 	m_midiInterfaces->setCurrentIndex( m_midiInterfaces->findText(
-		tr( engine::mixer()->midiClientName().toAscii() ) ) );
+		tr( engine::mixer()->midiClientName().toLatin1() ) ) );
 	m_midiIfaceSetupWidgets[engine::mixer()->midiClientName()]->show();
 
 	connect( m_midiInterfaces, SIGNAL( activated( const QString & ) ),
@@ -1302,5 +1302,5 @@ void setupDialog::displayMIDIHelp()
 
 
 
-#include "moc_setup_dialog.cxx"
+
 

src/gui/string_pair_drag.cpp

@@ -25,9 +25,9 @@
  */
 
 
-#include <QtCore/QMimeData>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
+#include <QMimeData>
+#include <QDragEnterEvent>
+#include <QDropEvent>
 
 
 #include "string_pair_drag.h"
@@ -52,7 +52,7 @@ stringPairDrag::stringPairDrag( const QString & _key, const QString & _value,
 	}
 	QString txt = _key + ":" + _value;
 	QMimeData * m = new QMimeData();
-	m->setData( mimeType(), txt.toAscii() );
+	m->setData( mimeType(), txt.toLatin1() );
 	setMimeData( m );
 	start( Qt::IgnoreAction );
 }
@@ -78,16 +78,16 @@ bool stringPairDrag::processDragEnterEvent( QDragEnterEvent * _dee,
 {
 	if( !_dee->mimeData()->hasFormat( mimeType() ) )
 	{
-		return( FALSE );
+		return( false );
 	}
 	QString txt = _dee->mimeData()->data( mimeType() );
 	if( _allowed_keys.split( ',' ).contains( txt.section( ':', 0, 0 ) ) )
 	{
 		_dee->acceptProposedAction();
-		return( TRUE );
+		return( true );
 	}
 	_dee->ignore();
-	return( FALSE );
+	return( false );
 }
 
 

src/gui/widgets/ControllerRackView.cpp

@@ -23,13 +23,13 @@
  *
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QLayout>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPushButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QMdiArea>
+#include <QApplication>
+#include <QLayout>
+#include <QMdiSubWindow>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QMdiArea>
 #include <QMessageBox>
 
 #include "song.h"
@@ -194,5 +194,5 @@ void ControllerRackView::addController()
 
 
 
-#include "moc_ControllerRackView.cxx"
+
 

src/gui/widgets/ControllerView.cpp

@@ -24,13 +24,13 @@
  */
 
 
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPainter>
-#include <QtGui/QInputDialog>
-#include <QtGui/QWhatsThis>
+#include <QLabel>
+#include <QPushButton>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QPainter>
+#include <QInputDialog>
+#include <QWhatsThis>
 
 #include "ControllerView.h"
 
@@ -198,5 +198,5 @@ void ControllerView::displayHelp()
 
 
 
-#include "moc_ControllerView.cxx"
+
 

src/gui/widgets/EffectRackView.cpp

@@ -23,11 +23,11 @@
  *
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QVBoxLayout>
+#include <QApplication>
+#include <QLayout>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QVBoxLayout>
 
 #include "EffectRackView.h"
 #include "EffectSelectDialog.h"
@@ -264,5 +264,5 @@ void EffectRackView::modelChanged()
 
 
 
-#include "moc_EffectRackView.cxx"
+
 

src/gui/widgets/EffectView.cpp

@@ -23,12 +23,12 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QPainter>
-#include <QtGui/QWhatsThis>
+#include <QLabel>
+#include <QPushButton>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QPainter>
+#include <QWhatsThis>
 
 #include "EffectView.h"
 #include "caption_menu.h"
@@ -287,5 +287,5 @@ void EffectView::modelChanged()
 
 
 
-#include "moc_EffectView.cxx"
+
 

src/gui/widgets/EnvelopeAndLfoView.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
+#include <QMouseEvent>
+#include <QPainter>
 
 #include "EnvelopeAndLfoView.h"
 #include "EnvelopeAndLfoParameters.h"
@@ -591,6 +591,6 @@ void EnvelopeAndLfoView::lfoUserWaveChanged()
 
 
 
-#include "moc_EnvelopeAndLfoView.cxx"
+
 
 

src/gui/widgets/FxLine.cpp

@@ -26,10 +26,10 @@
 #include "FxLine.h"
 
 #include <QDebug>
-#include <QtGui/QInputDialog>
-#include <QtGui/QPainter>
-#include <QtGui/QLineEdit>
-#include <QtGui/QWhatsThis>
+#include <QInputDialog>
+#include <QPainter>
+#include <QLineEdit>
+#include <QWhatsThis>
 
 #include "FxMixer.h"
 #include "FxMixerView.h"
@@ -261,5 +261,5 @@ void FxLine::setBackgroundActive( const QBrush & c )
 	m_backgroundActive = c;
 }
 
-#include "moc_FxLine.cxx"
+
 

src/gui/widgets/InstrumentFunctionViews.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
+#include <QLabel>
+#include <QLayout>
 
 #include "InstrumentFunctions.h"
 #include "InstrumentFunctionViews.h"
@@ -202,5 +202,5 @@ void InstrumentFunctionArpeggioView::modelChanged()
 
 
 
-#include "moc_InstrumentFunctionViews.cxx"
+
 

src/gui/widgets/InstrumentMidiIOView.cpp

@@ -22,10 +22,10 @@
  *
  */
 
-#include <QtGui/QMenu>
-#include <QtGui/QToolButton>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
+#include <QMenu>
+#include <QToolButton>
+#include <QLabel>
+#include <QLayout>
 
 #include "InstrumentMidiIOView.h"
 #include "MidiPortMenu.h"

src/gui/widgets/InstrumentSoundShapingView.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtGui/QLabel>
+#include <QLabel>
 
 #include "InstrumentSoundShapingView.h"
 #include "EnvelopeAndLfoParameters.h"
@@ -163,5 +163,5 @@ void InstrumentSoundShapingView::modelChanged()
 
 
 
-#include "moc_InstrumentSoundShapingView.cxx"
+
 	

src/gui/widgets/LadspaControlView.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtGui/QLayout>
+#include <QLayout>
 
 #include "LadspaControl.h"
 #include "LadspaControlView.h"
@@ -124,5 +124,5 @@ LadspaControlView::~LadspaControlView()
 
 
 
-#include "moc_LadspaControlView.cxx"
+
 

src/gui/widgets/LcdSpinBox.cpp

@@ -23,13 +23,13 @@
  *
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QStyleOptionFrameV2>
-#include <QtGui/QInputDialog>
+#include <QApplication>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QFontMetrics>
+#include <QStyleOptionFrameV2>
+#include <QInputDialog>
 
 #include "LcdSpinBox.h"
 #include "caption_menu.h"
@@ -190,5 +190,5 @@ void LcdSpinBox::enterValue()
 	}
 }
 
-#include "moc_LcdSpinBox.cxx"
+
 

src/gui/widgets/LcdWidget.cpp

@@ -25,12 +25,12 @@
 
 
 
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QStyleOptionFrameV2>
+#include <QApplication>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QFontMetrics>
+#include <QStyleOptionFrameV2>
 
 #include "LcdWidget.h"
 #include "engine.h"
@@ -257,5 +257,5 @@ void LcdWidget::initUi(const QString& name , const QString& style)
 
 
 
-#include "moc_LcdWidget.cxx"
+
 

src/gui/widgets/MeterDialog.cpp

@@ -24,9 +24,9 @@
  */
 
 
-#include <QtGui/QLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QLabel>
 
 #include "MeterDialog.h"
 #include "MeterModel.h"

src/gui/widgets/MidiPortMenu.cpp

@@ -100,5 +100,5 @@ void MidiPortMenu::updateMenu()
 
 
 
-#include "moc_MidiPortMenu.cxx"
+
 

src/gui/widgets/SideBar.cpp

@@ -22,9 +22,9 @@
  *
  */
 
-#include <QtGui/QStyleOptionToolButton>
-#include <QtGui/QStylePainter>
-#include <QtGui/QToolButton>
+#include <QStyleOptionToolButton>
+#include <QStylePainter>
+#include <QToolButton>
 
 #include "SideBar.h"
 #include "SideBarWidget.h"
@@ -159,5 +159,5 @@ void SideBar::toggleButton( QAbstractButton * _btn )
 }
 
 
-#include "moc_SideBar.cxx"
+
 

src/gui/widgets/SideBarWidget.cpp

@@ -22,9 +22,9 @@
  *
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
+#include <QApplication>
+#include <QFontMetrics>
+#include <QPainter>
 
 #include "SideBarWidget.h"
 #include "gui_templates.h"
@@ -85,5 +85,5 @@ void SideBarWidget::resizeEvent( QResizeEvent * )
 
 
 
-#include "moc_SideBarWidget.cxx"
+
 

src/gui/widgets/TimeDisplayWidget.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtGui/QMouseEvent>
+#include <QMouseEvent>
 
 #include "TimeDisplayWidget.h"
 #include "MainWindow.h"
@@ -138,6 +138,6 @@ void TimeDisplayWidget::mousePressEvent( QMouseEvent* mouseEvent )
 
 
 
-#include "moc_TimeDisplayWidget.cxx"
+