Merge remote-tracking branch 'lmms/master' into groove

include/AutomatableModelView.h

@@ -36,7 +36,7 @@ class EXPORT AutomatableModelView : public ModelView
 {
 public:
 	AutomatableModelView( Model* model, QWidget* _this );
-	virtual ~AutomatableModelView();
+	virtual ~AutomatableModelView() = default;
 
 	// some basic functions for convenience
 	AutomatableModel* modelUntyped()

include/AutomationPattern.h

@@ -54,7 +54,7 @@ public:
 
 	AutomationPattern( AutomationTrack * _auto_track );
 	AutomationPattern( const AutomationPattern & _pat_to_copy );
-	virtual ~AutomationPattern();
+	virtual ~AutomationPattern() = default;
 
 	bool addObject( AutomatableModel * _obj, bool _search_dup = true );
 

include/AutomationTrack.h

@@ -35,7 +35,7 @@ class AutomationTrack : public Track
 	Q_OBJECT
 public:
 	AutomationTrack( TrackContainer* tc, bool _hidden = false );
-	virtual ~AutomationTrack();
+	virtual ~AutomationTrack() = default;
 
 	virtual bool play( const MidiTime & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _tco_num = -1 );
@@ -63,7 +63,7 @@ class AutomationTrackView : public TrackView
 {
 public:
 	AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
-	virtual ~AutomationTrackView();
+	virtual ~AutomationTrackView() = default;
 
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );

include/BBTrack.h

@@ -41,7 +41,7 @@ class BBTCO : public TrackContentObject
 {
 public:
 	BBTCO( Track * _track );
-	virtual ~BBTCO();
+	virtual ~BBTCO() = default;
 
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	virtual void loadSettings( const QDomElement & _this );
@@ -90,7 +90,7 @@ class BBTCOView : public TrackContentObjectView
 	Q_OBJECT
 public:
 	BBTCOView( TrackContentObject * _tco, TrackView * _tv );
-	virtual ~BBTCOView();
+	virtual ~BBTCOView() = default;
 
 	QColor color() const
 	{

include/Fader.h

@@ -68,7 +68,7 @@ public:
 
 	Fader( FloatModel * _model, const QString & _name, QWidget * _parent );
 	Fader( FloatModel * _model, const QString & _name, QWidget * _parent, QPixmap * back, QPixmap * leds, QPixmap * knob );
-	virtual ~Fader();
+	virtual ~Fader() = default;
 
 	void init(FloatModel * model, QString const & name);
 

include/FileBrowser.h

@@ -51,7 +51,7 @@ public:
 	FileBrowser( const QString & directories, const QString & filter,
 			const QString & title, const QPixmap & pm,
 			QWidget * parent, bool dirs_as_items = false, bool recurse = false );
-	virtual ~FileBrowser();
+	virtual ~FileBrowser() = default;
 
 private slots:
 	void reloadTree( void );
@@ -85,7 +85,7 @@ class FileBrowserTreeWidget : public QTreeWidget
 	Q_OBJECT
 public:
 	FileBrowserTreeWidget( QWidget * parent );
-	virtual ~FileBrowserTreeWidget();
+	virtual ~FileBrowserTreeWidget() = default;
 
 
 protected:

include/FxLine.h

@@ -79,6 +79,10 @@ public:
 
 	static const int FxLineHeight;
 
+	void renameChannel();
+
+	bool eventFilter (QObject *dist, QEvent *event);
+
 private:
 	void drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool sendToThis, bool receiveFromThis );
 	QString elideName( const QString & name );
@@ -98,7 +102,6 @@ private:
 	QGraphicsView * m_view;
 
 private slots:
-	void renameChannel();
 	void renameFinished();
 	void removeChannel();
 	void removeUnusedChannels();

include/FxMixerView.h

@@ -100,6 +100,8 @@ public:
 	void moveChannelLeft(int index, int focusIndex);
 	void moveChannelRight(int index);
 
+	void renameChannel(int index);
+
 	// make sure the display syncs up with the fx mixer.
 	// useful for loading projects
 	void refreshDisplay();

include/Graph.h

@@ -55,7 +55,7 @@ public:
 		int _width = 132,
 		int _height = 104
 	);
-	virtual ~Graph();
+	virtual ~Graph() = default;
 
 	void setForeground( const QPixmap & _pixmap );
 
@@ -122,7 +122,7 @@ public:
 			bool _default_constructed = false,
 			float _step = 0.0 );
 
