Major changes on code

Remove Qt4 support
Change include headers
Change the include of QCustomPlot lib and updated code based on upstream

app/ConfigureFormatDialog.cpp

@@ -45,8 +45,7 @@ QDataStream& operator<<( QDataStream& out, const PlaYUVerStdResolutionVector& ar
 {
   PlaYUVerStdResolution d;
   out << array.size();
-  for( Int i = 0; i < array.size(); i++ )
-  {
+  for( Int i = 0; i < array.size(); i++ ) {
     d = array.at( i );
     out << QString::fromStdString( d.shortName ) << d.uiWidth << d.uiHeight;
   }
@@ -59,8 +58,7 @@ QDataStream& operator>>( QDataStream& in, PlaYUVerStdResolutionVector& array )
   QString auxName;
   Int array_size;
   in >> array_size;
-  for( Int i = 0; i < array_size; i++ )
-  {
+  for( Int i = 0; i < array_size; i++ ) {
     in >> auxName;
     d.shortName = auxName.toStdString();
     in >> d.uiWidth;
@@ -142,8 +140,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   UInt uiWidth, uiHeight;
 
   readSettings();
-  for( Int i = 0; i < aRCustomFileFormats.size(); i++ )
-  {
+  for( Int i = 0; i < aRCustomFileFormats.size(); i++ ) {
     Name = QString::fromStdString( aRCustomFileFormats[i].shortName );
     uiWidth = aRCustomFileFormats[i].uiWidth;
     uiHeight = aRCustomFileFormats[i].uiHeight;
@@ -152,8 +149,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   }
 
   std::vector<PlaYUVerStdResolution> listPlaYUVerStdResolution = PlaYUVerStream::stdResolutionSizes();
-  for( UInt i = 0; i < listPlaYUVerStdResolution.size(); i++ )
-  {
+  for( UInt i = 0; i < listPlaYUVerStdResolution.size(); i++ ) {
     Name = QString::fromStdString( listPlaYUVerStdResolution[i].shortName );
     uiWidth = listPlaYUVerStdResolution[i].uiWidth;
     uiHeight = listPlaYUVerStdResolution[i].uiHeight;
@@ -281,8 +277,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   m_comboBoxPixelFormat->setFont( normalFont );
   m_comboBoxPixelFormat->clear();
 
-  for( UInt i = 0; i < PlaYUVerFrame::supportedColorSpacesListNames().size(); i++ )
-  {
+  for( UInt i = 0; i < PlaYUVerFrame::supportedColorSpacesListNames().size(); i++ ) {
     m_comboBoxColorSpace->insertItem( i, PlaYUVerFrame::supportedColorSpacesListNames()[i].c_str() );
   }
   m_comboBoxColorSpace->setCurrentIndex( 1 );
@@ -379,13 +374,8 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   setFixedSize( MainLayout->sizeHint() );
 }
 
-Int ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename,
-                                                     UInt& rWidth,
-                                                     UInt& rHeight,
-                                                     Int& rInputFormat,
-                                                     UInt& rBits,
-                                                     Int& rEndianess,
-                                                     UInt& rFrameRate )
+Int ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rBits,
+                                                     Int& rEndianess, UInt& rFrameRate )
 {
   // Set default values
   // setWindowTitle( "Configure resolution for " + Filename );
@@ -398,10 +388,8 @@ Int ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename,
   if( rInputFormat >= 0 )
   {
     String pelFmtName = PlaYUVerFrame::supportedPixelFormatListNames()[rInputFormat];
-    for( UInt j = 0; j < PlaYUVerFrame::supportedColorSpacesListNames().size(); j++ )
-    {
-      for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames( j ).size(); i++ )
-      {
+    for( UInt j = 0; j < PlaYUVerFrame::supportedColorSpacesListNames().size(); j++ ) {
+      for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames( j ).size(); i++ ) {
         if( pelFmtName == PlaYUVerFrame::supportedPixelFormatListNames( j )[i] )
         {
           colorSpace = j;
@@ -425,8 +413,7 @@ Int ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename,
   }
   m_spinBoxFrameRate->setValue( rFrameRate );
 
-  for( Int i = 0; i < standardResolutionSizes.size() - 1; i++ )
-  {
+  for( Int i = 0; i < standardResolutionSizes.size() - 1; i++ ) {
     if( standardResolutionSizes.at( i ) == QSize( rWidth, rHeight ) )
     {
       m_comboBoxStandardResolution->setCurrentIndex( i );
@@ -445,8 +432,7 @@ Int ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename,
   colorSpace = m_comboBoxColorSpace->currentIndex();
   sampling = m_comboBoxPixelFormat->currentIndex();
   String pelFmtName = PlaYUVerFrame::supportedPixelFormatListNames( colorSpace )[sampling];
-  for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames().size(); i++ )
-  {
+  for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames().size(); i++ ) {
     if( pelFmtName == PlaYUVerFrame::supportedPixelFormatListNames()[i] )
     {
       rInputFormat = i;
@@ -496,8 +482,7 @@ void ConfigureFormatDialog::slotResolutionChange()
 {
   m_comboBoxStandardResolution->blockSignals( true );
   Int newIdx = -1;
-  for( Int i = 0; i < standardResolutionSizes.size(); i++ )
-  {
+  for( Int i = 0; i < standardResolutionSizes.size(); i++ ) {
     if( standardResolutionSizes.at( i ) == QSize( m_spinBoxWidth->value(), m_spinBoxheight->value() ) )
     {
       newIdx = i;
@@ -514,8 +499,7 @@ Void ConfigureFormatDialog::slotColorSpaceChange( Int idx )
     return;
 
   m_comboBoxPixelFormat->clear();
-  for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames( idx ).size(); i++ )
-  {
+  for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames( idx ).size(); i++ ) {
     m_comboBoxPixelFormat->insertItem( i, PlaYUVerFrame::supportedPixelFormatListNames( idx )[i].c_str() );
   }
   m_comboBoxPixelFormat->setCurrentIndex( 0 );