hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Vesa
2014-11-25 21:29:00 +02:00
parent eea784ce71
commit ed11ccbf50
17 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/Amplifier/AmplifierControlDialog.cpp
View File

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

1
plugins/BassBooster/BassBoosterControlDialog.cpp
View File

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

1
plugins/DualFilter/DualFilterControlDialog.cpp
View File

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

1
plugins/MidiImport/MidiImport.cpp
View File

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

2
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
View File

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

1
plugins/VstEffect/VstEffectControlDialog.cpp
View File

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

1
plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
View File

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

1
plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
View File

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

1
plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
View File

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

1
plugins/stereo_matrix/stereomatrix_control_dialog.cpp
View File

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

1
plugins/waveshaper/waveshaper_control_dialog.cpp
View File

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