From ed11ccbf508372a013d17e4e48450f114ff6518d Mon Sep 17 00:00:00 2001
From: Vesa <contact.diizy@nbl.fi>
Date: Tue, 25 Nov 2014 21:29:00 +0200
Subject: [PATCH] Fix conflict

---
 plugins/Amplifier/AmplifierControlDialog.cpp                    | 1 -
 plugins/BassBooster/BassBoosterControlDialog.cpp                | 1 -
 plugins/DualFilter/DualFilterControlDialog.cpp                  | 1 -
 plugins/MidiImport/MidiImport.cpp                               | 1 -
 plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp      | 2 --
 plugins/VstEffect/VstEffectControlDialog.cpp                    | 1 -
 .../dynamics_processor/dynamics_processor_control_dialog.cpp    | 1 -
 .../peak_controller_effect_control_dialog.cpp                   | 1 -
 plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp       | 1 -
 plugins/stereo_matrix/stereomatrix_control_dialog.cpp           | 1 -
 plugins/waveshaper/waveshaper_control_dialog.cpp                | 1 -
 src/core/Effect.cpp                                             | 1 -
 src/core/FxMixer.cpp                                            | 1 -
 src/core/Plugin.cpp                                             | 1 -
 src/gui/widgets/InstrumentMidiIOView.cpp                        | 1 -
 src/gui/widgets/MeterDialog.cpp                                 | 1 -
 src/tracks/AutomationTrack.cpp                                  | 1 -
 17 files changed, 18 deletions(-)

diff --git a/plugins/Amplifier/AmplifierControlDialog.cpp b/plugins/Amplifier/AmplifierControlDialog.cpp
index f487ac1a3..b3c86f82a 100644
--- a/plugins/Amplifier/AmplifierControlDialog.cpp
+++ b/plugins/Amplifier/AmplifierControlDialog.cpp
@@ -68,4 +68,3 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
 	rightKnob->setHintText( tr( "Right gain:" ) + " ", "%" );
 }
 
-#include "moc_AmplifierControlDialog.cxx"
diff --git a/plugins/BassBooster/BassBoosterControlDialog.cpp b/plugins/BassBooster/BassBoosterControlDialog.cpp
index 8c63e282a..39f4e57e7 100644
--- a/plugins/BassBooster/BassBoosterControlDialog.cpp
+++ b/plugins/BassBooster/BassBoosterControlDialog.cpp
@@ -67,4 +67,3 @@ BassBoosterControlDialog::BassBoosterControlDialog( BassBoosterControls* control
 	setLayout( tl );
 }
 
-#include "moc_BassBoosterControlDialog.cxx"
diff --git a/plugins/DualFilter/DualFilterControlDialog.cpp b/plugins/DualFilter/DualFilterControlDialog.cpp
index 21a985c4d..bd1a1dcd2 100644
--- a/plugins/DualFilter/DualFilterControlDialog.cpp
+++ b/plugins/DualFilter/DualFilterControlDialog.cpp
@@ -85,4 +85,3 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls )
 	m_filter2ComboBox->setModel( &controls->m_filter2Model );
 }
 
-#include "moc_DualFilterControlDialog.cxx"
diff --git a/plugins/MidiImport/MidiImport.cpp b/plugins/MidiImport/MidiImport.cpp
index fb9836e84..a5e8476e3 100644
--- a/plugins/MidiImport/MidiImport.cpp
+++ b/plugins/MidiImport/MidiImport.cpp
@@ -569,4 +569,3 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 
 }
 
-#include "moc_MidiImport.cxx"
diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
index 33c72315e..36b421efa 100644
--- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
+++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
@@ -190,5 +190,3 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
 
 }
 
-#include "moc_SpectrumAnalyzerControlDialog.cxx"
-
diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
index ea5728dee..5c68ab1b4 100644
--- a/plugins/VstEffect/VstEffectControlDialog.cpp
+++ b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -264,4 +264,3 @@ VstEffectControlDialog::~VstEffectControlDialog()
 	//delete m_pluginWidget;
 }
 
-#include "moc_VstEffectControlDialog.cxx"
diff --git a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
index 69fadfa0c..3922206b0 100644
--- a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
+++ b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
@@ -153,4 +153,3 @@ dynProcControlDialog::dynProcControlDialog(
 			_controls, SLOT( subOneClicked() ) );
 }
 
-#include "moc_dynamics_processor_control_dialog.cxx"
diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
index 091e85509..359b23b9b 100644
--- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
+++ b/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"
diff --git a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
index 54244526e..5013883d2 100644
--- a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
+++ b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
@@ -47,4 +47,3 @@ stereoEnhancerControlDialog::stereoEnhancerControlDialog(
 	this->setLayout(l);
 }
 
-#include "moc_stereoenhancer_control_dialog.cxx"
diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp
index 6e33c6893..22ea484a4 100644
--- a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp
+++ b/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"
diff --git a/plugins/waveshaper/waveshaper_control_dialog.cpp b/plugins/waveshaper/waveshaper_control_dialog.cpp
index 435c13777..9727e0bc6 100644
--- a/plugins/waveshaper/waveshaper_control_dialog.cpp
+++ b/plugins/waveshaper/waveshaper_control_dialog.cpp
@@ -117,4 +117,3 @@ waveShaperControlDialog::waveShaperControlDialog(
 			_controls, SLOT( subOneClicked() ) );
 }
 
-#include "moc_waveshaper_control_dialog.cxx"
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index 2d37ba500..38bd0d6de 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -217,4 +217,3 @@ void Effect::resample( int _i, const sampleFrame * _src_buf,
 	}
 }
 
-#include "moc_Effect.cxx"
diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
index d432d7c86..6421a4176 100644
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -781,4 +781,3 @@ void FxMixer::validateChannelName( int index, int oldIndex )
 	}
 }
 
-#include "moc_FxMixer.cxx"
diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp
index c3ce0e47e..e6102e82a 100644
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -221,4 +221,3 @@ QDomElement Plugin::Descriptor::SubPluginFeatures::Key::saveXML(
 	return e;
 }
 
-#include "moc_Plugin.cxx"
diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp
index 29d7af2b4..4601c6e39 100644
--- a/src/gui/widgets/InstrumentMidiIOView.cpp
+++ b/src/gui/widgets/InstrumentMidiIOView.cpp
@@ -201,4 +201,3 @@ void InstrumentMidiIOView::modelChanged()
 	}
 }
 
-#include "moc_InstrumentMidiIOView.cxx"
diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp
index 07e8aa249..62b0da72a 100644
--- a/src/gui/widgets/MeterDialog.cpp
+++ b/src/gui/widgets/MeterDialog.cpp
@@ -113,4 +113,3 @@ void MeterDialog::modelChanged()
 	m_denominator->setModel( &mm->denominatorModel() );
 }
 
-#include "moc_MeterDialog.cxx"
diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp
index d6a2ea444..353146377 100644
--- a/src/tracks/AutomationTrack.cpp
+++ b/src/tracks/AutomationTrack.cpp
@@ -192,4 +192,3 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
 }
 
 
-#include "moc_AutomationTrack.cxx"