-	virtual ~graphModel();
+	virtual ~graphModel() = default;
 
 	// TODO: saveSettings, loadSettings?
 

include/Instrument.h

@@ -57,7 +57,7 @@ public:
 
 	Instrument( InstrumentTrack * _instrument_track,
 					const Descriptor * _descriptor );
-	virtual ~Instrument();
+	virtual ~Instrument() = default;
 
 	// --------------------------------------------------------------------
 	// functions that can/should be re-implemented:

include/LcdSpinBox.h

@@ -38,7 +38,7 @@ public:
 
 	LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString::null );
 
-	virtual ~LcdSpinBox();
+	virtual ~LcdSpinBox() = default;
 
 	virtual void modelChanged()
 	{

include/Pattern.h

@@ -163,7 +163,7 @@ class PatternView : public TrackContentObjectView
 
 public:
 	PatternView( Pattern* pattern, TrackView* parent );
-	virtual ~PatternView();
+	virtual ~PatternView() = default;
 
 	Q_PROPERTY(QColor noteFillColor READ getNoteFillColor WRITE setNoteFillColor)
 	Q_PROPERTY(QColor noteBorderColor READ getNoteBorderColor WRITE setNoteBorderColor)

include/Piano.h

@@ -31,7 +31,7 @@
 class InstrumentTrack;
 class MidiEventProcessor;
 
-class Piano : public Model
+class Piano final : public Model
 {
 public:
 	enum KeyTypes
@@ -41,7 +41,6 @@ public:
 	} ;
 
 	Piano( InstrumentTrack* track );
-	virtual ~Piano();
 
 	void setKeyState( int key, bool state );
 

include/PianoView.h

@@ -38,7 +38,7 @@ class PianoView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	PianoView( QWidget * _parent );
-	virtual ~PianoView();
+	virtual ~PianoView() = default;
 
 	static int getKeyFromKeyEvent( QKeyEvent * _ke );
 

include/SampleTrack.h

@@ -98,8 +98,7 @@ class SampleTCOView : public TrackContentObjectView
 
 public:
 	SampleTCOView( SampleTCO * _tco, TrackView * _tv );
-	virtual ~SampleTCOView();
-
+	virtual ~SampleTCOView() = default;
 
 public slots:
 	void updateSample();

include/SongEditor.h

@@ -135,6 +135,7 @@ private:
 
 	bool m_scrollBack;
 	bool m_smoothScroll;
+	int m_widgetWidthTotal;
 
 	EditMode m_mode;
 	EditMode m_ctrlMode; // mode they were in before they hit ctrl

include/TabBar.h

@@ -42,7 +42,7 @@ class EXPORT TabBar : public QWidget
 public:
 	TabBar( QWidget * _parent,
 			QBoxLayout::Direction _dir = QBoxLayout::LeftToRight );
-	virtual ~TabBar();
+	virtual ~TabBar() = default;
 
 	TabButton * addTab( QWidget * _w, const QString & _text,
 					int _id, bool _add_stretch = false,

include/TabWidget.h

@@ -37,7 +37,7 @@ class TabWidget : public QWidget
 	Q_OBJECT
 public:
 	TabWidget( const QString & _caption, QWidget * _parent, bool usePixmap = false );
-	virtual ~TabWidget();
+	virtual ~TabWidget() = default;
 
 	void addTab( QWidget * w, const QString & name, const char *pixmap = NULL, int idx = -1 );
 

include/TimeDisplayWidget.h

@@ -37,7 +37,7 @@ class TimeDisplayWidget : public QWidget
 	Q_OBJECT
 public:
 	TimeDisplayWidget();
-	virtual ~TimeDisplayWidget();
+	virtual ~TimeDisplayWidget() = default;
 
 
 protected:

include/ToolButton.h

@@ -42,7 +42,7 @@ public:
 		QToolButton(_parent)
 	{ }
 
-	virtual ~ToolButton();
+	virtual ~ToolButton() = default;
 
 } ;
 

include/Track.h

@@ -300,8 +300,6 @@ private:
 
 	TextFloat * m_hint;
 
-	MidiTime m_oldTime;// used for undo/redo while mouse-button is pressed
-
 // qproperty fields
 	QColor m_mutedColor;
 	QColor m_mutedBackgroundColor;