fixed order of member-initialization and miscellanous coding-style corrections

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1020 0778d3d1-df1d-0410-868b-ea421aaaa00d

src/core/lfo_controller.cpp

@@ -46,10 +46,10 @@ lfoController::lfoController( model * _parent ) :
 	m_lfoAmountModel( 1.0, -1.0, 1.0, 0.005, this ),
 	m_lfoPhaseModel( 0.0, 0.0, 360.0, 4.0, this ),
 	m_lfoWaveModel( oscillator::SineWave, 0, oscillator::NumWaveShapes, 1, this ),
-	m_sampleFunction( &oscillator::sinSample ),
 	m_duration( 1000 ),
 	m_phaseCorrection( 0 ),
-	m_phaseOffset( 0 )
+	m_phaseOffset( 0 ),
+	m_sampleFunction( &oscillator::sinSample )
 {
 
 	connect( &m_lfoWaveModel, SIGNAL( dataChanged() ),

src/gui/controller_dialog.cpp

@@ -25,32 +25,33 @@
  *
  */
 
-#include <QtGui/QWidget>
 #include <QtGui/QCloseEvent>
 
 #include "controller_dialog.h"
 #include "controller.h"
 
 
-controllerDialog::controllerDialog( controller * _controller, QWidget * _parent ) :
-    modelView( _controller ),
-    QWidget( _parent )
+controllerDialog::controllerDialog( controller * _controller,
+							QWidget * _parent ) :
+	QWidget( _parent ),
+	modelView( _controller )
 {
-};
+}
 
 
 
 controllerDialog::~controllerDialog()
 {
-};
+}
 
 
 
 void controllerDialog::closeEvent( QCloseEvent * _ce )
 {
-    _ce->ignore();
-    emit( closed() );
-};
+	_ce->ignore();
+	emit closed();
+}
+
 
 #include "controller_dialog.moc"
 

src/gui/widgets/controller_view.cpp

@@ -45,12 +45,12 @@
 
 
 controllerView::controllerView( controller * _model, QWidget * _parent ) :
-	modelView( _model ),
 	QWidget( _parent ),
+	modelView( _model ),
 	m_bg( embed::getIconPixmap( "controller_bg" ) ),
-	m_show( TRUE ),
 	m_subWindow( NULL ),
-	m_controllerDlg( NULL )
+	m_controllerDlg( NULL ),
+	m_show( TRUE )
 {
 	setFixedSize( 210, 20 );