From 2834bd17f4d1681bdcadf44e1b46b935cb673c71 Mon Sep 17 00:00:00 2001
From: Alexandre <wilson@wil-pc>
Date: Tue, 20 Jan 2015 00:00:58 -0200
Subject: [PATCH] Coding conventions update

---
 include/TimeLineWidget.h   |  2 +-
 include/Track.h            |  4 ----
 src/core/Track.cpp         | 28 +++-------------------------
 src/gui/TimeLineWidget.cpp |  2 +-
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index f8395ec37..417ceb530 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -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();
 
diff --git a/include/Track.h b/include/Track.h
index 4d4b221fc..227abf135 100644
--- a/include/Track.h
+++ b/include/Track.h
@@ -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()
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index 1c64531a8..dd003a6f2 100644
--- a/src/core/Track.cpp
+++ b/src/core/Track.cpp
@@ -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 ) )
 	{
diff --git a/src/gui/TimeLineWidget.cpp b/src/gui/TimeLineWidget.cpp
index bf5db2ed9..953a9cd0b 100644
--- a/src/gui/TimeLineWidget.cpp
+++ b/src/gui/TimeLineWidget.cpp
@@ -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 ),