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

Coding conventions update

Browse Source
This commit is contained in:
Alexandre
2015-01-20 00:00:58 -02:00
parent a34faeca71
commit 2834bd17f4
4 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/TimeLineWidget.h
View File

@@ -61,7 +61,7 @@ public:
} ;
TimeLineWidget( int xoff, int yoff, float ppt, Song::playPos & pos,
TimeLineWidget( int xoff, int yoff, float ppt, Song::PlayPos & pos,
const MidiTime & begin, QWidget * parent );
virtual ~TimeLineWidget();

4
include/Track.h
View File

@@ -228,10 +228,6 @@ protected:
virtual void mouseMoveEvent( QMouseEvent * me );
virtual void mouseReleaseEvent( QMouseEvent * me );
<<<<<<< HEAD
=======
void setAutoResizeEnabled( bool e = false );
>>>>>>> Update coding conventions
float pixelsPerTact();
inline TrackView * getTrackView()