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()

28
src/core/Track.cpp
View File

@@ -958,22 +958,6 @@ float TrackContentObjectView::pixelsPerTact()
<<<<<<< HEAD
=======
/*! \brief Set whether this trackContentObjectView can resize.
*
* \param e The boolean state of whether this track content object view
* is allowed to resize.
*/
void TrackContentObjectView::setAutoResizeEnabled( bool e )
{
m_autoResize = e;
}
>>>>>>> Update coding conventions
/*! \brief Detect whether the mouse moved more than n pixels on screen.
*
* \param _me The QMouseEvent.
@@ -1780,12 +1764,11 @@ void TrackOperationsWidget::updateMenu()
}
if( InstrumentTrackView * trackView = dynamic_cast<InstrumentTrackView *>( m_trackView ) )
{
<<<<<<< HEAD
int channelIndex = trackView->model()->effectChannelModel()->value();
FxChannel * fxChannel = Engine::fxMixer()->effectChannel( channelIndex );
QMenu * fxMenu = new QMenu( tr( "FX %1: %2" ).arg( channelIndex ).arg( fxChannel->m_name ), to_menu );
QMenu * fxMenu = new QMenu( tr( "FX %1: %2" ).arg( channelIndex ).arg( fxChannel->m_name ), toMenu );
QSignalMapper * fxMenuSignalMapper = new QSignalMapper(this);
fxMenu->addAction("Assign to new FX Channel" , this, SLOT( createFxLine() ) );
@@ -1804,16 +1787,11 @@ void TrackOperationsWidget::updateMenu()
}
}
to_menu->addMenu(fxMenu);
toMenu->addMenu(fxMenu);
connect(fxMenuSignalMapper, SIGNAL(mapped(int)), this, SLOT(assignFxLine(int)));
to_menu->addSeparator();
to_menu->addMenu( trackView->midiMenu() );
=======
toMenu->addSeparator();
toMenu->addMenu( dynamic_cast<InstrumentTrackView *>(
m_trackView )->midiMenu() );
>>>>>>> Update coding conventions
toMenu->addMenu( trackView->midiMenu() );
}
if( dynamic_cast<AutomationTrackView *>( m_trackView ) )
{

2
src/gui/TimeLineWidget.cpp
View File

@@ -52,7 +52,7 @@ QPixmap * TimeLineWidget::s_loopPointBeginPixmap = NULL;
QPixmap * TimeLineWidget::s_loopPointEndPixmap = NULL;
TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppt,
Song::playPos & pos, const MidiTime & begin,
Song::PlayPos & pos, const MidiTime & begin,
QWidget * parent ) :
QWidget( parent ),
m_autoScroll( AutoScrollEnabled ),