Merge remote-tracking branch 'upstream/master' into cmake_dist

include/AutomationEditor.h

@@ -262,6 +262,9 @@ public:
 	void setCurrentPattern(AutomationPattern* pattern);
 	const AutomationPattern* currentPattern();
 
+	virtual void dropEvent( QDropEvent * _de );
+	virtual void dragEnterEvent( QDragEnterEvent * _dee );
+
 	void open(AutomationPattern* pattern);
 
 	AutomationEditor* m_editor;

include/PianoRoll.h

@@ -160,6 +160,8 @@ protected slots:
 
 	void hidePattern( Pattern* pattern );
 
+	void selectRegionFromPixels( int xStart, int xEnd );
+
 
 signals:
 	void currentPatternChanged();
@@ -229,7 +231,7 @@ private:
 	inline int noteEditRight() const;
 	inline int noteEditLeft() const;
 
-	void dragNotes( int x, int y, bool alt, bool shift );
+	void dragNotes( int x, int y, bool alt, bool shift, bool ctrl );
 
 	static const int cm_scrollAmtHoriz = 10;
 	static const int cm_scrollAmtVert = 1;

include/TrackContainerView.h

@@ -131,7 +131,7 @@ public slots:
 	/// \param x
 	/// \param y
 	/// Use the rubber band to select TCO from all tracks using x, y pixels
-	void selectRegionFromPixels(int x, int y);
+	void selectRegionFromPixels(int xStart, int xEnd);
 
 	///
 	/// \brief stopRubberBand