Fix conflict

plugins/Amplifier/AmplifierControlDialog.cpp

@@ -68,4 +68,3 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
 	rightKnob->setHintText( tr( "Right gain:" ) + " ", "%" );
 }
 
-#include "moc_AmplifierControlDialog.cxx"

plugins/BassBooster/BassBoosterControlDialog.cpp

@@ -67,4 +67,3 @@ BassBoosterControlDialog::BassBoosterControlDialog( BassBoosterControls* control
 	setLayout( tl );
 }
 
-#include "moc_BassBoosterControlDialog.cxx"

plugins/DualFilter/DualFilterControlDialog.cpp

@@ -85,4 +85,3 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls )
 	m_filter2ComboBox->setModel( &controls->m_filter2Model );
 }
 
-#include "moc_DualFilterControlDialog.cxx"

plugins/MidiImport/MidiImport.cpp

@@ -569,4 +569,3 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 
 }
 
-#include "moc_MidiImport.cxx"

plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp

@@ -190,5 +190,3 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
 
 }
 
-#include "moc_SpectrumAnalyzerControlDialog.cxx"
-

plugins/VstEffect/VstEffectControlDialog.cpp

@@ -264,4 +264,3 @@ VstEffectControlDialog::~VstEffectControlDialog()
 	//delete m_pluginWidget;
 }
 
-#include "moc_VstEffectControlDialog.cxx"

plugins/dynamics_processor/dynamics_processor_control_dialog.cpp

@@ -153,4 +153,3 @@ dynProcControlDialog::dynProcControlDialog(
 			_controls, SLOT( subOneClicked() ) );
 }
 
-#include "moc_dynamics_processor_control_dialog.cxx"

plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp

@@ -105,4 +105,3 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 	setLayout( tl );
 }
 
-#include "moc_peak_controller_effect_control_dialog.cxx"

plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp

@@ -47,4 +47,3 @@ stereoEnhancerControlDialog::stereoEnhancerControlDialog(
 	this->setLayout(l);
 }
 
-#include "moc_stereoenhancer_control_dialog.cxx"

plugins/stereo_matrix/stereomatrix_control_dialog.cpp

@@ -68,4 +68,3 @@ stereoMatrixControlDialog::stereoMatrixControlDialog(
 	rrKnob->move( 40+28, 60+28 );
 }
 
-#include "moc_stereomatrix_control_dialog.cxx"

plugins/waveshaper/waveshaper_control_dialog.cpp

@@ -117,4 +117,3 @@ waveShaperControlDialog::waveShaperControlDialog(
 			_controls, SLOT( subOneClicked() ) );
 }
 
-#include "moc_waveshaper_control_dialog.cxx"

src/core/Effect.cpp

@@ -217,4 +217,3 @@ void Effect::resample( int _i, const sampleFrame * _src_buf,
 	}
 }
 
-#include "moc_Effect.cxx"

src/core/FxMixer.cpp

@@ -781,4 +781,3 @@ void FxMixer::validateChannelName( int index, int oldIndex )
 	}
 }
 
-#include "moc_FxMixer.cxx"

src/core/Plugin.cpp

@@ -221,4 +221,3 @@ QDomElement Plugin::Descriptor::SubPluginFeatures::Key::saveXML(
 	return e;
 }
 
-#include "moc_Plugin.cxx"

src/gui/widgets/InstrumentMidiIOView.cpp

@@ -201,4 +201,3 @@ void InstrumentMidiIOView::modelChanged()
 	}
 }
 
-#include "moc_InstrumentMidiIOView.cxx"

src/gui/widgets/MeterDialog.cpp

@@ -113,4 +113,3 @@ void MeterDialog::modelChanged()
 	m_denominator->setModel( &mm->denominatorModel() );
 }
 
-#include "moc_MeterDialog.cxx"

src/tracks/AutomationTrack.cpp

@@ -192,4 +192,3 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
 }
 
 
-#include "moc_AutomationTrack.cxx"