From d4cd5d8df3d053e7b450ee041f7f961eeeec51b7 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Sat, 17 Jan 2015 04:00:27 +0000
Subject: [PATCH] Fix last merge. Last did not build

---
 app/plaYUVerApp.cpp | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp
index ac061c0..161ca36 100644
--- a/app/plaYUVerApp.cpp
+++ b/app/plaYUVerApp.cpp
@@ -944,7 +944,6 @@ Void plaYUVerApp::createDockWidgets()
   m_arraySideBars.resize( TOTAL_DOCK );
   addDockWidget( Qt::RightDockWidgetArea, m_appModuleVideo->createDock() );
   addDockWidget( Qt::RightDockWidgetArea, m_appModuleQuality->createDock() );
-<<<<<<< HEAD
 }
 
 Void plaYUVerApp::createStatusBar()
@@ -955,47 +954,6 @@ Void plaYUVerApp::createStatusBar()
 }
 
 
-Void plaYUVerApp::addStreamInfoToRecentList( PlaYUVerStreamInfo streamInfo )
-{
-  Int idx = findPlaYUVerStreamInfo( m_aRecentFileStreamInfo, streamInfo.m_cFilename );
-  if( idx >= 0 )
-    m_aRecentFileStreamInfo.remove( idx );
-  m_aRecentFileStreamInfo.prepend( streamInfo );
-  while( m_aRecentFileStreamInfo.size() > MAX_RECENT_FILES )
-    m_aRecentFileStreamInfo.remove( m_aRecentFileStreamInfo.size() - 1 );
-  updateRecentFileActions();
-=======
->>>>>>> devel
-}
-
-Void plaYUVerApp::updateRecentFileActions()
-{
-<<<<<<< HEAD
-  Int numRecentFiles = m_aRecentFileStreamInfo.size();
-  numRecentFiles = qMin( numRecentFiles, MAX_RECENT_FILES );
-  Int actionIdx = 0;
-  while( actionIdx < numRecentFiles )
-  {
-    QString text = m_aRecentFileStreamInfo.at( actionIdx ).m_cFilename;
-    m_arrayRecentFilesActions.at( actionIdx )->setText( QFileInfo( text ).fileName() );
-    m_arrayRecentFilesActions.at( actionIdx )->setToolTip( "Open File " + text );
-    m_arrayRecentFilesActions.at( actionIdx )->setStatusTip( "Open File " + text );
-    m_arrayRecentFilesActions.at( actionIdx )->setData( QVariant::fromValue( m_aRecentFileStreamInfo.at( actionIdx ) ) );
-    m_arrayRecentFilesActions.at( actionIdx )->setVisible( true );
-    actionIdx++;
-  }
-  while( actionIdx < MAX_RECENT_FILES )
-  {
-    m_arrayRecentFilesActions.at( actionIdx )->setVisible( false );
-    actionIdx++;
-  }
-  m_arrayMenu[RECENT_MENU]->setEnabled( m_aRecentFileStreamInfo.size() > 0 ? true : false );
-=======
-  m_appModuleVideo->createStatusBarMessage();
-  //statusBar()->addPermanentWidget( m_appModuleVideo->createStatusBarMessage() );
-  statusBar()->showMessage( tr( "Ready" ) );
->>>>>>> devel
-}
 
 Void plaYUVerApp::addStreamInfoToRecentList( PlaYUVerStreamInfo streamInfo )
 {