moved main window toolbar code from songEditor to mainWindow

used inline for note setXXX methods


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

include/main_window.h

@@ -34,13 +34,20 @@
 class QAction;
 class QDomElement;
 class QGridLayout;
+class QHBoxLayout;
 class QMdiArea;
 
+class lcdSpinBox;
+class meterDialog;
+class automatableSlider;
+class textFloat;
+
 class configManager;
 class pluginView;
 class toolButton;
 
 
+
 class mainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -55,8 +62,8 @@ public:
 		return( m_toolBar );
 	}
 
-	int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
-	void addSpacingToToolBar( int _size );
+	//int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
+	//void addSpacingToToolBar( int _size );
 
 
 	// every function that replaces current file (e.g. creates new file,
@@ -137,8 +144,18 @@ private:
 	QMdiArea * m_workspace;
 
 	QWidget * m_toolBar;
-	QGridLayout * m_toolBarLayout;
-
+	QHBoxLayout * m_toolBarLayout;
+	
+	
+	lcdSpinBox * m_tempoSpinBox;
+	meterDialog * m_timeSigDisplay;
+		
+	automatableSlider * m_masterVolumeSlider;
+	automatableSlider * m_masterPitchSlider;
+		
+	textFloat * m_mvsStatus;
+	textFloat * m_mpsStatus;
+		
 	QMenu * m_templatesMenu;
 	QMenu * m_recentlyOpenedProjectsMenu;
 	int m_custom_templates_count;
@@ -166,6 +183,17 @@ private:
 
 
 private slots:
+	void setHighQuality( bool );
+	
+	void masterVolumeChanged( int _new_val );
+	void masterVolumePressed( void );
+	void masterVolumeMoved( int _new_val );
+	void masterVolumeReleased( void );
+	void masterPitchChanged( int _new_val );
+	void masterPitchPressed( void );
+	void masterPitchMoved( int _new_val );
+	void masterPitchReleased( void );
+		
 	void browseHelp( void );
 	void fillTemplatesMenu( void );
 	void openRecentlyOpenedProject( QAction * _action );

include/note.h

@@ -91,10 +91,13 @@ public:
 	note( const note & _note );
 	virtual ~note();
 	
-	void setSelected( const bool _selected );
-	void setOldKey( const int _oldKey );
-	void setOldPos( const midiTime & _oldPos );
-	void setOldLength( const midiTime & _oldLength );
+	inline void setSelected( const bool _selected ){ m_selected = _selected; }
+	inline void setOldKey( const int _oldKey ){ m_oldKey = _oldKey; }
+	inline void setOldPos( const midiTime & _oldPos ){ m_oldPos = _oldPos; }
+	inline void setOldLength( const midiTime & _oldLength )
+	{
+		m_oldLength = _oldLength;
+	}
 	
 	void setLength( const midiTime & _length );
 	void setPos( const midiTime & _pos );

include/song.h

@@ -308,6 +308,7 @@ private:
 
 	friend class engine;
 	friend class songEditor;
+	friend class mainWindow;
 	friend class controllerRackView;
 
 signals:

include/song_editor.h

@@ -32,12 +32,8 @@
 class QLabel;
 class QScrollBar;
 
-class automatableSlider;
 class comboBox;
-class lcdSpinBox;
-class meterDialog;
 class song;
-class textFloat;
 class timeLine;
 class toolButton;
 
@@ -65,22 +61,12 @@ public slots:
 
 
 private slots:
-	void setHighQuality( bool );
 
 	void play( void );
 	void record( void );
 	void recordAccompany( void );
 	void stop( void );
 
-	void masterVolumeChanged( int _new_val );
-	void masterVolumePressed( void );
-	void masterVolumeMoved( int _new_val );
-	void masterVolumeReleased( void );
-	void masterPitchChanged( int _new_val );
-	void masterPitchPressed( void );
-	void masterPitchMoved( int _new_val );
-	void masterPitchReleased( void );
-
 	void updatePosition( const midiTime & _t );
 
 	void zoomingChanged( void );
@@ -104,14 +90,6 @@ private:
 	toolButton * m_recordButton;
 	toolButton * m_recordAccompanyButton;
 	toolButton * m_stopButton;
-	lcdSpinBox * m_tempoSpinBox;
-
-	meterDialog * m_timeSigDisplay;
-	automatableSlider * m_masterVolumeSlider;
-	automatableSlider * m_masterPitchSlider;
-
-	textFloat * m_mvsStatus;
-	textFloat * m_mpsStatus;
 
 	toolButton * m_addBBTrackButton;
 	toolButton * m_addSampleTrackButton;