From 6fe8a0f69e8b0196fc88f7d99bb9f2195780fc79 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Mon, 27 Nov 2017 20:13:05 +0000
Subject: [PATCH] Change format ext api and re-format code

---
 .clang-format                          |    2 +-
 app/AboutDialog.cpp                    |   15 +-
 app/ConfigureFormatDialog.cpp          |   48 +-
 app/FramePropertiesDock.cpp            |   27 +-
 app/HistogramWidget.cpp                |   23 +-
 app/ModuleHandleDock.cpp               |    3 +-
 app/ModulesHandle.cpp                  |  139 +-
 app/ModulesHandle.h                    |    4 +-
 app/ModulesHandleOptDialog.cpp         |    9 +-
 app/PlaYUVerApp.cpp                    |  141 +-
 app/PlaYUVerApp.h                      |    4 +-
 app/PlaYUVerAppAdaptor.cpp             |    6 +-
 app/PlaYUVerAppModuleIf.cpp            |    4 +-
 app/PlaYUVerSubWindowHandle.cpp        |   85 +-
 app/PlotSubWindow.cpp                  |   20 +-
 app/PlotSubWindow.h                    |    4 +-
 app/ProgressBar.cpp                    |    3 +-
 app/QualityHandle.cpp                  |   46 +-
 app/QualityMeasurementSidebar.cpp      |   12 +-
 app/SeekStreamDialog.cpp               |    3 +-
 app/SubWindowAbstract.cpp              |    3 +-
 app/VideoHandle.cpp                    |  109 +-
 app/VideoHandle.h                      |    2 +-
 app/VideoSubWindow.cpp                 |  131 +-
 app/VideoSubWindow.h                   |    7 +-
 app/ViewArea.cpp                       |   15 +-
 app/external/qcustomplot.cpp           | 1878 ++++++++----------------
 app/external/qcustomplot.h             |  243 +--
 app/main.cpp                           |  176 ++-
 lib/CMakeLists.txt                     |    1 +
 lib/PlaYUVerDefs.h                     |    5 +-
 lib/PlaYUVerFrame.cpp                  |  106 +-
 lib/PlaYUVerFramePixelFormats.cpp      |  217 ++-
 lib/PlaYUVerFramePixelFormats.h        |    3 +-
 lib/PlaYUVerOptions.cpp                |   48 +-
 lib/PlaYUVerOptions.h                  |    5 +-
 lib/PlaYUVerPixel.h                    |   14 +-
 lib/PlaYUVerStream.cpp                 |   84 +-
 lib/PlaYUVerStream.h                   |   48 +-
 lib/PlaYUVerStreamHandlerIf.h          |   34 +-
 lib/StreamHandlerLibav.cpp             |   57 +-
 lib/StreamHandlerLibav.h               |    5 +-
 lib/StreamHandlerOpenCV.cpp            |    6 +-
 lib/StreamHandlerOpenCV.h              |    3 -
 lib/StreamHandlerPortableMap.cpp       |   20 +-
 lib/StreamHandlerRaw.cpp               |   16 +
 modules/AbsoluteFrameDifference.cpp    |    8 +-
 modules/DisparityStereoBM.cpp          |    6 +-
 modules/DisparityStereoSGBM.cpp        |    9 +-
 modules/DisparityStereoVar.cpp         |    7 +-
 modules/EightBitsSampling.cpp          |    4 +-
 modules/FilterComponent.cpp            |   12 +-
 modules/FrameCrop.cpp                  |   13 +-
 modules/FrameDifference.cpp            |    7 +-
 modules/FrameMask.cpp                  |    8 +-
 modules/FrameShift.cpp                 |   12 +-
 modules/InterFrameVariance.cpp         |    8 +-
 modules/MeasureOpticalFlowDualTVL1.cpp |   14 +-
 modules/OpticalFlow.cpp                |   14 +-
 modules/SetChromaHalfScale.cpp         |    3 +-
 modules/WeightedPSNR.cpp               |    3 +-
 tools/PlaYUVerTools.cpp                |   39 +-
 62 files changed, 1422 insertions(+), 2579 deletions(-)

diff --git a/.clang-format b/.clang-format
index 8985e75..6e8cf9f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,7 @@
 ---
 Language:        Cpp
 # BasedOnStyle:  Chromium
-ColumnLimit:     100
+ColumnLimit:     150
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
diff --git a/app/AboutDialog.cpp b/app/AboutDialog.cpp
index a4b61f5..a73bad3 100644
--- a/app/AboutDialog.cpp
+++ b/app/AboutDialog.cpp
@@ -37,16 +37,14 @@
 
 AboutDialog::AboutDialog( QWidget* parent ) : QDialog( parent )
 {
-  QPixmap logo = QPixmap( ":/images/playuver-backgroud-logo.png" )
-                     .scaled( QSize( 500, 350 ), Qt::KeepAspectRatio );
+  QPixmap logo = QPixmap( ":/images/playuver-backgroud-logo.png" ).scaled( QSize( 500, 350 ), Qt::KeepAspectRatio );
   QLabel* pixmapLabel = new QLabel;
   pixmapLabel->setPixmap( logo );
 
-  QLabel* label =
-      new QLabel( QString( "<h1 style='text-align:center'>%1 Version %2</h1><h2>%3</h2>" )
-                      .arg( QApplication::applicationName() )
-                      .arg( QApplication::applicationVersion() )
-                      .arg( tr( "Enhanced open-source Qt-based raw video player" ) ) );
+  QLabel* label = new QLabel( QString( "<h1 style='text-align:center'>%1 Version %2</h1><h2>%3</h2>" )
+                                  .arg( QApplication::applicationName() )
+                                  .arg( QApplication::applicationVersion() )
+                                  .arg( tr( "Enhanced open-source Qt-based raw video player" ) ) );
   label->setWordWrap( true );
 
   QString featuresList = QStringLiteral( "<p><b>Features:</b><ul>" );
@@ -64,8 +62,7 @@ AboutDialog::AboutDialog( QWidget* parent ) : QDialog( parent )
 
   QLabel* labelFeatures = new QLabel( featuresList );
 
-  QLabel* labelCopyright =
-      new QLabel( QStringLiteral( "Copyright © 2014–2017 Luis Lucas and Joao Carreira" ) );
+  QLabel* labelCopyright = new QLabel( QStringLiteral( "Copyright © 2014–2017 Luis Lucas and Joao Carreira" ) );
 
   QWidget* topWidget = new QWidget;
   QVBoxLayout* topLayout = new QVBoxLayout;
diff --git a/app/ConfigureFormatDialog.cpp b/app/ConfigureFormatDialog.cpp
index dd8941e..f5a2d65 100644
--- a/app/ConfigureFormatDialog.cpp
+++ b/app/ConfigureFormatDialog.cpp
@@ -147,20 +147,17 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
     Name = QString::fromStdString( aRCustomFileFormats[i].shortName );
     uiWidth = aRCustomFileFormats[i].uiWidth;
     uiHeight = aRCustomFileFormats[i].uiHeight;
-    standardResolutionNames.append(
-        QString( "%1 (%2x%3)" ).arg( Name ).arg( uiWidth ).arg( uiHeight ) );
+    standardResolutionNames.append( QString( "%1 (%2x%3)" ).arg( Name ).arg( uiWidth ).arg( uiHeight ) );
     standardResolutionSizes.append( QSize( uiWidth, uiHeight ) );
   }
 
-  std::vector<PlaYUVerStdResolution> listPlaYUVerStdResolution =
-      PlaYUVerStream::stdResolutionSizes();
+  std::vector<PlaYUVerStdResolution> listPlaYUVerStdResolution = PlaYUVerStream::stdResolutionSizes();
   for( UInt i = 0; i < listPlaYUVerStdResolution.size(); i++ )
   {
     Name = QString::fromStdString( listPlaYUVerStdResolution[i].shortName );
     uiWidth = listPlaYUVerStdResolution[i].uiWidth;
     uiHeight = listPlaYUVerStdResolution[i].uiHeight;
-    standardResolutionNames.append(
-        QString( "%1 (%2x%3)" ).arg( Name ).arg( uiWidth ).arg( uiHeight ) );
+    standardResolutionNames.append( QString( "%1 (%2x%3)" ).arg( Name ).arg( uiWidth ).arg( uiHeight ) );
     standardResolutionSizes.append( QSize( uiWidth, uiHeight ) );
   }
 
@@ -208,8 +205,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   m_labelFilename = new QLabel();
   m_labelFilename->setFont( titleFont );
   filenameLayout->addWidget( filenameLabel );
-  filenameLayout->addItem(
-      new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  filenameLayout->addItem( new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
   filenameLayout->addWidget( m_labelFilename );
   MainLayout->addLayout( filenameLayout );
 
@@ -287,19 +283,16 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
 
   for( UInt i = 0; i < PlaYUVerFrame::supportedColorSpacesListNames().size(); i++ )
   {
-    m_comboBoxColorSpace->insertItem( i,
-                                      PlaYUVerFrame::supportedColorSpacesListNames()[i].c_str() );
+    m_comboBoxColorSpace->insertItem( i, PlaYUVerFrame::supportedColorSpacesListNames()[i].c_str() );
   }
   m_comboBoxColorSpace->setCurrentIndex( 1 );
 
   pixelGridLayout->addWidget( colorSpaceLabel, 0, 0 );
-  pixelGridLayout->addItem( new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ),
-                            0, 1 );
+  pixelGridLayout->addItem( new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
   pixelGridLayout->addWidget( m_comboBoxColorSpace, 0, 2 );
 
   pixelGridLayout->addWidget( pixelFormatLabel, 1, 0 );
-  pixelGridLayout->addItem( new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ),
-                            1, 1 );
+  pixelGridLayout->addItem( new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ), 1, 1 );
   pixelGridLayout->addWidget( m_comboBoxPixelFormat, 1, 2 );
 
   QLabel* bitsPerPelLabel = new QLabel();
@@ -311,8 +304,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   m_spinBoxBits->setRange( 0, 16 );
   m_spinBoxBits->setValue( 8 );
   pixelGridLayout->addWidget( bitsPerPelLabel, 2, 0 );
-  pixelGridLayout->addItem( new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ),
-                            2, 1 );
+  pixelGridLayout->addItem( new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ), 2, 1 );
   pixelGridLayout->addWidget( m_spinBoxBits, 2, 2 );
 
   /*
@@ -329,8 +321,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   m_comboBoxEndianness->addItem( QStringLiteral( "Big Endian" ) );
   m_comboBoxEndianness->addItem( QStringLiteral( "Little Endian" ) );
   endiannessLayout->addWidget( endiannessLabel );
-  endiannessLayout->addItem(
-      new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  endiannessLayout->addItem( new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
   endiannessLayout->addWidget( m_comboBoxEndianness );
   m_widgetEndianness = new QWidget();
   m_widgetEndianness->setContentsMargins( 0, 0, 0, 0 );
@@ -350,8 +341,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   m_spinBoxFrameRate->setRange( 0, 1000 );
   m_spinBoxFrameRate->setValue( 30 );
   framerateFormatLayout->addWidget( framerateFormatLabel );
-  framerateFormatLayout->addItem(
-      new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  framerateFormatLayout->addItem( new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
   framerateFormatLayout->addWidget( m_spinBoxFrameRate );
   QWidget* framerateWidget = new QWidget();
   framerateWidget->setContentsMargins( 0, 0, 0, 0 );
@@ -375,12 +365,10 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
   MainLayout->addItem( new QSpacerItem( 10, 5, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
   MainLayout->addWidget( dialogButtonOkCancel );
 
-  connect( m_comboBoxStandardResolution, SIGNAL( currentIndexChanged( int ) ), this,
-           SLOT( slotStandardResolutionSelected( int ) ) );
+  connect( m_comboBoxStandardResolution, SIGNAL( currentIndexChanged( int ) ), this, SLOT( slotStandardResolutionSelected( int ) ) );
   connect( m_spinBoxWidth, SIGNAL( valueChanged( int ) ), this, SLOT( slotResolutionChange() ) );
   connect( m_spinBoxheight, SIGNAL( valueChanged( int ) ), this, SLOT( slotResolutionChange() ) );
-  connect( m_comboBoxColorSpace, SIGNAL( currentIndexChanged( int ) ), this,
-           SLOT( slotColorSpaceChange( int ) ) );
+  connect( m_comboBoxColorSpace, SIGNAL( currentIndexChanged( int ) ), this, SLOT( slotColorSpaceChange( int ) ) );
   connect( m_spinBoxBits, SIGNAL( valueChanged( int ) ), this, SLOT( slotBitsChange( int ) ) );
 
   connect( dialogButtonOkCancel, SIGNAL( accepted() ), this, SLOT( accept() ) );
@@ -482,11 +470,9 @@ void ConfigureFormatDialog::slotStandardResolutionSelected( Int idx )
     if( customResolution.shortName != "" )
     {
       QString name = QString::fromStdString( customResolution.shortName );
-      name.append(
-          QString( " (%2x%3)" ).arg( customResolution.uiWidth ).arg( customResolution.uiHeight ) );
+      name.append( QString( " (%2x%3)" ).arg( customResolution.uiWidth ).arg( customResolution.uiHeight ) );
       standardResolutionNames.insert( 0, name );
-      standardResolutionSizes.insert(
-          0, QSize( customResolution.uiWidth, customResolution.uiHeight ) );
+      standardResolutionSizes.insert( 0, QSize( customResolution.uiWidth, customResolution.uiHeight ) );
 
       m_comboBoxStandardResolution->blockSignals( true );
       m_comboBoxStandardResolution->insertItem( 0, name );
@@ -512,8 +498,7 @@ void ConfigureFormatDialog::slotResolutionChange()
   Int newIdx = -1;
   for( Int i = 0; i < standardResolutionSizes.size(); i++ )
   {
-    if( standardResolutionSizes.at( i ) ==
-        QSize( m_spinBoxWidth->value(), m_spinBoxheight->value() ) )
+    if( standardResolutionSizes.at( i ) == QSize( m_spinBoxWidth->value(), m_spinBoxheight->value() ) )
     {
       newIdx = i;
       break;
@@ -531,8 +516,7 @@ Void ConfigureFormatDialog::slotColorSpaceChange( Int idx )
   m_comboBoxPixelFormat->clear();
   for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames( idx ).size(); i++ )
   {
-    m_comboBoxPixelFormat->insertItem(
-        i, PlaYUVerFrame::supportedPixelFormatListNames( idx )[i].c_str() );
+    m_comboBoxPixelFormat->insertItem( i, PlaYUVerFrame::supportedPixelFormatListNames( idx )[i].c_str() );
   }
   m_comboBoxPixelFormat->setCurrentIndex( 0 );
 }
diff --git a/app/FramePropertiesDock.cpp b/app/FramePropertiesDock.cpp
index 2c9e426..7c4854d 100644
--- a/app/FramePropertiesDock.cpp
+++ b/app/FramePropertiesDock.cpp
@@ -27,8 +27,7 @@
 #include <QtGui>
 #include <cmath>
 
-FramePropertiesDock::FramePropertiesDock( QWidget* parent, Bool* pbMainPlaySwitch )
-    : QWidget( parent ), m_pbIsPlaying( pbMainPlaySwitch )
+FramePropertiesDock::FramePropertiesDock( QWidget* parent, Bool* pbMainPlaySwitch ) : QWidget( parent ), m_pbIsPlaying( pbMainPlaySwitch )
 {
   // -------------- Variables definition --------------
   m_pcFrame = NULL;
@@ -240,19 +239,13 @@ FramePropertiesDock::FramePropertiesDock( QWidget* parent, Bool* pbMainPlaySwitc
   setEnabled( false );
 
   connect( channelCB, SIGNAL( activated( int ) ), this, SLOT( slotChannelChanged( int ) ) );
-  connect( scaleButtonGroup, SIGNAL( buttonClicked( int ) ), this,
-           SLOT( slotScaleChanged( int ) ) );
+  connect( scaleButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( slotScaleChanged( int ) ) );
   connect( colorsCB, SIGNAL( activated( int ) ), this, SLOT( slotColorsChanged( int ) ) );
-  connect( renderingButtonGroup, SIGNAL( buttonClicked( int ) ), this,
-           SLOT( slotRenderingChanged( int ) ) );
-  connect( histogramWidget, SIGNAL( signalIntervalChanged( int, int ) ), this,
-           SLOT( slotUpdateInterval( int, int ) ) );
-  connect( histogramWidget, SIGNAL( signalMaximumValueChanged( int ) ), this,
-           SLOT( slotUpdateIntervRange( int ) ) );
-  connect( histogramWidget, SIGNAL( signalHistogramComputationDone( int ) ), this,
-           SLOT( slotRefreshOptions( int ) ) );
-  connect( histogramWidget, SIGNAL( signalHistogramComputationFailed( void ) ), this,
-           SLOT( slotHistogramComputationFailed( void ) ) );
+  connect( renderingButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( slotRenderingChanged( int ) ) );
+  connect( histogramWidget, SIGNAL( signalIntervalChanged( int, int ) ), this, SLOT( slotUpdateInterval( int, int ) ) );
+  connect( histogramWidget, SIGNAL( signalMaximumValueChanged( int ) ), this, SLOT( slotUpdateIntervRange( int ) ) );
+  connect( histogramWidget, SIGNAL( signalHistogramComputationDone( int ) ), this, SLOT( slotRefreshOptions( int ) ) );
+  connect( histogramWidget, SIGNAL( signalHistogramComputationFailed( void ) ), this, SLOT( slotHistogramComputationFailed( void ) ) );
   connect( minInterv, SIGNAL( valueChanged( int ) ), this, SLOT( slotMinValueChanged( int ) ) );
   connect( maxInterv, SIGNAL( valueChanged( int ) ), this, SLOT( slotMaxValueChanged( int ) ) );
 }
@@ -392,8 +385,7 @@ Void FramePropertiesDock::setSelection( const QRect& selectionArea )
         {
           delete m_pcSelectedFrame;
         }
-        m_pcSelectedFrame = new PlaYUVerFrame( m_pcFrame, selectionArea.x(), selectionArea.y(),
-                                               selectionArea.width(), selectionArea.height() );
+        m_pcSelectedFrame = new PlaYUVerFrame( m_pcFrame, selectionArea.x(), selectionArea.y(), selectionArea.width(), selectionArea.height() );
       }
       updateDataHistogram();
       selectionImageButton->click();
@@ -460,8 +452,7 @@ Void FramePropertiesDock::updateStatistiques()
 
   if( frame )
   {
-    QString rangeText = "[" + QString::number( frame->getMin( channel ) ) + ":" +
-                        QString::number( frame->getMax( channel ) ) + "]";
+    QString rangeText = "[" + QString::number( frame->getMin( channel ) ) + ":" + QString::number( frame->getMax( channel ) ) + "]";
     labelRangeValue->setText( rangeText );
 
     double mean = frame->getMean( channel, min, max );
diff --git a/app/HistogramWidget.cpp b/app/HistogramWidget.cpp
index 3c1eed3..0ddef0c 100644
--- a/app/HistogramWidget.cpp
+++ b/app/HistogramWidget.cpp
@@ -177,8 +177,7 @@ HistogramWidget::HistogramWidget( Int width, Int height, QWidget* parent ) : QWi
   m_colorType = FirstChannelColor;
   m_renderingType = FullImageHistogram;
 
-  setOptions( HistogramWidget::BlinkComputation | HistogramWidget::SelectMode |
-              HistogramWidget::ShowLumaChannel );
+  setOptions( HistogramWidget::BlinkComputation | HistogramWidget::SelectMode | HistogramWidget::ShowLumaChannel );
 
   setMouseTracking( true );
   setMinimumSize( width, height );
@@ -434,22 +433,21 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
   // or loading, but no message shall be drawn:
   // Drawing grayed frame.
   if( !isEnabled() || d->clearFlag == HistogramWidgetPrivate::HistogramNone ||
-      ( !d->blinkComputation && ( d->clearFlag == HistogramWidgetPrivate::HistogramStarted ||
-                                  d->clearFlag == HistogramWidgetPrivate::HistogramDataLoading ) ) )
+      ( !d->blinkComputation &&
+        ( d->clearFlag == HistogramWidgetPrivate::HistogramStarted || d->clearFlag == HistogramWidgetPrivate::HistogramDataLoading ) ) )
   {
     QPainter p1( this );
 
     p1.fillRect( 0, 0, maxX, maxY, palette().color( QPalette::Disabled, QPalette::Window ) );
-    p1.setPen(
-        QPen( palette().color( QPalette::Disabled, QPalette::WindowText ), 1, Qt::SolidLine ) );
+    p1.setPen( QPen( palette().color( QPalette::Disabled, QPalette::WindowText ), 1, Qt::SolidLine ) );
     p1.drawRect( 0, 0, maxX, maxY );
 
     return;
   }
   // Image data is loading or histogram is being computed:
   // Draw message.
-  else if( d->blinkComputation && ( d->clearFlag == HistogramWidgetPrivate::HistogramStarted ||
-                                    d->clearFlag == HistogramWidgetPrivate::HistogramDataLoading ) )
+  else if( d->blinkComputation &&
+           ( d->clearFlag == HistogramWidgetPrivate::HistogramStarted || d->clearFlag == HistogramWidgetPrivate::HistogramDataLoading ) )
   {
     QPainter p1( this );
 
@@ -463,8 +461,7 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
     if( d->clearFlag == HistogramWidgetPrivate::HistogramDataLoading )
       p1.drawText( 0, 0, maxX, maxY, Qt::AlignCenter, tr( "Loading image..." ) );
     else
-      p1.drawText( 0, 0, maxX, maxY, Qt::AlignCenter,
-                   tr( "Histogram\ncalculation\nin progress..." ) );
+      p1.drawText( 0, 0, maxX, maxY, Qt::AlignCenter, tr( "Histogram\ncalculation\nin progress..." ) );
 
     return;
   }
@@ -529,8 +526,7 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
     break;
 
   case HistogramWidget::ColorChannelsHistogram:  // All color channels.
-    max = qMax( qMax( frame->getMaximum( LUMA ), frame->getMaximum( CHROMA_U ) ),
-                frame->getMaximum( CHROMA_V ) );
+    max = qMax( qMax( frame->getMaximum( LUMA ), frame->getMaximum( CHROMA_U ) ), frame->getMaximum( CHROMA_V ) );
     break;
     //   case HistogramWidget::LumaHistogram:            // Luminance.
     //     max = frame->getMaximum( LUMA );
@@ -1058,8 +1054,7 @@ Void HistogramWidget::mouseMoveEvent( QMouseEvent* e )
 
 Void HistogramWidget::notifyValuesChanged()
 {
-  emit signalIntervalChanged( (int)( d->xmin * d->range ),
-                              d->xmax == 0.0 ? d->range : (int)( d->xmax * d->range ) );
+  emit signalIntervalChanged( (int)( d->xmin * d->range ), d->xmax == 0.0 ? d->range : (int)( d->xmax * d->range ) );
 }
 
 Void HistogramWidget::slotMinValueChanged( int min )
diff --git a/app/ModuleHandleDock.cpp b/app/ModuleHandleDock.cpp
index aac0ce9..b7a2ad0 100644
--- a/app/ModuleHandleDock.cpp
+++ b/app/ModuleHandleDock.cpp
@@ -27,8 +27,7 @@
 #include "PlaYUVerAppModuleIf.h"
 #include <QtGui>
 
-ModuleHandleDock::ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* moduleIf )
-    : QWidget( parent ), m_pcCurrModuleIf( moduleIf )
+ModuleHandleDock::ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* moduleIf ) : QWidget( parent ), m_pcCurrModuleIf( moduleIf )
 {
   // ----------------- Dock definition -----------------
 
diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp
index 7cd55ec..22600f0 100644
--- a/app/ModulesHandle.cpp
+++ b/app/ModulesHandle.cpp
@@ -32,13 +32,8 @@
 #include "modules/PlaYUVerModuleFactory.h"
 #include <cstdio>
 
-ModulesHandle::ModulesHandle( QWidget* parent,
-                              PlaYUVerSubWindowHandle* windowManager,
-                              VideoHandle* moduleVideo )
-    : QWidget( parent )
-    , m_pcParent( parent )
-    , m_pcMainWindowManager( windowManager )
-    , m_appModuleVideo( moduleVideo )
+ModulesHandle::ModulesHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager, VideoHandle* moduleVideo )
+    : QWidget( parent ), m_pcParent( parent ), m_pcMainWindowManager( windowManager ), m_appModuleVideo( moduleVideo )
 {
   setParent( m_pcParent );
 }
@@ -60,8 +55,7 @@ Void ModulesHandle::createActions()
 
   m_arrayActions[LOAD_EXTERNAL_ACT] = new QAction( "Load external module", parent() );
   m_arrayActions[LOAD_EXTERNAL_ACT]->setStatusTip( "Load an externally build module" );
-  connect( m_arrayActions[LOAD_EXTERNAL_ACT], SIGNAL( triggered() ), this,
-           SLOT( loadExternalModule() ) );
+  connect( m_arrayActions[LOAD_EXTERNAL_ACT], SIGNAL( triggered() ), this, SLOT( loadExternalModule() ) );
 
   m_arrayActions[APPLY_ALL_ACT] = new QAction( "Apply to All", parent() );
   m_arrayActions[APPLY_ALL_ACT]->setStatusTip( "Apply module to all frames and save the result" );
@@ -70,17 +64,14 @@ Void ModulesHandle::createActions()
 
   m_arrayActions[SWAP_FRAMES_ACT] = new QAction( "Swap frames", parent() );
   m_arrayActions[SWAP_FRAMES_ACT]->setStatusTip( "Swap Sub Window order" );
-  connect( m_arrayActions[SWAP_FRAMES_ACT], SIGNAL( triggered() ), m_pcActionMapper,
-           SLOT( map() ) );
+  connect( m_arrayActions[SWAP_FRAMES_ACT], SIGNAL( triggered() ), m_pcActionMapper, SLOT( map() ) );
   m_pcActionMapper->setMapping( m_arrayActions[SWAP_FRAMES_ACT], SWAP_FRAMES_ACT );
 
   m_arrayActions[DISABLE_ACT] = new QAction( "Disable Modules", parent() );
-  connect( m_arrayActions[DISABLE_ACT], SIGNAL( triggered() ), this,
-           SLOT( destroyWindowModules() ) );
+  connect( m_arrayActions[DISABLE_ACT], SIGNAL( triggered() ), this, SLOT( destroyWindowModules() ) );
 
   m_arrayActions[DISABLE_ALL_ACT] = new QAction( "Disable All Modules", parent() );
-  connect( m_arrayActions[DISABLE_ALL_ACT], SIGNAL( triggered() ), this,
-           SLOT( destroyAllModulesIf() ) );
+  connect( m_arrayActions[DISABLE_ALL_ACT], SIGNAL( triggered() ), this, SLOT( destroyAllModulesIf() ) );
 
   m_arrayActions[FORCE_NEW_WINDOW_ACT] = new QAction( "Use New Window", parent() );
   m_arrayActions[FORCE_NEW_WINDOW_ACT]->setStatusTip(
@@ -123,8 +114,7 @@ Void ModulesHandle::buildMenu()
     {
       for( Int j = 0; j < m_pcModulesSubMenuList.size(); j++ )
       {
-        if( m_pcModulesSubMenuList.at( j )->title() ==
-            QString( pcCurrModuleIf->m_pchModuleCategory ) )
+        if( m_pcModulesSubMenuList.at( j )->title() == QString( pcCurrModuleIf->m_pchModuleCategory ) )
         {
           currSubMenu = m_pcModulesSubMenuList.at( j );
           break;
@@ -163,8 +153,7 @@ Void ModulesHandle::buildMenu()
 
 Void ModulesHandle::updateMenus()
 {
-  VideoSubWindow* pcSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   Bool hasSubWindow = pcSubWindow ? true : false;
   QAction* currModuleAction;
 
@@ -207,21 +196,18 @@ Void ModulesHandle::updateMenus()
 Void ModulesHandle::readSettings()
 {
   QSettings appSettings;
-  m_arrayActions[FORCE_NEW_WINDOW_ACT]->setChecked(
-      appSettings.value( "ModulesHandle/UseNewWindow", false ).toBool() );
+  m_arrayActions[FORCE_NEW_WINDOW_ACT]->setChecked( appSettings.value( "ModulesHandle/UseNewWindow", false ).toBool() );
 }
 
 Void ModulesHandle::writeSettings()
 {
   QSettings appSettings;
-  appSettings.setValue( "ModulesHandle/UseNewWindow",
-                        m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() );
+  appSettings.setValue( "ModulesHandle/UseNewWindow", m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() );
 }
 
 Void ModulesHandle::processOpt( Int index )
 {
-  VideoSubWindow* pcSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcSubWindow )
   {
     PlaYUVerAppModuleIf* pcCurrentModule = pcSubWindow->getDisplayModule();
@@ -254,8 +240,7 @@ Void ModulesHandle::loadExternalModule()
   formatsList << "Shared Libraries (*.so)";
   QStringList filter;
   filter << supported << formatsList << tr( "All Files (*)" );
-  QStringList fileNames = QFileDialog::getOpenFileNames( m_pcParent, tr( "Open File" ), QString(),
-                                                         filter.join( ";;" ) );
+  QStringList fileNames = QFileDialog::getOpenFileNames( m_pcParent, tr( "Open File" ), QString(), filter.join( ";;" ) );
 
   for( Int i = 0; i < fileNames.size(); i++ )
   {
@@ -271,24 +256,20 @@ Void ModulesHandle::activateModule()
   Qt::KeyboardModifiers keyModifiers = QApplication::keyboardModifiers();
   Bool bTmpForceNewWindow = false;
 
-  VideoSubWindow* pcVideoSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcVideoSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( !pcVideoSubWindow )
   {
     return;
   }
 
-  if( ( keyModifiers & Qt::ControlModifier ) ||
-      pcVideoSubWindow->checkCategory( VideoSubWindow::MODULE_SUBWINDOW ) )
+  if( ( keyModifiers & Qt::ControlModifier ) || pcVideoSubWindow->checkCategory( VideoSubWindow::MODULE_SUBWINDOW ) )
   {
     bTmpForceNewWindow = true;
   }
 
   QString ModuleIfName = pcAction->data().toString();
-  PlaYUVerModuleIf* pcCurrModuleIf =
-      PlaYUVerModuleFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() );
-  PlaYUVerAppModuleIf* pcCurrAppModuleIf =
-      new PlaYUVerAppModuleIf( this, pcAction, pcCurrModuleIf );
+  PlaYUVerModuleIf* pcCurrModuleIf = PlaYUVerModuleFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() );
+  PlaYUVerAppModuleIf* pcCurrAppModuleIf = new PlaYUVerAppModuleIf( this, pcAction, pcCurrModuleIf );
 
   QList<VideoSubWindow*> videoSubWindowList;
   Int numberOfFrames = pcCurrAppModuleIf->m_pcModule->m_uiNumberOfFrames;
@@ -301,11 +282,9 @@ Void ModulesHandle::activateModule()
       minNumFrames = 0;
       maxNumFrames = 255;
     }
-    DialogSubWindowSelector dialogWindowsSelection( m_pcParent, m_pcMainWindowManager,
-                                                    SubWindowAbstract::VIDEO_SUBWINDOW,
-                                                    minNumFrames, maxNumFrames );
-    QList<SubWindowAbstract*> windowsList =
-        m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+    DialogSubWindowSelector dialogWindowsSelection( m_pcParent, m_pcMainWindowManager, SubWindowAbstract::VIDEO_SUBWINDOW, minNumFrames,
+                                                    maxNumFrames );
+    QList<SubWindowAbstract*> windowsList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
 
     if( windowsList.size() == minNumFrames && windowsList.size() == maxNumFrames )
     {
@@ -343,12 +322,10 @@ Void ModulesHandle::activateModule()
       // Check for same fmt in more than one frame modules
       for( Int i = 1; i < videoSubWindowList.size(); i++ )
       {
-        if( !videoSubWindowList.at( i )->getCurrFrame()->haveSameFmt(
-                videoSubWindowList.at( 0 )->getCurrFrame() ) )
+        if( !videoSubWindowList.at( i )->getCurrFrame()->haveSameFmt( videoSubWindowList.at( 0 )->getCurrFrame() ) )
         {
           videoSubWindowList.clear();
-          qobject_cast<PlaYUVerApp*>( m_pcParent )
-              ->printMessage( "Error! Incompatible frames", LOG_ERROR );
+          qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Error! Incompatible frames", LOG_ERROR );
           destroyModuleIf( pcCurrAppModuleIf );
           return;
         }
@@ -362,8 +339,7 @@ Void ModulesHandle::activateModule()
 
   if( videoSubWindowList.size() == 0 )
   {
-    qobject_cast<PlaYUVerApp*>( m_pcParent )
-        ->printMessage( "Error! There is no windows to apply the module", LOG_ERROR );
+    qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Error! There is no windows to apply the module", LOG_ERROR );
     destroyModuleIf( pcCurrAppModuleIf );
     return;
   }
@@ -378,34 +354,29 @@ Void ModulesHandle::activateModule()
     ModulesHandleOptDialog moduleOptDialog( m_pcParent, pcCurrAppModuleIf );
     if( moduleOptDialog.runConfiguration() == QDialog::Rejected )
     {
-      qobject_cast<PlaYUVerApp*>( m_pcParent )
-          ->printMessage( "Module canceled by user!", LOG_WARNINGS );
+      qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Module canceled by user!", LOG_WARNINGS );
       destroyModuleIf( pcCurrAppModuleIf );
       return;
     }
   }
 
-  Bool bShowModulesNewWindow =
-      m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() | bTmpForceNewWindow;
+  Bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() | bTmpForceNewWindow;
 
   QString windowName;
 
   VideoSubWindow* pcModuleSubWindow = NULL;
   if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == FRAME_PROCESSING_MODULE )
   {
-    if( ( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) ||
-        bShowModulesNewWindow )
+    if( ( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
     {
       pcModuleSubWindow = new VideoSubWindow( VideoSubWindow::MODULE_SUBWINDOW );
       windowName.append( QStringLiteral( "Module " ) );
       windowName.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
 
-      connect( pcModuleSubWindow->getViewArea(), SIGNAL( selectionChanged( QRect ) ),
-               m_appModuleVideo, SLOT( updateSelectionArea( QRect ) ) );
-      connect( pcModuleSubWindow, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ),
-               m_appModuleVideo, SLOT( zoomToFactorAll( double, QPoint ) ) );
-      connect( pcModuleSubWindow, SIGNAL( scrollBarMoved_SWindow( const QPoint ) ),
-               m_appModuleVideo, SLOT( moveAllScrollBars( const QPoint ) ) );
+      connect( pcModuleSubWindow->getViewArea(), SIGNAL( selectionChanged( QRect ) ), m_appModuleVideo, SLOT( updateSelectionArea( QRect ) ) );
+      connect( pcModuleSubWindow, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ), m_appModuleVideo,
+               SLOT( zoomToFactorAll( double, QPoint ) ) );
+      connect( pcModuleSubWindow, SIGNAL( scrollBarMoved_SWindow( const QPoint ) ), m_appModuleVideo, SLOT( moveAllScrollBars( const QPoint ) ) );
 
       pcCurrAppModuleIf->m_pcDisplaySubWindow = pcModuleSubWindow;
     }
@@ -418,13 +389,10 @@ Void ModulesHandle::activateModule()
     titleDockWidget.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
     titleDockWidget.append( " Information" );
     pcCurrAppModuleIf->m_pcDockWidget = new QDockWidget( titleDockWidget, m_pcParent );
-    pcCurrAppModuleIf->m_pcDockWidget->setFeatures( QDockWidget::DockWidgetMovable |
-                                                    QDockWidget::DockWidgetFloatable );
-    pcCurrAppModuleIf->m_pcDockWidget->setAllowedAreas( Qt::LeftDockWidgetArea |
-                                                        Qt::RightDockWidgetArea );
+    pcCurrAppModuleIf->m_pcDockWidget->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
+    pcCurrAppModuleIf->m_pcDockWidget->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
     pcCurrAppModuleIf->m_pcDockWidget->setWidget( pcCurrAppModuleIf->m_pcModuleDock );
-    qobject_cast<QMainWindow*>( m_pcParent )
-        ->addDockWidget( Qt::RightDockWidgetArea, pcCurrAppModuleIf->m_pcDockWidget );
+    qobject_cast<QMainWindow*>( m_pcParent )->addDockWidget( Qt::RightDockWidgetArea, pcCurrAppModuleIf->m_pcDockWidget );
   }
 
   // Associate module with subwindows
@@ -461,8 +429,7 @@ Void ModulesHandle::activateModule()
 
   if( !moduleCreated )
   {
-    qobject_cast<PlaYUVerApp*>( m_pcParent )
-        ->printMessage( "Error! Module cannot be created", LOG_ERROR );
+    qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Error! Module cannot be created", LOG_ERROR );
     destroyModuleIf( pcCurrAppModuleIf );
     return;
   }
@@ -499,8 +466,7 @@ Void ModulesHandle::destroyModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
 
 Void ModulesHandle::destroyWindowModules()
 {
-  VideoSubWindow* pcVideoSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcVideoSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcVideoSubWindow )
   {
     pcVideoSubWindow->disableModule();
@@ -517,9 +483,7 @@ Void ModulesHandle::destroyAllModulesIf()
   emit changed();
 }
 
-Void ModulesHandle::applyModuleIf( QList<PlaYUVerAppModuleIf*> pcCurrModuleIfList,
-                                   Bool isPlaying,
-                                   Bool disableThreads )
+Void ModulesHandle::applyModuleIf( QList<PlaYUVerAppModuleIf*> pcCurrModuleIfList, Bool isPlaying, Bool disableThreads )
 {
   for( Int i = 0; i < pcCurrModuleIfList.size() && !isPlaying; i++ )
   {
@@ -538,26 +502,32 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
 
       QString supported = tr( "Supported Files (" );
       QStringList formatsList;
-
       std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedWriteFormats();
+
       for( UInt i = 0; i < supportedFmts.size(); i++ )
       {
-        QString currFmt;
-        supported.append( " *." );
-        supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
-        currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
-        currFmt.append( " (*." );
-        currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
-        currFmt.append( ")" );
-        formatsList << currFmt;
+        std::vector<String> arrayExt = supportedFmts[i].getExts();
+        if( arrayExt.size() > 0 )
+        {
+          QString currFmt( QString::fromStdString( supportedFmts[i].formatName ) );
+          currFmt.append( " (" );
+          for( std::vector<String>::iterator e = arrayExt.begin(); e != arrayExt.end(); ++e )
+          {
+            supported.append( " *." );
+            currFmt.append( "*." );
+            supported.append( QString::fromStdString( *e ) );
+            currFmt.append( QString::fromStdString( *e ) );
+          }
+          currFmt.append( ")" );
+          formatsList << currFmt;
+        }
       }
       supported.append( " )" );
 
       QStringList filter;
       filter << supported << formatsList << tr( "All Files (*)" );
 
-      QString fileName = QFileDialog::getSaveFileName( m_pcParent, tr( "Open File" ), QString(),
-                                                       filter.join( ";;" ) );
+      QString fileName = QFileDialog::getSaveFileName( m_pcParent, tr( "Open File" ), QString(), filter.join( ";;" ) );
 
       Width = pcCurrModuleIf->m_pcProcessedFrame->getWidth();
       Height = pcCurrModuleIf->m_pcProcessedFrame->getHeight();
@@ -566,9 +536,8 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
       FrameRate = pcCurrModuleIf->m_pcSubWindow[0]->getInputStream()->getFrameRate();
 
       pcCurrModuleIf->m_pcModuleStream = new PlaYUVerStream;
-      if( !pcCurrModuleIf->m_pcModuleStream->open( fileName.toStdString(), Width, Height,
-                                                   InputFormat, BitsPixel, PLAYUVER_LITTLE_ENDIAN,
-                                                   FrameRate, false ) )
+      if( !pcCurrModuleIf->m_pcModuleStream->open( fileName.toStdString(), Width, Height, InputFormat, BitsPixel, PLAYUVER_LITTLE_ENDIAN, FrameRate,
+                                                   false ) )
       {
         delete pcCurrModuleIf->m_pcModuleStream;
         pcCurrModuleIf->m_pcModuleStream = NULL;
diff --git a/app/ModulesHandle.h b/app/ModulesHandle.h
index 5a1e090..3f24ca3 100644
--- a/app/ModulesHandle.h
+++ b/app/ModulesHandle.h
@@ -61,9 +61,7 @@ public:
   Void writeSettings();
 
   static Void destroyModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf );
-  static Void applyModuleIf( QList<PlaYUVerAppModuleIf*> pcCurrModuleIfList,
-                             Bool isPlaying = false,
-                             Bool disableThreads = false );
+  static Void applyModuleIf( QList<PlaYUVerAppModuleIf*> pcCurrModuleIfList, Bool isPlaying = false, Bool disableThreads = false );
 
 private:
   QWidget* m_pcParent;
diff --git a/app/ModulesHandleOptDialog.cpp b/app/ModulesHandleOptDialog.cpp
index 383d87e..401abe3 100644
--- a/app/ModulesHandleOptDialog.cpp
+++ b/app/ModulesHandleOptDialog.cpp
@@ -76,20 +76,17 @@ private:
   String m_cName;
 };
 
-ModulesHandleOptDialog::ModulesHandleOptDialog( QWidget* parent,
-                                                PlaYUVerAppModuleIf* pcCurrModuleIf )
+ModulesHandleOptDialog::ModulesHandleOptDialog( QWidget* parent, PlaYUVerAppModuleIf* pcCurrModuleIf )
     : QDialog( parent ), m_pcCurrModuleIf( pcCurrModuleIf )
 {
   resize( 400, 10 );
   setWindowTitle( "Select module parameters" );
 
-  const PlaYUVerOptions::OptionsList& moduleOptions =
-      m_pcCurrModuleIf->m_pcModule->m_cModuleOptions.getOptionList();
+  const PlaYUVerOptions::OptionsList& moduleOptions = m_pcCurrModuleIf->m_pcModule->m_cModuleOptions.getOptionList();
 
   QVBoxLayout* optionsLayout = new QVBoxLayout;
   OpionConfiguration* pcOption;
-  for( PlaYUVerOptions::OptionsList::const_iterator it = moduleOptions.begin();
-       it != moduleOptions.end(); ++it )
+  for( PlaYUVerOptions::OptionsList::const_iterator it = moduleOptions.begin(); it != moduleOptions.end(); ++it )
   {
     pcOption = new OpionConfiguration( ( *it )->opt );
     m_apcOptionList.append( pcOption );
diff --git a/app/PlaYUVerApp.cpp b/app/PlaYUVerApp.cpp
index 35d128f..7a7b1fc 100644
--- a/app/PlaYUVerApp.cpp
+++ b/app/PlaYUVerApp.cpp
@@ -46,13 +46,12 @@
 
 #define SYNCHRONISED_ZOON 1
 
-PlaYUVerApp::PlaYUVerApp()
-    : m_pcCurrentSubWindow( NULL ), m_pcCurrentVideoSubWindow( NULL ), m_pcAboutDialog( NULL )
+PlaYUVerApp::PlaYUVerApp() : m_pcCurrentSubWindow( NULL ), m_pcCurrentVideoSubWindow( NULL ), m_pcAboutDialog( NULL )
 {
   setWindowModality( Qt::ApplicationModal );
   setWindowModality( Qt::NonModal );
 
-// DBus
+  // DBus
 #ifdef USE_QTDBUS
   m_pDBusAdaptor = new PlaYUVerAppAdaptor( this );
 #endif
@@ -119,8 +118,7 @@ Bool PlaYUVerApp::parseArgs( Int argc, Char* argv[] )
     }
   }
   std::list<const Char*>& argv_unhandled = pcCmdParser.getUnhandledArgs();
-  for( std::list<const Char*>::const_iterator it = argv_unhandled.begin();
-       it != argv_unhandled.end(); it++ )
+  for( std::list<const Char*>::const_iterator it = argv_unhandled.begin(); it != argv_unhandled.end(); it++ )
   {
     loadFile( QString::fromStdString( *it ) );
   }
@@ -144,8 +142,7 @@ Void PlaYUVerApp::closeEvent( QCloseEvent* event )
   QList<SubWindowAbstract*> subWindowList = m_pcWindowHandle->findSubWindow();
   if( subWindowList.size() >= 1 )
   {
-    QMessageBox msgBoxClose( QMessageBox::Question, "PlaYUVer", "There are open files!",
-                             QMessageBox::Yes | QMessageBox::No, this );
+    QMessageBox msgBoxClose( QMessageBox::Question, "PlaYUVer", "There are open files!", QMessageBox::Yes | QMessageBox::No, this );
     msgBoxClose.setDefaultButton( QMessageBox::No );
     msgBoxClose.setInformativeText( "Close all?" );
     msgBoxCloseRet = msgBoxClose.exec();
@@ -189,15 +186,13 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo )
     printMessage( "File " + fileName + " do not exist!", LOG_ERROR );
     return;
   }
-  VideoSubWindow* videoSubWindow =
-      PlaYUVerApp::findVideoStreamSubWindow( m_pcWindowHandle, fileName );
+  VideoSubWindow* videoSubWindow = PlaYUVerApp::findVideoStreamSubWindow( m_pcWindowHandle, fileName );
   if( videoSubWindow )
   {
     m_pcWindowHandle->setActiveSubWindow( videoSubWindow );
     return;
   }
-  videoSubWindow =
-      new VideoSubWindow( VideoSubWindow::VIDEO_STREAM_SUBWINDOW );  // createSubWindow();
+  videoSubWindow = new VideoSubWindow( VideoSubWindow::VIDEO_STREAM_SUBWINDOW );  // createSubWindow();
   SubWindowAbstract* subWindow = videoSubWindow;
   if( !pStreamInfo )
   {
@@ -220,12 +215,10 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo )
       m_pcWindowHandle->addSubWindow( videoSubWindow );
       videoSubWindow->show();
 
-      connect( subWindow, SIGNAL( aboutToClose( SubWindowAbstract* ) ), m_appModuleVideo,
-               SLOT( closeSubWindow( SubWindowAbstract* ) ) );
-      connect( subWindow, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ),
-               m_appModuleVideo, SLOT( zoomToFactorAll( double, QPoint ) ) );
-      connect( subWindow, SIGNAL( scrollBarMoved_SWindow( const QPoint ) ), m_appModuleVideo,
-               SLOT( moveAllScrollBars( const QPoint ) ) );
+      connect( subWindow, SIGNAL( aboutToClose( SubWindowAbstract* ) ), m_appModuleVideo, SLOT( closeSubWindow( SubWindowAbstract* ) ) );
+      connect( subWindow, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ), m_appModuleVideo,
+               SLOT( zoomToFactorAll( double, QPoint ) ) );
+      connect( subWindow, SIGNAL( scrollBarMoved_SWindow( const QPoint ) ), m_appModuleVideo, SLOT( moveAllScrollBars( const QPoint ) ) );
 
       videoSubWindow->zoomToFit();
       updateZoomFactorSBox();
@@ -245,8 +238,7 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo )
   catch( PlaYUVerFailure& e )
   {
     videoSubWindow->close();
-    QString warningMsg = "Cannot open file " + QFileInfo( fileName ).fileName() +
-                         " with the following error: \n" + e.what();
+    QString warningMsg = "Cannot open file " + QFileInfo( fileName ).fileName() + " with the following error: \n" + e.what();
     QMessageBox::warning( this, QApplication::applicationName(), warningMsg );
     printMessage( warningMsg, LOG_ERROR );
   }
@@ -254,22 +246,31 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo )
 
 // -----------------------  File Functions  -----------------------
 
-Void PlaYUVerApp::open()
+QStringList PlaYUVerApp::showFileDialog( Bool bRead )
 {
   QString supported = tr( "Supported Files (" );
   QStringList formatsList;
-  std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedReadFormats();
+  std::vector<PlaYUVerSupportedFormat> supportedFmts;
+
+  if( bRead )
+    supportedFmts = PlaYUVerStream::supportedReadFormats();
+  else
+    supportedFmts = PlaYUVerStream::supportedWriteFormats();
 
   for( UInt i = 0; i < supportedFmts.size(); i++ )
   {
-    if( supportedFmts[i].formatExt != "" )
+    std::vector<String> arrayExt = supportedFmts[i].getExts();
+    if( arrayExt.size() > 0 )
     {
-      QString currFmt;
-      supported.append( " *." );
-      supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
-      currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
-      currFmt.append( " (*." );
-      currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
+      QString currFmt( QString::fromStdString( supportedFmts[i].formatName ) );
+      currFmt.append( " (" );
+      for( std::vector<String>::iterator e = arrayExt.begin(); e != arrayExt.end(); ++e )
+      {
+        supported.append( " *." );
+        currFmt.append( "*." );
+        supported.append( QString::fromStdString( *e ) );
+        currFmt.append( QString::fromStdString( *e ) );
+      }
       currFmt.append( ")" );
       formatsList << currFmt;
     }
@@ -279,9 +280,13 @@ Void PlaYUVerApp::open()
   QStringList filter;
   filter << supported << formatsList << tr( "All Files (*)" );
 
-  QStringList fileNameList = QFileDialog::getOpenFileNames( this, tr( "Open File" ),
-                                                            m_cLastOpenPath, filter.join( ";;" ) );
+  QStringList fileNameList = QFileDialog::getOpenFileNames( this, tr( "Open File" ), m_cLastOpenPath, filter.join( ";;" ) );
+  return fileNameList;
+}
 
+Void PlaYUVerApp::open()
+{
+  QStringList fileNameList = showFileDialog( true );
   for( Int i = 0; i < fileNameList.size(); i++ )
   {
     if( !fileNameList.at( i ).isEmpty() )
@@ -309,31 +314,11 @@ Void PlaYUVerApp::save()
   if( m_pcCurrentVideoSubWindow )
   {
     VideoSubWindow* saveWindow = m_pcCurrentVideoSubWindow;
-    QString supported = tr( "Supported Files (" );
-    QStringList formatsList;
 
-    std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedWriteFormats();
-    for( UInt i = 0; i < supportedFmts.size(); i++ )
-    {
-      QString currFmt;
-      supported.append( " *." );
-      supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
-      currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
-      currFmt.append( " (*." );
-      currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
-      currFmt.append( ")" );
-      formatsList << currFmt;
-    }
-    supported.append( " )" );
-
-    QStringList filter;
-    filter << supported << formatsList << tr( "All Files (*)" );
-
-    QString fileName = QFileDialog::getSaveFileName( this, tr( "Open File" ), m_cLastOpenPath,
-                                                     filter.join( ";;" ) );
-
-    if( !fileName.isEmpty() )
+    QStringList fileNames = showFileDialog( false );
+    if( fileNames.size() == 1 )
     {
+      QString fileName = fileNames[0];
       m_cLastOpenPath = QFileInfo( fileName ).path();
       try
       {
@@ -342,8 +327,7 @@ Void PlaYUVerApp::save()
       catch( PlaYUVerFailure& e )
       {
         QApplication::restoreOverrideCursor();
-        QString warningMsg = "Cannot save file " + QFileInfo( fileName ).fileName() +
-                             " with the following error: \n" + e.what();
+        QString warningMsg = "Cannot save file " + QFileInfo( fileName ).fileName() + " with the following error: \n" + e.what();
         QMessageBox::warning( this, QApplication::applicationName(), warningMsg );
         printMessage( warningMsg, LOG_ERROR );
         return;
@@ -366,9 +350,8 @@ Void PlaYUVerApp::format()
     }
     catch( PlaYUVerFailure& e )
     {
-      QString warningMsg = "Cannot change format of " +
-                           QFileInfo( pcVideoSubWindow->getCurrentFileName() ).fileName() +
-                           " with the following error: \n" + e.what();
+      QString warningMsg =
+          "Cannot change format of " + QFileInfo( pcVideoSubWindow->getCurrentFileName() ).fileName() + " with the following error: \n" + e.what();
       QMessageBox::warning( this, QApplication::applicationName(), warningMsg );
       printMessage( warningMsg, LOG_ERROR );
       qDebug() << warningMsg;
@@ -399,8 +382,7 @@ Void PlaYUVerApp::reloadAll()
 
   for( UInt c = 0; c < 3; c++ )
   {
-    QList<SubWindowAbstract*> subWindowList =
-        m_pcWindowHandle->findSubWindow( windowCategoryOrder[c] );
+    QList<SubWindowAbstract*> subWindowList = m_pcWindowHandle->findSubWindow( windowCategoryOrder[c] );
     for( Int i = 0; i < subWindowList.size(); i++ )
     {
       subWindowList.at( i )->refreshSubWindow();
@@ -443,8 +425,7 @@ Void PlaYUVerApp::zoomToFit()
 Void PlaYUVerApp::zoomToFitAll()
 {
   VideoSubWindow* videoSubWindow;
-  QList<SubWindowAbstract*> subWindowList =
-      m_pcWindowHandle->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+  QList<SubWindowAbstract*> subWindowList = m_pcWindowHandle->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
   for( Int i = 0; i < subWindowList.size(); i++ )
   {
     videoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
@@ -506,13 +487,11 @@ Void PlaYUVerApp::dropEvent( QDropEvent* event )
 
 // -----------------------  Sub Window Functions  -----------------------
 
-VideoSubWindow* PlaYUVerApp::findVideoStreamSubWindow( const PlaYUVerSubWindowHandle* windowManager,
-                                                       const QString& fileName )
+VideoSubWindow* PlaYUVerApp::findVideoStreamSubWindow( const PlaYUVerSubWindowHandle* windowManager, const QString& fileName )
 {
   QString canonicalFilePath = QFileInfo( fileName ).canonicalFilePath();
   VideoSubWindow* pcSubWindow;
-  QList<SubWindowAbstract*> subWindowList =
-      windowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
+  QList<SubWindowAbstract*> subWindowList = windowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
   for( Int i = 0; i < subWindowList.size(); i++ )
   {
     pcSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
@@ -638,8 +617,7 @@ Void PlaYUVerApp::createActions()
   connect( m_arrayActions[SAVE_ACT], SIGNAL( triggered() ), this, SLOT( save() ) );
 
   m_arrayActions[FORMAT_ACT] = new QAction( tr( "&Format" ), this );
-  m_arrayActions[FORMAT_ACT]->setIcon(
-      QIcon::fromTheme( "transform-scale", QIcon( ":/images/configuredialog.png" ) ) );
+  m_arrayActions[FORMAT_ACT]->setIcon( QIcon::fromTheme( "transform-scale", QIcon( ":/images/configuredialog.png" ) ) );
   m_arrayActions[FORMAT_ACT]->setShortcut( Qt::CTRL + Qt::Key_F );
   m_arrayActions[FORMAT_ACT]->setStatusTip( tr( "Open format dialog" ) );
   connect( m_arrayActions[FORMAT_ACT], SIGNAL( triggered() ), this, SLOT( format() ) );
@@ -663,13 +641,11 @@ Void PlaYUVerApp::createActions()
   m_arrayActions[CLOSE_ACT] = new QAction( tr( "&Close" ), this );
   m_arrayActions[CLOSE_ACT]->setIcon( style()->standardIcon( QStyle::SP_DialogCloseButton ) );
   m_arrayActions[CLOSE_ACT]->setStatusTip( tr( "Close the active window" ) );
-  connect( m_arrayActions[CLOSE_ACT], SIGNAL( triggered() ), m_pcWindowHandle,
-           SLOT( removeActiveSubWindow() ) );
+  connect( m_arrayActions[CLOSE_ACT], SIGNAL( triggered() ), m_pcWindowHandle, SLOT( removeActiveSubWindow() ) );
 
   m_arrayActions[CLOSEALL_ACT] = new QAction( tr( "Close &All" ), this );
   m_arrayActions[CLOSEALL_ACT]->setStatusTip( tr( "Close all the windows" ) );
-  connect( m_arrayActions[CLOSEALL_ACT], SIGNAL( triggered() ), m_pcWindowHandle,
-           SLOT( removeAllSubWindow() ) );
+  connect( m_arrayActions[CLOSEALL_ACT], SIGNAL( triggered() ), m_pcWindowHandle, SLOT( removeAllSubWindow() ) );
 
   m_arrayActions[EXIT_ACT] = new QAction( tr( "E&xit" ), this );
   m_arrayActions[EXIT_ACT]->setShortcuts( QKeySequence::Quit );
@@ -681,31 +657,27 @@ Void PlaYUVerApp::createActions()
   connect( mapperZoom, SIGNAL( mapped( int ) ), this, SLOT( scaleFrame( int ) ) );
 
   m_arrayActions[ZOOM_IN_ACT] = new QAction( tr( "Zoom &In (+25%)" ), this );
-  m_arrayActions[ZOOM_IN_ACT]->setIcon(
-      QIcon::fromTheme( "zoom-in", QIcon( ":/images/zoomin.png" ) ) );
+  m_arrayActions[ZOOM_IN_ACT]->setIcon( QIcon::fromTheme( "zoom-in", QIcon( ":/images/zoomin.png" ) ) );
   m_arrayActions[ZOOM_IN_ACT]->setShortcut( tr( "Ctrl++" ) );
   m_arrayActions[ZOOM_IN_ACT]->setStatusTip( tr( "Scale the image up by 25%" ) );
   connect( m_arrayActions[ZOOM_IN_ACT], SIGNAL( triggered() ), mapperZoom, SLOT( map() ) );
   mapperZoom->setMapping( m_arrayActions[ZOOM_IN_ACT], 125 );
 
   m_arrayActions[ZOOM_OUT_ACT] = new QAction( tr( "Zoom &Out (-25%)" ), this );
-  m_arrayActions[ZOOM_OUT_ACT]->setIcon(
-      QIcon::fromTheme( "zoom-out", QIcon( ":/images/zoomout.png" ) ) );
+  m_arrayActions[ZOOM_OUT_ACT]->setIcon( QIcon::fromTheme( "zoom-out", QIcon( ":/images/zoomout.png" ) ) );
   m_arrayActions[ZOOM_OUT_ACT]->setShortcut( tr( "Ctrl+-" ) );
   m_arrayActions[ZOOM_OUT_ACT]->setStatusTip( tr( "Scale the image down by 25%" ) );
   connect( m_arrayActions[ZOOM_OUT_ACT], SIGNAL( triggered() ), mapperZoom, SLOT( map() ) );
   mapperZoom->setMapping( m_arrayActions[ZOOM_OUT_ACT], 80 );
 
   m_arrayActions[ZOOM_NORMAL_ACT] = new QAction( tr( "&Normal Size" ), this );
-  m_arrayActions[ZOOM_NORMAL_ACT]->setIcon(
-      QIcon::fromTheme( "zoom-original", QIcon( ":/images/zoomtonormal.png" ) ) );
+  m_arrayActions[ZOOM_NORMAL_ACT]->setIcon( QIcon::fromTheme( "zoom-original", QIcon( ":/images/zoomtonormal.png" ) ) );
   m_arrayActions[ZOOM_NORMAL_ACT]->setShortcut( tr( "Ctrl+N" ) );
   m_arrayActions[ZOOM_NORMAL_ACT]->setStatusTip( tr( "Show the image at its original size" ) );
   connect( m_arrayActions[ZOOM_NORMAL_ACT], SIGNAL( triggered() ), this, SLOT( normalSize() ) );
 
   m_arrayActions[ZOOM_FIT_ACT] = new QAction( tr( "Zoom to &Fit" ), this );
-  m_arrayActions[ZOOM_FIT_ACT]->setIcon(
-      QIcon::fromTheme( "zoom-fit-best", QIcon( ":/images/fittowindow.png" ) ) );
+  m_arrayActions[ZOOM_FIT_ACT]->setIcon( QIcon::fromTheme( "zoom-fit-best", QIcon( ":/images/fittowindow.png" ) ) );
   m_arrayActions[ZOOM_FIT_ACT]->setStatusTip( tr( "Zoom in or out to fit on the window." ) );
   connect( m_arrayActions[ZOOM_FIT_ACT], SIGNAL( triggered() ), this, SLOT( zoomToFit() ) );
 
@@ -726,8 +698,7 @@ Void PlaYUVerApp::createActions()
 #ifdef USE_FERVOR
   m_arrayActions[UPDATE_ACT] = new QAction( tr( "&Update" ), this );
   m_arrayActions[UPDATE_ACT]->setStatusTip( tr( "Check for updates" ) );
-  connect( m_arrayActions[UPDATE_ACT], SIGNAL( triggered() ), FvUpdater::sharedUpdater(),
-           SLOT( CheckForUpdatesNotSilent() ) );
+  connect( m_arrayActions[UPDATE_ACT], SIGNAL( triggered() ), FvUpdater::sharedUpdater(), SLOT( CheckForUpdatesNotSilent() ) );
 #endif
 
   m_arrayActions[ABOUT_ACT] = new QAction( tr( "&About" ), this );
@@ -822,8 +793,7 @@ Void PlaYUVerApp::createToolBars()
   m_pcZoomFactorSBox->setSingleStep( 10.0 );
   m_pcZoomFactorSBox->setValue( 100.0 );
   m_pcZoomFactorSBox->setSuffix( "%" );
-  connect( m_pcZoomFactorSBox, SIGNAL( valueChanged( double ) ), this,
-           SLOT( zoomFromSBox( double ) ) );
+  connect( m_pcZoomFactorSBox, SIGNAL( valueChanged( double ) ), this, SLOT( zoomFromSBox( double ) ) );
   m_arrayToolBars[VIEW_TOOLBAR]->addWidget( m_pcZoomFactorSBox );
   m_arrayToolBars[VIEW_TOOLBAR]->addAction( m_arrayActions[ZOOM_IN_ACT] );
   m_arrayToolBars[VIEW_TOOLBAR]->addAction( m_arrayActions[ZOOM_OUT_ACT] );
@@ -873,8 +843,7 @@ Void PlaYUVerApp::updateRecentFileActions()
     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 )->setData( QVariant::fromValue( m_aRecentFileStreamInfo.at( actionIdx ) ) );
     m_arrayRecentFilesActions.at( actionIdx )->setVisible( true );
     actionIdx++;
   }
diff --git a/app/PlaYUVerApp.h b/app/PlaYUVerApp.h
index 7dcf84c..aeae7d2 100644
--- a/app/PlaYUVerApp.h
+++ b/app/PlaYUVerApp.h
@@ -125,9 +125,9 @@ private:
   VideoSubWindow* m_pcCurrentVideoSubWindow;
 
   QString m_cLastOpenPath;
+  QStringList showFileDialog( Bool bRead );
 
-  static VideoSubWindow* findVideoStreamSubWindow( const PlaYUVerSubWindowHandle* windowManager,
-                                                   const QString& fileName );
+  static VideoSubWindow* findVideoStreamSubWindow( const PlaYUVerSubWindowHandle* windowManager, const QString& fileName );
 
   Void updateMenus();
 
diff --git a/app/PlaYUVerAppAdaptor.cpp b/app/PlaYUVerAppAdaptor.cpp
index e6211e8..d99064c 100644
--- a/app/PlaYUVerAppAdaptor.cpp
+++ b/app/PlaYUVerAppAdaptor.cpp
@@ -26,12 +26,10 @@
 #include "PlaYUVerApp.h"
 #include <QDBusAbstractAdaptor>
 
-PlaYUVerAppAdaptor::PlaYUVerAppAdaptor( PlaYUVerApp* app )
-    : QDBusAbstractAdaptor( app ), m_app( app )
+PlaYUVerAppAdaptor::PlaYUVerAppAdaptor( PlaYUVerApp* app ) : QDBusAbstractAdaptor( app ), m_app( app )
 {
   // application dbus interface
-  Bool isRegistered = QDBusConnection::sessionBus().registerObject(
-      QStringLiteral( PLAYUVER_DBUS_PATH ), this, QDBusConnection::ExportAllSlots );
+  Bool isRegistered = QDBusConnection::sessionBus().registerObject( QStringLiteral( PLAYUVER_DBUS_PATH ), this, QDBusConnection::ExportAllSlots );
 
   Q_ASSERT( isRegistered == true );
 }
diff --git a/app/PlaYUVerAppModuleIf.cpp b/app/PlaYUVerAppModuleIf.cpp
index 2de6c7b..3f171c2 100644
--- a/app/PlaYUVerAppModuleIf.cpp
+++ b/app/PlaYUVerAppModuleIf.cpp
@@ -26,9 +26,7 @@
 #include "VideoSubWindow.h"
 #include "VideoSubWindow.h"
 
-PlaYUVerAppModuleIf::PlaYUVerAppModuleIf( QObject* parent,
-                                          QAction* action,
-                                          PlaYUVerModuleIf* module )
+PlaYUVerAppModuleIf::PlaYUVerAppModuleIf( QObject* parent, QAction* action, PlaYUVerModuleIf* module )
     : m_bIsRunning( false )
     , m_pcModuleAction( action )
     , m_pcModule( module )
diff --git a/app/PlaYUVerSubWindowHandle.cpp b/app/PlaYUVerSubWindowHandle.cpp
index e091446..f565c82 100644
--- a/app/PlaYUVerSubWindowHandle.cpp
+++ b/app/PlaYUVerSubWindowHandle.cpp
@@ -43,8 +43,7 @@
 class PlaYUVerMdiArea : public QMdiArea
 {
 public:
-  PlaYUVerMdiArea( QWidget* parent = 0 )
-      : QMdiArea( parent ), m_pixmapLogo( ":/images/playuver-backgroud-logo.png" )
+  PlaYUVerMdiArea( QWidget* parent = 0 ) : QMdiArea( parent ), m_pixmapLogo( ":/images/playuver-backgroud-logo.png" )
   {
     setBackgroundRole( QPalette::Background );
   }
@@ -120,8 +119,8 @@ Void PlaYUVerSubWindowHandle::resetWindowMode()
     }
     for( Int i = 0; i < m_apcMdiSubWindowList.size(); i++ )
     {
-      disconnect( m_apcMdiSubWindowList.at( i ), SIGNAL( aboutToClose( PlaYUVerMdiSubWindow* ) ),
-                  this, SLOT( removeMdiSubWindow( PlaYUVerMdiSubWindow* ) ) );
+      disconnect( m_apcMdiSubWindowList.at( i ), SIGNAL( aboutToClose( PlaYUVerMdiSubWindow* ) ), this,
+                  SLOT( removeMdiSubWindow( PlaYUVerMdiSubWindow* ) ) );
       m_apcMdiSubWindowList.at( i )->close();
     }
     m_apcMdiSubWindowList.clear();
@@ -163,8 +162,7 @@ Void PlaYUVerSubWindowHandle::setWindowMode( Int iWindowMode )
     setVisible( true );
     m_pcMdiArea = new PlaYUVerMdiArea;
     m_pcMdiArea->setActivationOrder( QMdiArea::ActivationHistoryOrder );
-    connect( m_pcMdiArea, SIGNAL( subWindowActivated( QMdiSubWindow* ) ), this,
-             SLOT( updateActiveSubWindow() ) );
+    connect( m_pcMdiArea, SIGNAL( subWindowActivated( QMdiSubWindow* ) ), this, SLOT( updateActiveSubWindow() ) );
     m_pcWindowManagerLayout = new QHBoxLayout( this );
     m_pcWindowManagerLayout->addWidget( m_pcMdiArea );
     setLayout( m_pcWindowManagerLayout );
@@ -177,8 +175,7 @@ Void PlaYUVerSubWindowHandle::setWindowMode( Int iWindowMode )
     // m_pcApp->resize( m_cMdiModeWindowSize );
     if( m_pcActiveWindow )
     {
-      m_pcApp->setWindowTitle( QApplication::applicationName() +
-                               " :: " + m_pcActiveWindow->getWindowName() );
+      m_pcApp->setWindowTitle( QApplication::applicationName() + " :: " + m_pcActiveWindow->getWindowName() );
     }
   }
   m_iWindowMode = iWindowMode;
@@ -205,8 +202,7 @@ Void PlaYUVerSubWindowHandle::updateActiveSubWindow( SubWindowAbstract* window )
     if( mdiSubWindow )
     {
       QWidget* activeWidget = m_pcMdiArea->activeSubWindow()->widget();
-      Int windowIdx =
-          m_apcSubWindowList.indexOf( qobject_cast<SubWindowAbstract*>( activeWidget ) );
+      Int windowIdx = m_apcSubWindowList.indexOf( qobject_cast<SubWindowAbstract*>( activeWidget ) );
       if( windowIdx >= 0 )
       {
         m_pcActiveWindow = m_apcSubWindowList.at( windowIdx );
@@ -215,8 +211,7 @@ Void PlaYUVerSubWindowHandle::updateActiveSubWindow( SubWindowAbstract* window )
     }
     if( m_pcActiveWindow )
     {
-      m_pcApp->setWindowTitle( QApplication::applicationName() +
-                               " :: " + m_pcActiveWindow->getWindowName() );
+      m_pcApp->setWindowTitle( QApplication::applicationName() + " :: " + m_pcActiveWindow->getWindowName() );
     }
   }
 }
@@ -228,24 +223,19 @@ Void PlaYUVerSubWindowHandle::addMdiSubWindow( SubWindowAbstract* window )
   m_pcMdiArea->addSubWindow( mdiSubWindow );
   m_apcMdiSubWindowList.append( mdiSubWindow );
   window->setSubWindow( mdiSubWindow );
-  connect( mdiSubWindow, SIGNAL( aboutToClose( PlaYUVerMdiSubWindow* ) ), this,
-           SLOT( removeMdiSubWindow( PlaYUVerMdiSubWindow* ) ) );
+  connect( mdiSubWindow, SIGNAL( aboutToClose( PlaYUVerMdiSubWindow* ) ), this, SLOT( removeMdiSubWindow( PlaYUVerMdiSubWindow* ) ) );
 }
 
 Void PlaYUVerSubWindowHandle::addSubWindow( SubWindowAbstract* window, Qt::WindowFlags flags )
 {
   if( window )
   {
-    connect( window, SIGNAL( updateStatusBar( const QString& ) ), m_pcApp,
-             SLOT( printMessage( const QString& ) ) );
-    connect( window, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ), m_pcApp,
-             SLOT( updateZoomFactorSBox() ) );
+    connect( window, SIGNAL( updateStatusBar( const QString& ) ), m_pcApp, SLOT( printMessage( const QString& ) ) );
+    connect( window, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ), m_pcApp, SLOT( updateZoomFactorSBox() ) );
     if( m_iWindowMode == DETACHEDSUBWINDOWMODE )
     {
-      connect( window, SIGNAL( aboutToActivate( SubWindowAbstract* ) ), this,
-               SLOT( updateActiveSubWindow( SubWindowAbstract* ) ) );
-      connect( window, SIGNAL( aboutToClose( SubWindowAbstract* ) ), this,
-               SLOT( removeSubWindow( SubWindowAbstract* ) ) );
+      connect( window, SIGNAL( aboutToActivate( SubWindowAbstract* ) ), this, SLOT( updateActiveSubWindow( SubWindowAbstract* ) ) );
+      connect( window, SIGNAL( aboutToClose( SubWindowAbstract* ) ), this, SLOT( removeSubWindow( SubWindowAbstract* ) ) );
     }
     if( m_iWindowMode == MDISUBWINDOWMODE )
     {
@@ -330,8 +320,7 @@ QList<SubWindowAbstract*> PlaYUVerSubWindowHandle::findSubWindow( const UInt uiC
   return apcSubWindowList;
 }
 
-QList<SubWindowAbstract*> PlaYUVerSubWindowHandle::findSubWindow( const QString& windowName,
-                                                                  const UInt uiCategory ) const
+QList<SubWindowAbstract*> PlaYUVerSubWindowHandle::findSubWindow( const QString& windowName, const UInt uiCategory ) const
 {
   QList<SubWindowAbstract*> subWindowList = findSubWindow( uiCategory );
   QList<SubWindowAbstract*> apcSubWindowList;
@@ -346,8 +335,7 @@ QList<SubWindowAbstract*> PlaYUVerSubWindowHandle::findSubWindow( const QString&
   return apcSubWindowList;
 }
 
-SubWindowAbstract* PlaYUVerSubWindowHandle::findSubWindow(
-    const SubWindowAbstract* subWindow ) const
+SubWindowAbstract* PlaYUVerSubWindowHandle::findSubWindow( const SubWindowAbstract* subWindow ) const
 {
   QList<SubWindowAbstract*> subWindowList = findSubWindow();
   for( Int i = 0; i < subWindowList.size(); i++ )
@@ -426,8 +414,7 @@ Void PlaYUVerSubWindowHandle::tileSubWindows()
     }
 
     QSize totalWindowsSize( screenSize.width(), screenSize.height() - topLeftCornerWindow.y() );
-    QSize windowsSize( totalWindowsSize.width() / numberTillingColumns,
-                       totalWindowsSize.height() / numberTillingRows );
+    QSize windowsSize( totalWindowsSize.width() / numberTillingColumns, totalWindowsSize.height() / numberTillingRows );
     QPoint windowRelativePos;
     for( Int i = 0; i < m_apcSubWindowList.size(); i++ )
     {
@@ -454,8 +441,7 @@ Void PlaYUVerSubWindowHandle::cascadeSubWindows()
 Void PlaYUVerSubWindowHandle::createActions()
 {
   m_mapperWindow = new QSignalMapper( this );
-  connect( m_mapperWindow, SIGNAL( mapped( QWidget* ) ), this,
-           SLOT( setActiveSubWindow( QWidget* ) ) );
+  connect( m_mapperWindow, SIGNAL( mapped( QWidget* ) ), this, SLOT( setActiveSubWindow( QWidget* ) ) );
 
   m_arrayActions.resize( TOTAL_ACT );
 
@@ -469,16 +455,13 @@ Void PlaYUVerSubWindowHandle::createActions()
   m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT] = new QAction( tr( "&Detached SubWindows" ), this );
   m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT]->setCheckable( true );
   m_actionGroupWindowMode->addAction( m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT] );
-  connect( m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT], SIGNAL( triggered() ), m_mapperWindowMode,
-           SLOT( map() ) );
-  m_mapperWindowMode->setMapping( m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT],
-                                  DETACHEDSUBWINDOWMODE );
+  connect( m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT], SIGNAL( triggered() ), m_mapperWindowMode, SLOT( map() ) );
+  m_mapperWindowMode->setMapping( m_arrayActions[NORMAL_SUBWINDOW_MODE_ACT], DETACHEDSUBWINDOWMODE );
 
   m_arrayActions[MDI_SUBWINDOW_MODE_ACT] = new QAction( "&MDI SubWindows", this );
   m_arrayActions[MDI_SUBWINDOW_MODE_ACT]->setCheckable( true );
   m_actionGroupWindowMode->addAction( m_arrayActions[MDI_SUBWINDOW_MODE_ACT] );
-  connect( m_arrayActions[MDI_SUBWINDOW_MODE_ACT], SIGNAL( triggered() ), m_mapperWindowMode,
-           SLOT( map() ) );
+  connect( m_arrayActions[MDI_SUBWINDOW_MODE_ACT], SIGNAL( triggered() ), m_mapperWindowMode, SLOT( map() ) );
   m_mapperWindowMode->setMapping( m_arrayActions[MDI_SUBWINDOW_MODE_ACT], MDISUBWINDOWMODE );
 
   m_actionGroupWindowMode->actions().at( m_iWindowMode )->setChecked( true );
@@ -486,19 +469,16 @@ Void PlaYUVerSubWindowHandle::createActions()
   m_arrayActions[CLOSE_ACT] = new QAction( tr( "&Close" ), this );
   m_arrayActions[CLOSE_ACT]->setIcon( style()->standardIcon( QStyle::SP_DialogCloseButton ) );
   m_arrayActions[CLOSE_ACT]->setStatusTip( tr( "Close the active window" ) );
-  connect( m_arrayActions[CLOSE_ACT], SIGNAL( triggered() ), this,
-           SLOT( removeActiveSubWindow() ) );
+  connect( m_arrayActions[CLOSE_ACT], SIGNAL( triggered() ), this, SLOT( removeActiveSubWindow() ) );
 
   m_arrayActions[CLOSE_ACT] = new QAction( tr( "&Close" ), this );
   m_arrayActions[CLOSE_ACT]->setIcon( style()->standardIcon( QStyle::SP_DialogCloseButton ) );
   m_arrayActions[CLOSE_ACT]->setStatusTip( tr( "Close the active window" ) );
-  connect( m_arrayActions[CLOSE_ACT], SIGNAL( triggered() ), this,
-           SLOT( removeActiveSubWindow() ) );
+  connect( m_arrayActions[CLOSE_ACT], SIGNAL( triggered() ), this, SLOT( removeActiveSubWindow() ) );
 
   m_arrayActions[CLOSE_ALL_ACT] = new QAction( tr( "Close &All" ), this );
   m_arrayActions[CLOSE_ALL_ACT]->setStatusTip( tr( "Close all the windows" ) );
-  connect( m_arrayActions[CLOSE_ALL_ACT], SIGNAL( triggered() ), this,
-           SLOT( removeAllSubWindow() ) );
+  connect( m_arrayActions[CLOSE_ALL_ACT], SIGNAL( triggered() ), this, SLOT( removeAllSubWindow() ) );
 
   m_arrayActions[TILE_WINDOWS_ACT] = new QAction( tr( "Tile" ), this );
   m_arrayActions[TILE_WINDOWS_ACT]->setIcon( QIcon( ":images/windowstile.png" ) );
@@ -506,29 +486,24 @@ Void PlaYUVerSubWindowHandle::createActions()
   m_arrayActions[TILE_WINDOWS_ACT]->setShortcut( tr( "Ctrl+T" ) );
   // connect( m_arrayActions[TILE_WINDOWS_ACT], SIGNAL( triggered() ), mdiArea,
   // SLOT( tileSubWindows() ) );
-  connect( m_arrayActions[TILE_WINDOWS_ACT], SIGNAL( triggered() ), this,
-           SLOT( tileSubWindows() ) );
+  connect( m_arrayActions[TILE_WINDOWS_ACT], SIGNAL( triggered() ), this, SLOT( tileSubWindows() ) );
 
   m_arrayActions[CASCADE_WINDOWS_ACT] = new QAction( tr( "Cascade" ), this );
   m_arrayActions[CASCADE_WINDOWS_ACT]->setIcon( QIcon( ":images/windowscascade.png" ) );
   m_arrayActions[CASCADE_WINDOWS_ACT]->setStatusTip( tr( "Cascade the windows" ) );
-  connect( m_arrayActions[CASCADE_WINDOWS_ACT], SIGNAL( triggered() ), this,
-           SLOT( cascadeSubWindows() ) );
+  connect( m_arrayActions[CASCADE_WINDOWS_ACT], SIGNAL( triggered() ), this, SLOT( cascadeSubWindows() ) );
 
   m_arrayActions[NEXT_WINDOWS_ACT] = new QAction( tr( "Ne&xt" ), this );
   m_arrayActions[NEXT_WINDOWS_ACT]->setShortcuts( QKeySequence::NextChild );
-  m_arrayActions[NEXT_WINDOWS_ACT]->setIcon(
-      QIcon( style()->standardIcon( QStyle::SP_ArrowRight ) ) );
+  m_arrayActions[NEXT_WINDOWS_ACT]->setIcon( QIcon( style()->standardIcon( QStyle::SP_ArrowRight ) ) );
   m_arrayActions[NEXT_WINDOWS_ACT]->setStatusTip( tr( "Move the focus to the next window" ) );
   //  connect( m_arrayActions[NEXT_WINDOWS_ACT], SIGNAL( triggered() ), this,
   //  SLOT( activateNextSubWindow() ) );
 
   m_arrayActions[PREVIOUS_WINDOWS_ACT] = new QAction( tr( "Pre&vious" ), this );
   m_arrayActions[PREVIOUS_WINDOWS_ACT]->setShortcuts( QKeySequence::PreviousChild );
-  m_arrayActions[PREVIOUS_WINDOWS_ACT]->setIcon(
-      QIcon( style()->standardIcon( QStyle::SP_ArrowLeft ) ) );
-  m_arrayActions[PREVIOUS_WINDOWS_ACT]->setStatusTip(
-      tr( "Move the focus to the previous window" ) );
+  m_arrayActions[PREVIOUS_WINDOWS_ACT]->setIcon( QIcon( style()->standardIcon( QStyle::SP_ArrowLeft ) ) );
+  m_arrayActions[PREVIOUS_WINDOWS_ACT]->setStatusTip( tr( "Move the focus to the previous window" ) );
   //  connect( m_arrayActions[PREVIOUS_WINDOWS_ACT], SIGNAL( triggered() ),
   //  this, SLOT( activatePreviousSubWindow() ) );
 
@@ -598,10 +573,8 @@ Void PlaYUVerSubWindowHandle::updateMenu()
 Void PlaYUVerSubWindowHandle::readSettings()
 {
   QSettings appSettings;
-  m_cMdiModeWindowPosition =
-      appSettings.value( "SubWindowManager/LastMdiPosition", QPoint( 200, 200 ) ).toPoint();
-  m_cMdiModeWindowSize =
-      appSettings.value( "SubWindowManager/LastMdiSize", QSize( 500, 400 ) ).toSize();
+  m_cMdiModeWindowPosition = appSettings.value( "SubWindowManager/LastMdiPosition", QPoint( 200, 200 ) ).toPoint();
+  m_cMdiModeWindowSize = appSettings.value( "SubWindowManager/LastMdiSize", QSize( 500, 400 ) ).toSize();
   Int iWindowMode = appSettings.value( "SubWindowManager/SubWindowMode", MDISUBWINDOWMODE ).toInt();
   setWindowMode( iWindowMode );
   m_actionGroupWindowMode->actions().at( iWindowMode )->setChecked( true );
diff --git a/app/PlotSubWindow.cpp b/app/PlotSubWindow.cpp
index f7008d5..b642481 100644
--- a/app/PlotSubWindow.cpp
+++ b/app/PlotSubWindow.cpp
@@ -44,8 +44,7 @@ Void PlotSubWindow::definePlotColors()
   m_arrayColorList.append( Qt::darkYellow );
 }
 
-PlotSubWindow::PlotSubWindow( const QString& windowTitle, QWidget* parent )
-    : SubWindowAbstract( parent, SubWindowAbstract::PLOT_SUBWINDOW )
+PlotSubWindow::PlotSubWindow( const QString& windowTitle, QWidget* parent ) : SubWindowAbstract( parent, SubWindowAbstract::PLOT_SUBWINDOW )
 {
   definePlotColors();
   m_iNumberPlots = 0;
@@ -94,18 +93,15 @@ PlotSubWindow::PlotSubWindow( const QString& windowTitle, QWidget* parent )
   m_cPlotArea->yAxis2->setTickLabels( false );
   // make left and bottom axes always transfer their ranges to right and top
   // axes:
-  connect( m_cPlotArea->xAxis, SIGNAL( rangeChanged( QCPRange ) ), m_cPlotArea->xAxis2,
-           SLOT( setRange( QCPRange ) ) );
-  connect( m_cPlotArea->yAxis, SIGNAL( rangeChanged( QCPRange ) ), m_cPlotArea->yAxis2,
-           SLOT( setRange( QCPRange ) ) );
+  connect( m_cPlotArea->xAxis, SIGNAL( rangeChanged( QCPRange ) ), m_cPlotArea->xAxis2, SLOT( setRange( QCPRange ) ) );
+  connect( m_cPlotArea->yAxis, SIGNAL( rangeChanged( QCPRange ) ), m_cPlotArea->yAxis2, SLOT( setRange( QCPRange ) ) );
 
   QFont legendFont = font();     // start out with MainWindow's font..
   legendFont.setPointSize( 9 );  // and make a bit smaller for legend
   m_cPlotArea->legend->setFont( legendFont );
   m_cPlotArea->legend->setBrush( backgroundBrush );
   m_cPlotArea->legend->setTextColor( palette().text().color() );
-  m_cPlotArea->legend->setBorderPen(
-      QPen( palette().brush( QPalette::Active, QPalette::Shadow ), 1 ) );
+  m_cPlotArea->legend->setBorderPen( QPen( palette().brush( QPalette::Active, QPalette::Shadow ), 1 ) );
   m_cPlotArea->legend->setVisible( false );
 
   m_cPlotArea->setInteractions( QCP::iRangeZoom | QCP::iRangeDrag );  // QCP::iSelectPlottables
@@ -192,9 +188,7 @@ Void PlotSubWindow::setAxisRange( const QLine& axisLimits )
   setAxisRange( VERTICAL, axisLimits.y1(), axisLimits.y2() );
 }
 
-Void PlotSubWindow::setAxisRange( PlotSubWindow::Axis eAxis,
-                                  const Int& axisStart,
-                                  const Int& axisEnd )
+Void PlotSubWindow::setAxisRange( PlotSubWindow::Axis eAxis, const Int& axisStart, const Int& axisEnd )
 {
   if( eAxis == HORIZONTAL )
   {
@@ -213,9 +207,7 @@ Void PlotSubWindow::setAxisRange( PlotSubWindow::Axis eAxis,
   m_cPlotArea->replot();
 }
 
-Void PlotSubWindow::addPlot( const QVector<Double>& arrayX,
-                             const QVector<Double>& arrayY,
-                             const QString& key )
+Void PlotSubWindow::addPlot( const QVector<Double>& arrayX, const QVector<Double>& arrayY, const QString& key )
 {
   QCPGraph* newPlot = m_cPlotArea->addGraph();
   QColor plotColor = m_arrayColorList.at( 0 );
diff --git a/app/PlotSubWindow.h b/app/PlotSubWindow.h
index d30931c..8dfcf15 100644
--- a/app/PlotSubWindow.h
+++ b/app/PlotSubWindow.h
@@ -84,9 +84,7 @@ public:
 
   Void setKey( const QString& key );
 
-  Void addPlot( const QVector<Double>& arrayX,
-                const QVector<Double>& arrayY,
-                const QString& key = QString() );
+  Void addPlot( const QVector<Double>& arrayX, const QVector<Double>& arrayY, const QString& key = QString() );
 };
 
 #endif  // __PLOTWINDOWHANDLE_H__
diff --git a/app/ProgressBar.cpp b/app/ProgressBar.cpp
index 237e7c9..6b981db 100644
--- a/app/ProgressBar.cpp
+++ b/app/ProgressBar.cpp
@@ -29,8 +29,7 @@
 #include <QProgressBar>
 #include <QVBoxLayout>
 
-ProgressBar::ProgressBar( QWidget* parent, UInt maxValue )
-    : QWidget( parent ), m_uiTotalProgress( maxValue ), m_uiProgress( 0 )
+ProgressBar::ProgressBar( QWidget* parent, UInt maxValue ) : QWidget( parent ), m_uiTotalProgress( maxValue ), m_uiProgress( 0 )
 {
   QVBoxLayout* mainLayout = new QVBoxLayout( this );
   m_pcProgressBar = new QProgressBar;
diff --git a/app/QualityHandle.cpp b/app/QualityHandle.cpp
index c0cdee3..9d9fcdf 100644
--- a/app/QualityHandle.cpp
+++ b/app/QualityHandle.cpp
@@ -34,8 +34,7 @@
 #include "QtConcurrent/qtconcurrentrun.h"
 #endif
 
-QualityHandle::QualityHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager )
-    : m_pcParet( parent ), m_pcMainWindowManager( windowManager )
+QualityHandle::QualityHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager ) : m_pcParet( parent ), m_pcMainWindowManager( windowManager )
 {
 }
 
@@ -61,15 +60,12 @@ Void QualityHandle::createActions()
   m_arrayActions.resize( TOTAL_ACT );
 
   m_arrayActions[SELECT_CURR_REF_ACT] = new QAction( "Mark as Reference", this );
-  connect( m_arrayActions[SELECT_CURR_REF_ACT], SIGNAL( triggered() ), this,
-           SLOT( slotSelectCurrentAsReference() ) );
+  connect( m_arrayActions[SELECT_CURR_REF_ACT], SIGNAL( triggered() ), this, SLOT( slotSelectCurrentAsReference() ) );
 
   m_arrayActions[PLOT_QUALITY] = new QAction( "Plot Window's Quality", this );
-  connect( m_arrayActions[PLOT_QUALITY], SIGNAL( triggered() ), this,
-           SLOT( slotPlotQualitySingle() ) );
+  connect( m_arrayActions[PLOT_QUALITY], SIGNAL( triggered() ), this, SLOT( slotPlotQualitySingle() ) );
   m_arrayActions[PLOT_SEVERAL_QUALITY] = new QAction( "Plot Several Quality", this );
-  connect( m_arrayActions[PLOT_SEVERAL_QUALITY], SIGNAL( triggered() ), this,
-           SLOT( slotPlotQualitySeveral() ) );
+  connect( m_arrayActions[PLOT_SEVERAL_QUALITY], SIGNAL( triggered() ), this, SLOT( slotPlotQualitySeveral() ) );
 }
 
 QMenu* QualityHandle::createMenu()
@@ -91,10 +87,8 @@ QDockWidget* QualityHandle::createDock()
   m_pcQualityHandleDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
   m_pcQualityHandleDock->setWidget( m_pcQualityHandleSideBar );
 
-  connect( m_pcQualityHandleSideBar, SIGNAL( signalQualityMetricChanged( int ) ), this,
-           SLOT( slotQualityMetricChanged( int ) ) );
-  connect( m_mapperQualityMetric, SIGNAL( mapped( int ) ), this,
-           SLOT( slotQualityMetricChanged( int ) ) );
+  connect( m_pcQualityHandleSideBar, SIGNAL( signalQualityMetricChanged( int ) ), this, SLOT( slotQualityMetricChanged( int ) ) );
+  connect( m_mapperQualityMetric, SIGNAL( mapped( int ) ), this, SLOT( slotQualityMetricChanged( int ) ) );
 
   slotQualityMetricChanged( 0 );
 
@@ -103,8 +97,7 @@ QDockWidget* QualityHandle::createDock()
 
 Void QualityHandle::updateMenus()
 {
-  VideoSubWindow* pcCurrentVideoSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcCurrentVideoSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   Bool hasSubWindow = pcCurrentVideoSubWindow ? true : false;
   Bool hasReference = false;
   Bool isReference = false;
@@ -115,8 +108,7 @@ Void QualityHandle::updateMenus()
     if( hasSubWindow && !hasReference )
     {
       VideoSubWindow* pcVideoSubWindow;
-      QList<SubWindowAbstract*> subWindowList =
-          m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
+      QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
       for( Int i = 0; i < subWindowList.size(); i++ )
       {
         pcVideoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
@@ -199,8 +191,7 @@ Void QualityHandle::measureQuality( QVector<VideoSubWindow*> apcWindowList )
     for( UInt i = 0; i < numberOfWindows; i++ )
     {
       pcCurrFrame = apcWindowList.at( i )->getCurrFrame();
-      padQualityValues[i + 1].append(
-          pcCurrFrame->getQuality( m_iQualityMetricIdx, pcReferenceFrame, LUMA ) );
+      padQualityValues[i + 1].append( pcCurrFrame->getQuality( m_iQualityMetricIdx, pcReferenceFrame, LUMA ) );
       apcWindowList.at( i )->seekRelativeEvent( true );
     }
     pcReferenceWindow->seekRelativeEvent( true );
@@ -218,9 +209,7 @@ Void QualityHandle::measureQuality( QVector<VideoSubWindow*> apcWindowList )
     plotWindowTitle += " - " + apcWindowList.at( 0 )->getWindowName();
   }
   PlotSubWindow* pcPlotWindow = new PlotSubWindow( plotWindowTitle );
-  pcPlotWindow->setAxisName(
-      "Frame Number",
-      QString::fromStdString( PlaYUVerFrame::supportedQualityMetricsList()[m_iQualityMetricIdx] ) );
+  pcPlotWindow->setAxisName( "Frame Number", QString::fromStdString( PlaYUVerFrame::supportedQualityMetricsList()[m_iQualityMetricIdx] ) );
 
   if( apcWindowList.size() > 1 )
   {
@@ -252,13 +241,11 @@ Void QualityHandle::slotQualityMetricChanged( Int idx )
 
 Void QualityHandle::slotSelectCurrentAsReference()
 {
-  VideoSubWindow* pcRefSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcRefSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcRefSubWindow )
   {
     VideoSubWindow* pcVideoSubWindow;
-    QList<SubWindowAbstract*> subWindowList =
-        m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+    QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
     for( Int i = 0; i < subWindowList.size(); i++ )
     {
       pcVideoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
@@ -273,8 +260,7 @@ Void QualityHandle::slotSelectCurrentAsReference()
 
 Void QualityHandle::slotPlotQualitySingle()
 {
-  VideoSubWindow* pcSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcSubWindow )
   {
     if( pcSubWindow->getRefSubWindow() )
@@ -298,8 +284,7 @@ Void QualityHandle::slotPlotQualitySingle()
 
 Void QualityHandle::slotPlotQualitySeveral()
 {
-  VideoSubWindow* pcSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcSubWindow )
   {
     QVector<VideoSubWindow*> apcWindowList;
@@ -311,8 +296,7 @@ Void QualityHandle::slotPlotQualitySeveral()
     }
 
     VideoSubWindow* pcVideoSubWindow;
-    QList<SubWindowAbstract*> subWindowList =
-        m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
+    QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
     for( Int i = 0; i < subWindowList.size(); i++ )
     {
       pcVideoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
diff --git a/app/QualityMeasurementSidebar.cpp b/app/QualityMeasurementSidebar.cpp
index 73d865a..f4d1555 100644
--- a/app/QualityMeasurementSidebar.cpp
+++ b/app/QualityMeasurementSidebar.cpp
@@ -27,8 +27,7 @@
 #include "VideoSubWindow.h"
 #include <QtGui>
 
-QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent,
-                                                      PlaYUVerSubWindowHandle* windowManager )
+QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent, PlaYUVerSubWindowHandle* windowManager )
     : QWidget( parent ), m_pcMainWindowManager( windowManager ), m_pcCurrentVideoSubWindow( NULL )
 {
   // Side bar area -----------------------------------------------------
@@ -99,8 +98,7 @@ QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent,
   setLayout( mainLayout );
 
   connect( m_comboBoxRef, SIGNAL( activated( int ) ), this, SLOT( slotReferenceChanged( int ) ) );
-  connect( m_comboBoxMetric, SIGNAL( currentIndexChanged( int ) ), this,
-           SLOT( slotQualityMetricChanged( int ) ) );
+  connect( m_comboBoxMetric, SIGNAL( currentIndexChanged( int ) ), this, SLOT( slotQualityMetricChanged( int ) ) );
 }
 
 QualityMeasurementSidebar::~QualityMeasurementSidebar() {}
@@ -129,8 +127,7 @@ Void QualityMeasurementSidebar::updateSubWindowList()
   m_pcVideoWindowList.clear();
 
   VideoSubWindow* pcVideoSubWindow;
-  QList<SubWindowAbstract*> subWindowList =
-      m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+  QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
   for( Int i = 0; i < subWindowList.size(); i++ )
   {
     pcVideoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
@@ -140,8 +137,7 @@ Void QualityMeasurementSidebar::updateSubWindowList()
     }
     if( m_pcCurrentVideoSubWindow )
     {
-      if( !m_pcCurrentVideoSubWindow->getCurrFrame()->haveSameFmt(
-              pcVideoSubWindow->getCurrFrame() ) )
+      if( !m_pcCurrentVideoSubWindow->getCurrFrame()->haveSameFmt( pcVideoSubWindow->getCurrFrame() ) )
       {
         continue;
       }
diff --git a/app/SeekStreamDialog.cpp b/app/SeekStreamDialog.cpp
index b8c4bbb..83ac1e6 100644
--- a/app/SeekStreamDialog.cpp
+++ b/app/SeekStreamDialog.cpp
@@ -57,8 +57,7 @@ SeekStreamDialog::SeekStreamDialog( PlaYUVerStream* pcCurrStream, QWidget* paren
   QVBoxLayout* verticalLayout = new QVBoxLayout;
   QHBoxLayout* horizontalLayout = new QHBoxLayout;
   horizontalLayout->addWidget( pcLabel );
-  horizontalLayout->addItem(
-      new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  horizontalLayout->addItem( new QSpacerItem( 20, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
   horizontalLayout->addWidget( m_spinFrameNum );
   verticalLayout->addLayout( horizontalLayout );
   verticalLayout->addWidget( dialogButtonOkCancel, Qt::AlignRight );
diff --git a/app/SubWindowAbstract.cpp b/app/SubWindowAbstract.cpp
index 429097a..b4e5d38 100644
--- a/app/SubWindowAbstract.cpp
+++ b/app/SubWindowAbstract.cpp
@@ -30,8 +30,7 @@
 #include <QIcon>
 #include <QScrollBar>
 
-SubWindowAbstract::SubWindowAbstract( QWidget* parent, UInt category )
-    : QWidget( parent ), m_cSubWindow( NULL )
+SubWindowAbstract::SubWindowAbstract( QWidget* parent, UInt category ) : QWidget( parent ), m_cSubWindow( NULL )
 {
   setParent( parent );
   setVisible( false );
diff --git a/app/VideoHandle.cpp b/app/VideoHandle.cpp
index 29ee4ce..55ef8b9 100644
--- a/app/VideoHandle.cpp
+++ b/app/VideoHandle.cpp
@@ -41,14 +41,13 @@
 #include <QElapsedTimer>
 #endif
 
-VideoHandle::VideoHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager )
-    : m_pcParet( parent ), m_pcMainWindowManager( windowManager )
+VideoHandle::VideoHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager ) : m_pcParet( parent ), m_pcMainWindowManager( windowManager )
 {
   m_pcCurrentVideoSubWindow = NULL;
   m_bIsPlaying = false;
   m_pcPlayingTimer = new QTimer;
 #if( QT_VERSION_PLAYUVER == 5 )
-  m_pcPlayingTimer->setTimerType( Qt::CoarseTimer );
+  m_pcPlayingTimer->setTimerType( Qt::VeryCoarseTimer );
 #endif
   connect( m_pcPlayingTimer, SIGNAL( timeout() ), this, SLOT( playEvent() ) );
   m_acPlayingSubWindows.clear();
@@ -61,15 +60,13 @@ Void VideoHandle::createActions()
   m_arrayActions.resize( TOTAL_ACT );
   m_arrayActions[PLAY_ACT] = new QAction( "Play", this );
   m_arrayActions[PLAY_ACT]->setStatusTip( "Play/Pause" );
-  m_arrayActions[PLAY_ACT]->setIcon(
-      QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaPlay ) ) );
+  m_arrayActions[PLAY_ACT]->setIcon( QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaPlay ) ) );
   m_arrayActions[PLAY_ACT]->setShortcut( Qt::Key_Space );
   connect( m_arrayActions[PLAY_ACT], SIGNAL( triggered() ), this, SLOT( play() ) );
 
   m_arrayActions[STOP_ACT] = new QAction( "Stop", this );
   m_arrayActions[STOP_ACT]->setStatusTip( "Stop" );
-  m_arrayActions[STOP_ACT]->setIcon(
-      QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaStop ) ) );
+  m_arrayActions[STOP_ACT]->setIcon( QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaStop ) ) );
   connect( m_arrayActions[STOP_ACT], SIGNAL( triggered() ), this, SLOT( stop() ) );
 
   m_mapperVideoSeek = new QSignalMapper( this );
@@ -77,20 +74,16 @@ Void VideoHandle::createActions()
 
   m_arrayActions[VIDEO_BACKWARD_ACT] = new QAction( "Video Backward", this );
   m_arrayActions[VIDEO_BACKWARD_ACT]->setStatusTip( "Seek backward" );
-  m_arrayActions[VIDEO_BACKWARD_ACT]->setIcon(
-      QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaSeekBackward ) ) );
+  m_arrayActions[VIDEO_BACKWARD_ACT]->setIcon( QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaSeekBackward ) ) );
   m_arrayActions[VIDEO_BACKWARD_ACT]->setShortcut( Qt::Key_Left );
-  connect( m_arrayActions[VIDEO_BACKWARD_ACT], SIGNAL( triggered() ), m_mapperVideoSeek,
-           SLOT( map() ) );
+  connect( m_arrayActions[VIDEO_BACKWARD_ACT], SIGNAL( triggered() ), m_mapperVideoSeek, SLOT( map() ) );
   m_mapperVideoSeek->setMapping( m_arrayActions[VIDEO_BACKWARD_ACT], 0 );
 
   m_arrayActions[VIDEO_FORWARD_ACT] = new QAction( "Video Forward", this );
   m_arrayActions[VIDEO_FORWARD_ACT]->setStatusTip( "Seek forward" );
-  m_arrayActions[VIDEO_FORWARD_ACT]->setIcon(
-      QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaSeekForward ) ) );
+  m_arrayActions[VIDEO_FORWARD_ACT]->setIcon( QIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaSeekForward ) ) );
   m_arrayActions[VIDEO_FORWARD_ACT]->setShortcut( Qt::Key_Right );
-  connect( m_arrayActions[VIDEO_FORWARD_ACT], SIGNAL( triggered() ), m_mapperVideoSeek,
-           SLOT( map() ) );
+  connect( m_arrayActions[VIDEO_FORWARD_ACT], SIGNAL( triggered() ), m_mapperVideoSeek, SLOT( map() ) );
   m_mapperVideoSeek->setMapping( m_arrayActions[VIDEO_FORWARD_ACT], 1 );
 
   m_arrayActions[VIDEO_GOTO_ACT] = new QAction( "Go to", this );
@@ -114,14 +107,12 @@ Void VideoHandle::createActions()
   m_arrayActions[VIDEO_LOCK_SELECTION_ACT]->setStatusTip(
       "Select which windows should be played synchronized. Press Ctrl while "
       "click to quickly to select all!" );
-  connect( m_arrayActions[VIDEO_LOCK_SELECTION_ACT], SIGNAL( triggered() ), this,
-           SLOT( videoSelectionButtonEvent() ) );
+  connect( m_arrayActions[VIDEO_LOCK_SELECTION_ACT], SIGNAL( triggered() ), this, SLOT( videoSelectionButtonEvent() ) );
 
   m_pcFrameSlider = new QSlider;
   m_pcFrameSlider->setOrientation( Qt::Horizontal );
   m_pcFrameSlider->setMaximumWidth( 2000 );
-  m_pcFrameSlider->setSizePolicy(
-      QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed ) );
+  m_pcFrameSlider->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed ) );
   m_pcFrameSlider->setEnabled( false );
   m_pcFrameSlider->setTracking( false );
   connect( m_pcFrameSlider, SIGNAL( valueChanged( int ) ), this, SLOT( seekSliderEvent( int ) ) );
@@ -140,8 +131,7 @@ Void VideoHandle::createActions()
   m_arrayActions[NAVIGATION_TOOL_ACT]->setChecked( true );
   m_arrayActions[NAVIGATION_TOOL_ACT]->setShortcut( Qt::CTRL + Qt::Key_1 );
   actionGroupTools->addAction( m_arrayActions[NAVIGATION_TOOL_ACT] );
-  connect( m_arrayActions[NAVIGATION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools,
-           SLOT( map() ) );
+  connect( m_arrayActions[NAVIGATION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) );
   m_mapperTools->setMapping( m_arrayActions[NAVIGATION_TOOL_ACT], ViewArea::NavigationView );
 
   m_arrayActions[SELECTION_TOOL_ACT] = new QAction( "Selection Tool", this );
@@ -149,8 +139,7 @@ Void VideoHandle::createActions()
   m_arrayActions[SELECTION_TOOL_ACT]->setChecked( false );
   m_arrayActions[SELECTION_TOOL_ACT]->setShortcut( Qt::CTRL + Qt::Key_2 );
   actionGroupTools->addAction( m_arrayActions[SELECTION_TOOL_ACT] );
-  connect( m_arrayActions[SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools,
-           SLOT( map() ) );
+  connect( m_arrayActions[SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) );
   m_mapperTools->setMapping( m_arrayActions[SELECTION_TOOL_ACT], ViewArea::NormalSelectionView );
 
   m_arrayActions[BLOCK_SELECTION_TOOL_ACT] = new QAction( "Block Selection Tool", this );
@@ -158,16 +147,13 @@ Void VideoHandle::createActions()
   m_arrayActions[BLOCK_SELECTION_TOOL_ACT]->setChecked( false );
   m_arrayActions[BLOCK_SELECTION_TOOL_ACT]->setShortcut( Qt::CTRL + Qt::Key_3 );
   actionGroupTools->addAction( m_arrayActions[BLOCK_SELECTION_TOOL_ACT] );
-  connect( m_arrayActions[BLOCK_SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools,
-           SLOT( map() ) );
-  m_mapperTools->setMapping( m_arrayActions[BLOCK_SELECTION_TOOL_ACT],
-                             ViewArea::BlockSelectionView );
+  connect( m_arrayActions[BLOCK_SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) );
+  m_mapperTools->setMapping( m_arrayActions[BLOCK_SELECTION_TOOL_ACT], ViewArea::BlockSelectionView );
 
   m_arrayActions[SHOW_GRID_ACT] = new QAction( "Show grid", this );
   m_arrayActions[SHOW_GRID_ACT]->setCheckable( true );
   m_arrayActions[SHOW_GRID_ACT]->setChecked( false );
-  connect( m_arrayActions[SHOW_GRID_ACT], SIGNAL( toggled( bool ) ), this,
-           SLOT( toggleGrid( bool ) ) );
+  connect( m_arrayActions[SHOW_GRID_ACT], SIGNAL( toggled( bool ) ), this, SLOT( toggleGrid( bool ) ) );
 }
 
 QMenu* VideoHandle::createVideoMenu()
@@ -255,8 +241,7 @@ QWidget* VideoHandle::createStatusBarMessage()
 
 Void VideoHandle::updateMenus()
 {
-  VideoSubWindow* pcSubWindow =
-      qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
+  VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   Bool hasSubWindow = pcSubWindow ? true : false;
 
   m_arrayActions[PLAY_ACT]->setEnabled( hasSubWindow );
@@ -271,8 +256,7 @@ Void VideoHandle::updateMenus()
   m_pcFrameSlider->setEnabled( hasSubWindow );
   if( !hasSubWindow )
   {
-    disconnect( m_pcFrameSlider, SIGNAL( valueChanged( int ) ), this,
-                SLOT( seekSliderEvent( int ) ) );
+    disconnect( m_pcFrameSlider, SIGNAL( valueChanged( int ) ), this, SLOT( seekSliderEvent( int ) ) );
     m_pcFrameSlider->setValue( 0 );
     m_pcFrameNumInfo->clear();
   }
@@ -290,10 +274,8 @@ Void VideoHandle::updateMenus()
 Void VideoHandle::readSettings()
 {
   QSettings appSettings;
-  m_arrayActions[VIDEO_REPEAT_ACT]->setChecked(
-      appSettings.value( "VideoHandle/Repeat", false ).toBool() );
-  m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->setChecked(
-      appSettings.value( "VideoHandle/VideoZoomLock", false ).toBool() );
+  m_arrayActions[VIDEO_REPEAT_ACT]->setChecked( appSettings.value( "VideoHandle/Repeat", false ).toBool() );
+  m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->setChecked( appSettings.value( "VideoHandle/VideoZoomLock", false ).toBool() );
   if( !appSettings.value( "VideoHandle/FrameProperties", true ).toBool() )
     m_pcFramePropertiesDock->close();
 
@@ -305,8 +287,7 @@ Void VideoHandle::writeSettings()
 {
   QSettings appSettings;
   appSettings.setValue( "VideoHandle/Repeat", m_arrayActions[VIDEO_REPEAT_ACT]->isChecked() );
-  appSettings.setValue( "VideoHandle/VideoZoomLock",
-                        m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->isChecked() );
+  appSettings.setValue( "VideoHandle/VideoZoomLock", m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->isChecked() );
   appSettings.setValue( "VideoHandle/FrameProperties", m_pcFramePropertiesSideBar->isVisible() );
   appSettings.setValue( "VideoHandle/SelectedTool", m_uiViewTool );
 }
@@ -326,8 +307,7 @@ Void VideoHandle::update()
     QString resolution;
     if( pcFrame )
     {
-      resolution.append(
-          QString( "%1x%2" ).arg( pcFrame->getWidth() ).arg( pcFrame->getHeight() ) );
+      resolution.append( QString( "%1x%2" ).arg( pcFrame->getWidth() ).arg( pcFrame->getHeight() ) );
     }
 
     if( pcStream )
@@ -366,8 +346,7 @@ Void VideoHandle::update()
     if( m_pcCurrentVideoSubWindow->isPlaying() )
     {
       m_arrayActions[PLAY_ACT]->setText( "Pause" );
-      m_arrayActions[PLAY_ACT]->setIcon(
-          m_pcParet->style()->standardIcon( QStyle::SP_MediaPause ) );
+      m_arrayActions[PLAY_ACT]->setIcon( m_pcParet->style()->standardIcon( QStyle::SP_MediaPause ) );
     }
     else
     {
@@ -401,8 +380,7 @@ Void VideoHandle::updateSelectionArea( QRect area )
 
 Void VideoHandle::openSubWindow( VideoSubWindow* subWindow )
 {
-  connect( subWindow->getViewArea(), SIGNAL( selectionChanged( QRect ) ), this,
-           SLOT( updateSelectionArea( QRect ) ) );
+  connect( subWindow->getViewArea(), SIGNAL( selectionChanged( QRect ) ), this, SLOT( updateSelectionArea( QRect ) ) );
   subWindow->getViewArea()->setTool( m_uiViewTool );
   subWindow->getViewArea()->setGridVisible( m_arrayActions[SHOW_GRID_ACT]->isChecked() );
 }
@@ -432,8 +410,7 @@ Void VideoHandle::zoomToFactorAll( const Double scale, const QPoint center )
     factor = m_pcCurrentVideoSubWindow->getScaleFactor();
 
     SubWindowAbstract* subWindow;
-    QList<SubWindowAbstract*> subWindowList =
-        m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+    QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
     for( Int i = 0; i < subWindowList.size(); i++ )
     {
       subWindow = subWindowList.at( i );
@@ -453,8 +430,7 @@ Void VideoHandle::moveAllScrollBars( const QPoint offset )
   if( m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->isChecked() && m_pcCurrentVideoSubWindow )
   {
     VideoSubWindow* videoSubWindow;
-    QList<SubWindowAbstract*> subWindowList =
-        m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+    QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
 
     QScrollBar* scrollBar;
     scrollBar = m_pcCurrentVideoSubWindow->getScroll()->horizontalScrollBar();
@@ -538,8 +514,7 @@ Void VideoHandle::setTimerStatus()
 #if( _CONTROL_PLAYING_TIME_ == 1 )
     if( m_pcPlayControlTimer && m_pcPlayingTimer->interval() > 0 )
     {
-      qDebug() << "Desired Fps: " << 1000 / m_pcPlayingTimer->interval()
-               << "Real Fps: " << 1000 / m_dAverageFps;
+      qDebug() << "Desired Fps: " << 1000 / m_pcPlayingTimer->interval() << "Real Fps: " << 1000 / m_dAverageFps;
 
       delete m_pcPlayControlTimer;
       m_pcPlayControlTimer = NULL;
@@ -627,9 +602,7 @@ Void VideoHandle::playEvent()
 {
   Bool bEndOfSequence = false;
 #if( _CONTROL_PLAYING_TIME_ == 1 )
-  m_dAverageFps =
-      Double( m_dAverageFps * m_uiNumberPlayedFrames + m_pcPlayControlTimer->elapsed() ) /
-      Double( m_uiNumberPlayedFrames + 1 );
+  m_dAverageFps = Double( m_dAverageFps * m_uiNumberPlayedFrames + m_pcPlayControlTimer->elapsed() ) / Double( m_uiNumberPlayedFrames + 1 );
   m_uiNumberPlayedFrames++;
   m_pcPlayControlTimer->restart();
 #endif
@@ -650,9 +623,8 @@ Void VideoHandle::playEvent()
   }
   catch( const char* msg )
   {
-    QString warningMsg = "Error while playing " +
-                         QFileInfo( m_pcCurrentVideoSubWindow->getCurrentFileName() ).fileName() +
-                         " with the following error: \n" + msg;
+    QString warningMsg =
+        "Error while playing " + QFileInfo( m_pcCurrentVideoSubWindow->getCurrentFileName() ).fileName() + " with the following error: \n" + msg;
     QMessageBox::warning( m_pcParet, QApplication::applicationName(), warningMsg );
     qDebug() << warningMsg;
     stop();
@@ -667,9 +639,7 @@ Void VideoHandle::seekEvent( Int direction )
   {
     if( m_acPlayingSubWindows.contains( m_pcCurrentVideoSubWindow ) )
     {
-      if( !( ( UInt )( m_pcCurrentVideoSubWindow->getInputStream()->getCurrFrameNum() + 1 ) >=
-                 getMaxFrameNumber() &&
-             direction > 0 ) )
+      if( !( ( UInt )( m_pcCurrentVideoSubWindow->getInputStream()->getCurrFrameNum() + 1 ) >= getMaxFrameNumber() && direction > 0 ) )
       {
         for( Int i = 0; i < m_acPlayingSubWindows.size(); i++ )
         {
@@ -692,8 +662,7 @@ Void VideoHandle::seekVideo()
   {
     if( m_pcCurrentVideoSubWindow->getInputStream() )
     {
-      SeekStreamDialog* dialogSeekVideo =
-          new SeekStreamDialog( m_pcCurrentVideoSubWindow->getInputStream(), m_pcParet );
+      SeekStreamDialog* dialogSeekVideo = new SeekStreamDialog( m_pcCurrentVideoSubWindow->getInputStream(), m_pcParet );
       Int newFrameNum = dialogSeekVideo->runDialog();
       if( newFrameNum >= 0 )
       {
@@ -741,8 +710,7 @@ Void VideoHandle::videoSelectionButtonEvent()
   Qt::KeyboardModifiers keyModifiers = QApplication::keyboardModifiers();
   if( keyModifiers & Qt::ControlModifier )
   {
-    QList<SubWindowAbstract*> subWindowList =
-        m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
+    QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
     for( Int i = 0; i < subWindowList.size(); i++ )
     {
       videoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
@@ -751,8 +719,7 @@ Void VideoHandle::videoSelectionButtonEvent()
   }
   else
   {
-    DialogSubWindowSelector dialogWindowsSelection( m_pcParet, m_pcMainWindowManager,
-                                                    SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
+    DialogSubWindowSelector dialogWindowsSelection( m_pcParet, m_pcMainWindowManager, SubWindowAbstract::VIDEO_STREAM_SUBWINDOW );
     QStringList cWindowListNames;
     for( Int i = 0; i < m_acPlayingSubWindows.size(); i++ )
     {
@@ -800,8 +767,7 @@ Void VideoHandle::setTool( Int tool )
 {
   m_uiViewTool = tool;
   actionGroupTools->actions().at( m_uiViewTool )->setChecked( true );
-  QList<SubWindowAbstract*> subWindowList =
-      m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+  QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
   for( Int i = 0; i < subWindowList.size(); i++ )
   {
     qobject_cast<VideoSubWindow*>( subWindowList.at( i ) )->getViewArea()->setTool( m_uiViewTool );
@@ -810,12 +776,9 @@ Void VideoHandle::setTool( Int tool )
 
 Void VideoHandle::toggleGrid( Bool checked )
 {
-  QList<SubWindowAbstract*> subWindowList =
-      m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
+  QList<SubWindowAbstract*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
   for( Int i = 0; i < subWindowList.size(); i++ )
   {
-    qobject_cast<VideoSubWindow*>( subWindowList.at( i ) )
-        ->getViewArea()
-        ->setGridVisible( checked );
+    qobject_cast<VideoSubWindow*>( subWindowList.at( i ) )->getViewArea()->setGridVisible( checked );
   }
 }
diff --git a/app/VideoHandle.h b/app/VideoHandle.h
index 2d72e6c..aa5cd5d 100644
--- a/app/VideoHandle.h
+++ b/app/VideoHandle.h
@@ -34,7 +34,7 @@
 #include <QThread>
 #include <QWidget>
 
-#define _CONTROL_PLAYING_TIME_ 0
+#define _CONTROL_PLAYING_TIME_ 1
 
 class QToolBar;
 class QDockWidget;
diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp
index 6f84f19..d715a78 100644
--- a/app/VideoSubWindow.cpp
+++ b/app/VideoSubWindow.cpp
@@ -43,8 +43,8 @@ QDataStream& operator<<( QDataStream& out, const PlaYUVerStreamInfoVector& array
   for( Int i = 0; i < array.size(); i++ )
   {
     d = array.at( i );
-    out << d.m_cFilename << d.m_uiWidth << d.m_uiHeight << d.m_iPelFormat << d.m_uiBitsPelPixel
-        << d.m_iEndianness << d.m_uiFrameRate << d.m_uiFileSize;
+    out << d.m_cFilename << d.m_uiWidth << d.m_uiHeight << d.m_iPelFormat << d.m_uiBitsPelPixel << d.m_iEndianness << d.m_uiFrameRate
+        << d.m_uiFileSize;
   }
   return out;
 }
@@ -125,8 +125,7 @@ protected:
     if( m_bBusyWindow )
     {
       painter.setFont( m_cCenterTextFont );
-      painter.drawText( rect(), Qt::AlignHCenter | Qt::AlignVCenter,
-                        QStringLiteral( "Refreshing..." ) );
+      painter.drawText( rect(), Qt::AlignHCenter | Qt::AlignVCenter, QStringLiteral( "Refreshing..." ) );
       painter.fillRect( rect(), QBrush( QColor::fromRgb( 255, 255, 255, 50 ), Qt::SolidPattern ) );
     }
   }
@@ -143,27 +142,19 @@ VideoSubWindow::VideoSubWindow( enum VideoSubWindowCategories category, QWidget*
 {
   // Create a new scroll area inside the sub-window
   m_pcScrollArea = new QScrollArea;
-  connect( m_pcScrollArea->horizontalScrollBar(), SIGNAL( actionTriggered( int ) ), this,
-           SLOT( updateCurScrollValues() ) );
-  connect( m_pcScrollArea->verticalScrollBar(), SIGNAL( actionTriggered( int ) ), this,
-           SLOT( updateCurScrollValues() ) );
+  connect( m_pcScrollArea->horizontalScrollBar(), SIGNAL( actionTriggered( int ) ), this, SLOT( updateCurScrollValues() ) );
+  connect( m_pcScrollArea->verticalScrollBar(), SIGNAL( actionTriggered( int ) ), this, SLOT( updateCurScrollValues() ) );
 
   // Create a new interface to show images
   m_cViewArea = new ViewArea;
-  connect( m_cViewArea, SIGNAL( zoomFactorChanged_byWheel( double, QPoint ) ), this,
-           SLOT( adjustScrollBarByScale( double, QPoint ) ) );
-  connect( m_cViewArea, SIGNAL( zoomFactorChanged_byWheel( double, QPoint ) ), this,
-           SIGNAL( zoomFactorChanged_SWindow( double, QPoint ) ) );
+  connect( m_cViewArea, SIGNAL( zoomFactorChanged_byWheel( double, QPoint ) ), this, SLOT( adjustScrollBarByScale( double, QPoint ) ) );
+  connect( m_cViewArea, SIGNAL( zoomFactorChanged_byWheel( double, QPoint ) ), this, SIGNAL( zoomFactorChanged_SWindow( double, QPoint ) ) );
 
-  connect( m_cViewArea, SIGNAL( scrollBarMoved( QPoint ) ), this,
-           SLOT( adjustScrollBarByOffset( QPoint ) ) );
-  connect( m_cViewArea, SIGNAL( scrollBarMoved( QPoint ) ), this,
-           SIGNAL( scrollBarMoved_SWindow( QPoint ) ) );
+  connect( m_cViewArea, SIGNAL( scrollBarMoved( QPoint ) ), this, SLOT( adjustScrollBarByOffset( QPoint ) ) );
+  connect( m_cViewArea, SIGNAL( scrollBarMoved( QPoint ) ), this, SIGNAL( scrollBarMoved_SWindow( QPoint ) ) );
 
-  connect( m_cViewArea, SIGNAL( selectionChanged( QRect ) ), this,
-           SLOT( updateSelectedArea( QRect ) ) );
-  connect( m_cViewArea, SIGNAL( positionChanged( const QPoint& ) ), this,
-           SLOT( updatePixelValueStatusBar( const QPoint& ) ) );
+  connect( m_cViewArea, SIGNAL( selectionChanged( QRect ) ), this, SLOT( updateSelectedArea( QRect ) ) );
+  connect( m_cViewArea, SIGNAL( positionChanged( const QPoint& ) ), this, SLOT( updatePixelValueStatusBar( const QPoint& ) ) );
 
   m_pcScrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
   m_pcScrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
@@ -318,30 +309,29 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
 
   if( guessFormat( cFilename, Width, Height, InputFormat, BitsPel, Endianness ) || bForceDialog )
   {
-    if( formatDialog.runConfigureFormatDialog( QFileInfo( cFilename ).fileName(), Width, Height,
-                                               InputFormat, BitsPel, Endianness,
-                                               FrameRate ) == QDialog::Rejected )
+    if( formatDialog.runConfigureFormatDialog( QFileInfo( cFilename ).fileName(), Width, Height, InputFormat, BitsPel, Endianness, FrameRate ) ==
+        QDialog::Rejected )
     {
       return false;
     }
   }
 
-  try
-  {
-    m_pCurrStream->open( cFilename.toStdString(), Width, Height, InputFormat, BitsPel, Endianness,
-                         FrameRate, true );
-  }
-  catch( ... )
-  {
-    if( formatDialog.runConfigureFormatDialog( QFileInfo( cFilename ).fileName(), Width, Height,
-                                               InputFormat, BitsPel, Endianness,
-                                               FrameRate ) == QDialog::Rejected )
-    {
-      return false;
-    }
-    m_pCurrStream->open( cFilename.toStdString(), Width, Height, InputFormat, BitsPel, Endianness,
-                         FrameRate, true );
-  }
+  //  try
+  //  {
+  m_pCurrStream->open( cFilename.toStdString(), Width, Height, InputFormat, BitsPel, Endianness, FrameRate, true );
+  //  }
+  //  catch( ... )
+  //  {
+  //    if( formatDialog.runConfigureFormatDialog( QFileInfo( cFilename ).fileName(), Width, Height,
+  //                                               InputFormat, BitsPel, Endianness,
+  //                                               FrameRate ) == QDialog::Rejected )
+  //    {
+  //      return false;
+  //    }
+  //    m_pCurrStream->open( cFilename.toStdString(), Width, Height, InputFormat, BitsPel,
+  //    Endianness,
+  //                         FrameRate, true );
+  //  }
 
   m_sStreamInfo.m_cFilename = cFilename;
   m_sStreamInfo.m_uiWidth = Width;
@@ -370,10 +360,8 @@ Bool VideoSubWindow::loadFile( PlaYUVerStreamInfo* streamInfo )
     m_pCurrStream = new PlaYUVerStream;
   }
 
-  if( !m_pCurrStream->open( streamInfo->m_cFilename.toStdString(), streamInfo->m_uiWidth,
-                            streamInfo->m_uiHeight, streamInfo->m_iPelFormat,
-                            streamInfo->m_uiBitsPelPixel, streamInfo->m_iEndianness,
-                            streamInfo->m_uiFrameRate, true ) )
+  if( !m_pCurrStream->open( streamInfo->m_cFilename.toStdString(), streamInfo->m_uiWidth, streamInfo->m_uiHeight, streamInfo->m_iPelFormat,
+                            streamInfo->m_uiBitsPelPixel, streamInfo->m_iEndianness, streamInfo->m_uiFrameRate, true ) )
   {
     return false;
   }
@@ -404,8 +392,7 @@ Void VideoSubWindow::updateVideoWindowInfo()
       {
         if( arraySubWindows.at( i )->getWindowName() != getWindowName() )
         {
-          sourceWindowList.append(
-              QString( "Input %1 - " + arraySubWindows.at( i )->getWindowName() ).arg( i + 1 ) );
+          sourceWindowList.append( QString( "Input %1 - " + arraySubWindows.at( i )->getWindowName() ).arg( i + 1 ) );
         }
       }
     }
@@ -434,12 +421,7 @@ Void VideoSubWindow::updateVideoWindowInfo()
   }
 }
 
-Bool VideoSubWindow::guessFormat( QString filename,
-                                  UInt& rWidth,
-                                  UInt& rHeight,
-                                  Int& rInputFormat,
-                                  UInt& rBitsPerPixel,
-                                  Int& rEndianness )
+Bool VideoSubWindow::guessFormat( QString filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rBitsPerPixel, Int& rEndianness )
 {
   std::vector<PlaYUVerStdResolution> stdResList = PlaYUVerStream::stdResolutionSizes();
   Bool bGuessed = true;
@@ -451,13 +433,11 @@ Bool VideoSubWindow::guessFormat( QString filename,
   {
     return false;
   }
-  if( !fileExtension.compare( "yuv" ) || !fileExtension.compare( "rgb" ) ||
-      !fileExtension.compare( "gray" ) )
+  if( !fileExtension.compare( "yuv" ) || !fileExtension.compare( "rgb" ) || !fileExtension.compare( "gray" ) )
   {
     bGuessed = false;
     // Guess pixel format
-    QVector<String> formats_list =
-        QVector<String>::fromStdVector( PlaYUVerFrame::supportedPixelFormatListNames() );
+    QVector<String> formats_list = QVector<String>::fromStdVector( PlaYUVerFrame::supportedPixelFormatListNames() );
     for( Int i = 0; i < formats_list.size(); i++ )
     {
       if( FilenameShort.contains( formats_list.at( i ).c_str(), Qt::CaseInsensitive ) )
@@ -486,8 +466,7 @@ Bool VideoSubWindow::guessFormat( QString filename,
 
 #if( QT_VERSION_PLAYUVER == 5 )
       // Guess resolution - match %dx%d
-      QRegularExpressionMatch resolutionMatch =
-          QRegularExpression( "_\\d*x\\d*" ).match( FilenameShort );
+      QRegularExpressionMatch resolutionMatch = QRegularExpression( "_\\d*x\\d*" ).match( FilenameShort );
       if( resolutionMatch.hasMatch() )
       {
         QString resolutionString = resolutionMatch.captured( 0 );
@@ -518,8 +497,7 @@ Bool VideoSubWindow::guessFormat( QString filename,
         Int count = 0, module, frame_bytes, match;
         for( UInt i = 0; i < stdResList.size(); i++ )
         {
-          frame_bytes = PlaYUVerFrame::getBytesPerFrame( stdResList[i].uiWidth,
-                                                         stdResList[i].uiHeight, rInputFormat, 8 );
+          frame_bytes = PlaYUVerFrame::getBytesPerFrame( stdResList[i].uiWidth, stdResList[i].uiHeight, rInputFormat, 8 );
           module = uiFileSize % frame_bytes;
           if( module == 0 )
           {
@@ -641,16 +619,16 @@ Void VideoSubWindow::associateModule( PlaYUVerAppModuleIf* pcModule )
 
 Bool VideoSubWindow::hasRunningModule()
 {
-	Bool bRet = false;
+  Bool bRet = false;
   if( m_pcCurrentDisplayModule )
   {
-		bRet |= m_pcCurrentDisplayModule->isRunning();
+    bRet |= m_pcCurrentDisplayModule->isRunning();
   }
-	for( Int i = 0; i < m_apcCurrentModule.size() && !bRet; i++ )
+  for( Int i = 0; i < m_apcCurrentModule.size() && !bRet; i++ )
   {
-		bRet |= m_apcCurrentModule.at( i )->isRunning();
+    bRet |= m_apcCurrentModule.at( i )->isRunning();
   }
-	return bRet;
+  return bRet;
 }
 
 Void VideoSubWindow::setFillWindow( Bool bFlag )
@@ -717,8 +695,7 @@ Bool VideoSubWindow::goToNextFrame( Bool bThreaded )
     if( bThreaded )
     {
       refreshFrame();
-      m_cReadResult =
-          QtConcurrent::run( m_pCurrStream, &PlaYUVerStream::readNextFrameFillRGBBuffer );
+      m_cReadResult = QtConcurrent::run( m_pCurrStream, &PlaYUVerStream::readNextFrameFillRGBBuffer );
     }
     else
 #endif
@@ -738,8 +715,7 @@ Bool VideoSubWindow::save( QString filename )
   PlaYUVerFrame* saveFrame = m_pcCurrFrame;
   if( m_cSelectedArea.isValid() )
   {
-    saveFrame = new PlaYUVerFrame( m_pcCurrFrame, m_cSelectedArea.x(), m_cSelectedArea.y(),
-                                   m_cSelectedArea.width(), m_cSelectedArea.height() );
+    saveFrame = new PlaYUVerFrame( m_pcCurrFrame, m_cSelectedArea.x(), m_cSelectedArea.y(), m_cSelectedArea.width(), m_cSelectedArea.height() );
   }
   if( !saveFrame )
   {
@@ -815,8 +791,7 @@ Void VideoSubWindow::stop()
 
 QSize VideoSubWindow::getScrollSize()
 {
-  return QSize( m_pcScrollArea->viewport()->size().width() - 5,
-                m_pcScrollArea->viewport()->size().height() - 5 );
+  return QSize( m_pcScrollArea->viewport()->size().width() - 5, m_pcScrollArea->viewport()->size().height() - 5 );
 }
 
 Void VideoSubWindow::adjustScrollBarByOffset( QPoint Offset )
@@ -857,8 +832,7 @@ Void VideoSubWindow::adjustScrollBarByScale( Double scale, QPoint center )
   scrollBarH = m_pcScrollArea->horizontalScrollBar();
   if( center.isNull() )
   {
-    m_cCurrScroll.setX(
-        int( scale * cLastScroll.x() + ( ( scale - 1 ) * scrollBarH->pageStep() / 2 ) ) );
+    m_cCurrScroll.setX( int( scale * cLastScroll.x() + ( ( scale - 1 ) * scrollBarH->pageStep() / 2 ) ) );
   }
   else
   {
@@ -874,8 +848,7 @@ Void VideoSubWindow::adjustScrollBarByScale( Double scale, QPoint center )
   scrollBarV = m_pcScrollArea->verticalScrollBar();
   if( center.isNull() )
   {
-    m_cCurrScroll.setY(
-        int( scale * cLastScroll.y() + ( ( scale - 1 ) * scrollBarV->pageStep() / 2 ) ) );
+    m_cCurrScroll.setY( int( scale * cLastScroll.y() + ( ( scale - 1 ) * scrollBarV->pageStep() / 2 ) ) );
   }
   else
   {
@@ -1008,19 +981,13 @@ Void VideoSubWindow::updatePixelValueStatusBar( const QPoint& pos )
       if( ColorSpace == PlaYUVerPixel::COLOR_YUV )
       {
         sPixelValue = m_pcCurrFrame->getPixelValue( pos.x(), pos.y() );
-        strStatus.append( QString( "Y: %1   U: %2   V: %3" )
-                              .arg( sPixelValue.Y() )
-                              .arg( sPixelValue.Cb() )
-                              .arg( sPixelValue.Cr() ) );
+        strStatus.append( QString( "Y: %1   U: %2   V: %3" ).arg( sPixelValue.Y() ).arg( sPixelValue.Cb() ).arg( sPixelValue.Cr() ) );
       }
 
       if( ( ColorSpace == PlaYUVerPixel::COLOR_RGB ) )
       {
         sPixelValue = m_pcCurrFrame->getPixelValue( pos.x(), pos.y() );
-        strStatus.append( QString( "R: %1   G: %2   B: %3" )
-                              .arg( sPixelValue.R() )
-                              .arg( sPixelValue.G() )
-                              .arg( sPixelValue.B() ) );
+        strStatus.append( QString( "R: %1   G: %2   B: %3" ).arg( sPixelValue.R() ).arg( sPixelValue.G() ).arg( sPixelValue.B() ) );
       }
       emit updateStatusBar( strStatus );
     }
diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h
index 1b08e8a..cbc5611 100644
--- a/app/VideoSubWindow.h
+++ b/app/VideoSubWindow.h
@@ -186,12 +186,7 @@ private:
   Void refreshFrameOperation();
   Bool goToNextFrame( Bool bThreaded = false );
 
-  static Bool guessFormat( QString filename,
-                           UInt& rWidth,
-                           UInt& rHeight,
-                           Int& rInputFormat,
-                           UInt& rBitsPerPixel,
-                           Int& rEndianness );
+  static Bool guessFormat( QString filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rBitsPerPixel, Int& rEndianness );
 
   Bool hasRunningModule();
 
diff --git a/app/ViewArea.cpp b/app/ViewArea.cpp
index 04ee252..8ab9dbb 100644
--- a/app/ViewArea.cpp
+++ b/app/ViewArea.cpp
@@ -72,8 +72,7 @@ Void ViewArea::setImage( PlaYUVerFrame* pcFrame )
   m_pcCurrFrame = pcFrame;
   m_uiPixelHalfScale = 1 << ( m_pcCurrFrame->getBitsPel() - 1 );
   m_pcCurrFrame->fillRGBBuffer();
-  QImage qimg = QImage( m_pcCurrFrame->getRGBBuffer(), m_pcCurrFrame->getWidth(),
-                        m_pcCurrFrame->getHeight(), QImage::Format_RGB32 );
+  QImage qimg = QImage( m_pcCurrFrame->getRGBBuffer(), m_pcCurrFrame->getWidth(), m_pcCurrFrame->getHeight(), QImage::Format_RGB32 );
   setImage( QPixmap::fromImage( qimg ) );
 }
 
@@ -439,8 +438,7 @@ Void ViewArea::paintEvent( QPaintEvent* event )
   // That gives us the part of the pixmap that has actually been exposed.
   // See:
   // http://blog.qt.digia.com/blog/2006/05/13/fast-transformed-pixmapimage-drawing/
-  QRect exposedRect =
-      paInter.worldTransform().inverted().mapRect( event->rect() ).adjusted( -1, -1, 1, 1 );
+  QRect exposedRect = paInter.worldTransform().inverted().mapRect( event->rect() ).adjusted( -1, -1, 1, 1 );
   // Draw the pixmap.
   paInter.drawPixmap( exposedRect, m_pixmap, exposedRect );
 
@@ -514,8 +512,7 @@ Void ViewArea::paintEvent( QPaintEvent* event )
             paInter.setPen( QColor( Qt::black ) );
 
           paInter.drawText( pixelRect, Qt::AlignCenter,
-                            "Y: " + QString::number( sPixelValue.Y() ) + "\n" +
-                                "U: " + QString::number( sPixelValue.Cb() ) + "\n" +
+                            "Y: " + QString::number( sPixelValue.Y() ) + "\n" + "U: " + QString::number( sPixelValue.Cb() ) + "\n" +
                                 "V: " + QString::number( sPixelValue.Cr() ) );
         }
         if( frFormat == PlaYUVerPixel::COLOR_GRAY )
@@ -527,8 +524,7 @@ Void ViewArea::paintEvent( QPaintEvent* event )
           else
             paInter.setPen( QColor( Qt::black ) );
 
-          paInter.drawText( pixelRect, Qt::AlignCenter,
-                            "Y: " + QString::number( sPixelValue.Y() ) );
+          paInter.drawText( pixelRect, Qt::AlignCenter, "Y: " + QString::number( sPixelValue.Y() ) );
         }
 
         if( ( frFormat == PlaYUVerPixel::COLOR_RGB ) )
@@ -541,8 +537,7 @@ Void ViewArea::paintEvent( QPaintEvent* event )
             paInter.setPen( QColor( Qt::black ) );
 
           paInter.drawText( pixelRect, Qt::AlignCenter,
-                            "R: " + QString::number( sPixelValue.R() ) + "\n" +
-                                "G: " + QString::number( sPixelValue.G() ) + "\n" +
+                            "R: " + QString::number( sPixelValue.R() ) + "\n" + "G: " + QString::number( sPixelValue.G() ) + "\n" +
                                 "B: " + QString::number( sPixelValue.B() ) );
         }
       }
diff --git a/app/external/qcustomplot.cpp b/app/external/qcustomplot.cpp
index b4cc1ce..9aef255 100644
--- a/app/external/qcustomplot.cpp
+++ b/app/external/qcustomplot.cpp
@@ -67,8 +67,7 @@ QCPPainter::QCPPainter() : QPainter(), mModes( pmDefault ), mIsAntialiasing( fal
   Like \ref begin, this method sets QPainter::NonCosmeticDefaultPen in Qt
   versions before Qt5.
 */
-QCPPainter::QCPPainter( QPaintDevice* device )
-    : QPainter( device ), mModes( pmDefault ), mIsAntialiasing( false )
+QCPPainter::QCPPainter( QPaintDevice* device ) : QPainter( device ), mModes( pmDefault ), mIsAntialiasing( false )
 {
 #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )  // before Qt5, default pens used to
                                               // be cosmetic if
@@ -392,10 +391,7 @@ void QCPPainter::makeNonCosmetic()
   color will be inherited
   from the plottable that uses this scatter style.
 */
-QCPScatterStyle::QCPScatterStyle()
-    : mSize( 6 ), mShape( ssNone ), mPen( Qt::NoPen ), mBrush( Qt::NoBrush ), mPenDefined( false )
-{
-}
+QCPScatterStyle::QCPScatterStyle() : mSize( 6 ), mShape( ssNone ), mPen( Qt::NoPen ), mBrush( Qt::NoBrush ), mPenDefined( false ) {}
 
 /*!
   Creates a new QCPScatterStyle instance with shape set to \a shape and size to
@@ -418,11 +414,7 @@ QCPScatterStyle::QCPScatterStyle( ScatterShape shape, double size )
   filled.
 */
 QCPScatterStyle::QCPScatterStyle( ScatterShape shape, const QColor& color, double size )
-    : mSize( size )
-    , mShape( shape )
-    , mPen( QPen( color ) )
-    , mBrush( Qt::NoBrush )
-    , mPenDefined( true )
+    : mSize( size ), mShape( shape ), mPen( QPen( color ) ), mBrush( Qt::NoBrush ), mPenDefined( true )
 {
 }
 
@@ -431,15 +423,8 @@ QCPScatterStyle::QCPScatterStyle( ScatterShape shape, const QColor& color, doubl
   color set to \a color,
   the brush color to \a fill (with a solid pattern), and size to \a size.
 */
-QCPScatterStyle::QCPScatterStyle( ScatterShape shape,
-                                  const QColor& color,
-                                  const QColor& fill,
-                                  double size )
-    : mSize( size )
-    , mShape( shape )
-    , mPen( QPen( color ) )
-    , mBrush( QBrush( fill ) )
-    , mPenDefined( true )
+QCPScatterStyle::QCPScatterStyle( ScatterShape shape, const QColor& color, const QColor& fill, double size )
+    : mSize( size ), mShape( shape ), mPen( QPen( color ) ), mBrush( QBrush( fill ) ), mPenDefined( true )
 {
 }
 
@@ -466,15 +451,8 @@ QCPScatterStyle::QCPScatterStyle( ScatterShape shape,
   this constructor is
   wanted.
 */
-QCPScatterStyle::QCPScatterStyle( ScatterShape shape,
-                                  const QPen& pen,
-                                  const QBrush& brush,
-                                  double size )
-    : mSize( size )
-    , mShape( shape )
-    , mPen( pen )
-    , mBrush( brush )
-    , mPenDefined( pen.style() != Qt::NoPen )
+QCPScatterStyle::QCPScatterStyle( ScatterShape shape, const QPen& pen, const QBrush& brush, double size )
+    : mSize( size ), mShape( shape ), mPen( pen ), mBrush( brush ), mPenDefined( pen.style() != Qt::NoPen )
 {
 }
 
@@ -484,12 +462,7 @@ QCPScatterStyle::QCPScatterStyle( ScatterShape shape,
   is set to \ref ssPixmap.
 */
 QCPScatterStyle::QCPScatterStyle( const QPixmap& pixmap )
-    : mSize( 5 )
-    , mShape( ssPixmap )
-    , mPen( Qt::NoPen )
-    , mBrush( Qt::NoBrush )
-    , mPixmap( pixmap )
-    , mPenDefined( false )
+    : mSize( 5 ), mShape( ssPixmap ), mPen( Qt::NoPen ), mBrush( Qt::NoBrush ), mPixmap( pixmap ), mPenDefined( false )
 {
 }
 
@@ -507,16 +480,8 @@ QCPScatterStyle::QCPScatterStyle( const QPixmap& pixmap )
   natural size by default. To double the size of the path for example, set \a
   size to 12.
 */
-QCPScatterStyle::QCPScatterStyle( const QPainterPath& customPath,
-                                  const QPen& pen,
-                                  const QBrush& brush,
-                                  double size )
-    : mSize( size )
-    , mShape( ssCustom )
-    , mPen( pen )
-    , mBrush( brush )
-    , mCustomPath( customPath )
-    , mPenDefined( false )
+QCPScatterStyle::QCPScatterStyle( const QPainterPath& customPath, const QPen& pen, const QBrush& brush, double size )
+    : mSize( size ), mShape( ssCustom ), mPen( pen ), mBrush( brush ), mCustomPath( customPath ), mPenDefined( false )
 {
 }
 
@@ -927,8 +892,7 @@ void QCPLayer::addChild( QCPLayerable* layerable, bool prepend )
       mChildren.append( layerable );
   }
   else
-    qDebug() << Q_FUNC_INFO << "layerable is already child of this layer"
-             << reinterpret_cast<quintptr>( layerable );
+    qDebug() << Q_FUNC_INFO << "layerable is already child of this layer" << reinterpret_cast<quintptr>( layerable );
 }
 
 /*! \internal
@@ -944,8 +908,7 @@ void QCPLayer::addChild( QCPLayerable* layerable, bool prepend )
 void QCPLayer::removeChild( QCPLayerable* layerable )
 {
   if( !mChildren.removeOne( layerable ) )
-    qDebug() << Q_FUNC_INFO << "layerable is not child of this layer"
-             << reinterpret_cast<quintptr>( layerable );
+    qDebug() << Q_FUNC_INFO << "layerable is not child of this layer" << reinterpret_cast<quintptr>( layerable );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1092,20 +1055,14 @@ void QCPLayer::removeChild( QCPLayerable* layerable )
   plot does.
 */
 QCPLayerable::QCPLayerable( QCustomPlot* plot, QString targetLayer, QCPLayerable* parentLayerable )
-    : QObject( plot )
-    , mVisible( true )
-    , mParentPlot( plot )
-    , mParentLayerable( parentLayerable )
-    , mLayer( 0 )
-    , mAntialiased( true )
+    : QObject( plot ), mVisible( true ), mParentPlot( plot ), mParentLayerable( parentLayerable ), mLayer( 0 ), mAntialiased( true )
 {
   if( mParentPlot )
   {
     if( targetLayer.isEmpty() )
       setLayer( mParentPlot->currentLayer() );
     else if( !setLayer( targetLayer ) )
-      qDebug() << Q_FUNC_INFO << "setting QCPlayerable initial layer to" << targetLayer
-               << "failed.";
+      qDebug() << Q_FUNC_INFO << "setting QCPlayerable initial layer to" << targetLayer << "failed.";
   }
 }
 
@@ -1198,8 +1155,7 @@ void QCPLayerable::setAntialiased( bool enabled )
 */
 bool QCPLayerable::realVisibility() const
 {
-  return mVisible && ( !mLayer || mLayer->visible() ) &&
-         ( !mParentLayerable || mParentLayerable.data()->realVisibility() );
+  return mVisible && ( !mLayer || mLayer->visible() ) && ( !mParentLayerable || mParentLayerable.data()->realVisibility() );
 }
 
 /*!
@@ -1341,8 +1297,7 @@ bool QCPLayerable::moveToLayer( QCPLayer* layer, bool prepend )
   }
   if( layer && layer->parentPlot() != mParentPlot )
   {
-    qDebug() << Q_FUNC_INFO << "layer" << layer->name()
-             << "is not in same QCustomPlot as this layerable";
+    qDebug() << Q_FUNC_INFO << "layer" << layer->name() << "is not in same QCustomPlot as this layerable";
     return false;
   }
 
@@ -1367,9 +1322,7 @@ bool QCPLayerable::moveToLayer( QCPLayer* layer, bool prepend )
   takes into account is
   controlled via \a overrideElement.
 */
-void QCPLayerable::applyAntialiasingHint( QCPPainter* painter,
-                                          bool localAntialiased,
-                                          QCP::AntialiasedElement overrideElement ) const
+void QCPLayerable::applyAntialiasingHint( QCPPainter* painter, bool localAntialiased, QCP::AntialiasedElement overrideElement ) const
 {
   if( mParentPlot && mParentPlot->notAntialiasedElements().testFlag( overrideElement ) )
     painter->setAntialiasing( false );
@@ -1485,10 +1438,7 @@ QRect QCPLayerable::clipRect() const
 
   \see selectTest, deselectEvent
 */
-void QCPLayerable::selectEvent( QMouseEvent* event,
-                                bool additive,
-                                const QVariant& details,
-                                bool* selectionStateChanged )
+void QCPLayerable::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   Q_UNUSED( additive )
@@ -1732,8 +1682,7 @@ bool QCPRange::validRange( double lower, double upper )
           (lower < -minRange || lower > minRange) &&
           (upper < -minRange || upper > minRange));
           */
-  return ( lower > -maxRange && upper < maxRange && qAbs( lower - upper ) > minRange &&
-           qAbs( lower - upper ) < maxRange );
+  return ( lower > -maxRange && upper < maxRange && qAbs( lower - upper ) > minRange && qAbs( lower - upper ) < maxRange );
 }
 
 /*!
@@ -1755,8 +1704,7 @@ bool QCPRange::validRange( const QCPRange& range )
           (range.lower < -minRange || range.lower > minRange) &&
           (range.upper < -minRange || range.upper > minRange));
           */
-  return ( range.lower > -maxRange && range.upper < maxRange &&
-           qAbs( range.lower - range.upper ) > minRange &&
+  return ( range.lower > -maxRange && range.upper < maxRange && qAbs( range.lower - range.upper ) > minRange &&
            qAbs( range.lower - range.upper ) < maxRange );
 }
 
@@ -1983,8 +1931,7 @@ bool QCPRange::validRange( const QCPRange& range )
 /*!
   Creates a new QCPMarginGroup instance in \a parentPlot.
 */
-QCPMarginGroup::QCPMarginGroup( QCustomPlot* parentPlot )
-    : QObject( parentPlot ), mParentPlot( parentPlot )
+QCPMarginGroup::QCPMarginGroup( QCustomPlot* parentPlot ) : QObject( parentPlot ), mParentPlot( parentPlot )
 {
   mChildren.insert( QCP::msLeft, QList<QCPLayoutElement*>() );
   mChildren.insert( QCP::msRight, QList<QCPLayoutElement*>() );
@@ -2056,8 +2003,7 @@ int QCPMarginGroup::commonMargin( QCP::MarginSide side ) const
   {
     if( !elements.at( i )->autoMargins().testFlag( side ) )
       continue;
-    int m = qMax( elements.at( i )->calculateAutoMargin( side ),
-                  QCP::getMarginValue( elements.at( i )->minimumMargins(), side ) );
+    int m = qMax( elements.at( i )->calculateAutoMargin( side ), QCP::getMarginValue( elements.at( i )->minimumMargins(), side ) );
     if( m > result )
       result = m;
   }
@@ -2076,8 +2022,7 @@ void QCPMarginGroup::addChild( QCP::MarginSide side, QCPLayoutElement* element )
   if( !mChildren[side].contains( element ) )
     mChildren[side].append( element );
   else
-    qDebug() << Q_FUNC_INFO << "element is already child of this margin group side"
-             << reinterpret_cast<quintptr>( element );
+    qDebug() << Q_FUNC_INFO << "element is already child of this margin group side" << reinterpret_cast<quintptr>( element );
 }
 
 /*! \internal
@@ -2090,8 +2035,7 @@ void QCPMarginGroup::addChild( QCP::MarginSide side, QCPLayoutElement* element )
 void QCPMarginGroup::removeChild( QCP::MarginSide side, QCPLayoutElement* element )
 {
   if( !mChildren[side].removeOne( element ) )
-    qDebug() << Q_FUNC_INFO << "element is not child of this margin group side"
-             << reinterpret_cast<quintptr>( element );
+    qDebug() << Q_FUNC_INFO << "element is not child of this margin group side" << reinterpret_cast<quintptr>( element );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2253,8 +2197,7 @@ void QCPLayoutElement::setOuterRect( const QRect& rect )
   if( mOuterRect != rect )
   {
     mOuterRect = rect;
-    mRect = mOuterRect.adjusted( mMargins.left(), mMargins.top(), -mMargins.right(),
-                                 -mMargins.bottom() );
+    mRect = mOuterRect.adjusted( mMargins.left(), mMargins.top(), -mMargins.right(), -mMargins.bottom() );
   }
 }
 
@@ -2278,8 +2221,7 @@ void QCPLayoutElement::setMargins( const QMargins& margins )
   if( mMargins != margins )
   {
     mMargins = margins;
-    mRect = mOuterRect.adjusted( mMargins.left(), mMargins.top(), -mMargins.right(),
-                                 -mMargins.bottom() );
+    mRect = mOuterRect.adjusted( mMargins.left(), mMargins.top(), -mMargins.right(), -mMargins.bottom() );
   }
 }
 
@@ -2455,17 +2397,15 @@ void QCPLayoutElement::update( UpdatePhase phase )
       // calculation, either directly or via a
       // margin group:
       QMargins newMargins = mMargins;
-      foreach( QCP::MarginSide side, QList<QCP::MarginSide>() << QCP::msLeft << QCP::msRight
-                                                              << QCP::msTop << QCP::msBottom )
+      foreach( QCP::MarginSide side, QList<QCP::MarginSide>() << QCP::msLeft << QCP::msRight << QCP::msTop << QCP::msBottom )
       {
         if( mAutoMargins.testFlag( side ) )  // this side's margin shall be calculated automatically
         {
           if( mMarginGroups.contains( side ) )
-            QCP::setMarginValue(
-                newMargins, side,
-                mMarginGroups[side]->commonMargin( side ) );  // this side is part of a margin
-                                                              // group, so get the margin value
-                                                              // from that group
+            QCP::setMarginValue( newMargins, side,
+                                 mMarginGroups[side]->commonMargin( side ) );  // this side is part of a margin
+                                                                               // group, so get the margin value
+                                                                               // from that group
           else
             QCP::setMarginValue( newMargins, side,
                                  calculateAutoMargin( side ) );  // this side is not
@@ -2473,8 +2413,7 @@ void QCPLayoutElement::update( UpdatePhase phase )
                                                                  // so calculate the
                                                                  // value directly
           // apply minimum margin restrictions:
-          if( QCP::getMarginValue( newMargins, side ) <
-              QCP::getMarginValue( mMinimumMargins, side ) )
+          if( QCP::getMarginValue( newMargins, side ) < QCP::getMarginValue( mMinimumMargins, side ) )
             QCP::setMarginValue( newMargins, side, QCP::getMarginValue( mMinimumMargins, side ) );
         }
       }
@@ -2544,9 +2483,7 @@ QList<QCPLayoutElement*> QCPLayoutElement::elements( bool recursive ) const
   specific selection test
   behaviour.
 */
-double QCPLayoutElement::selectTest( const QPointF& pos,
-                                     bool onlySelectable,
-                                     QVariant* details ) const
+double QCPLayoutElement::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
 
@@ -2596,8 +2533,7 @@ void QCPLayoutElement::parentPlotInitialized( QCustomPlot* parentPlot )
 */
 int QCPLayoutElement::calculateAutoMargin( QCP::MarginSide side )
 {
-  return qMax( QCP::getMarginValue( mMargins, side ),
-               QCP::getMarginValue( mMinimumMargins, side ) );
+  return qMax( QCP::getMarginValue( mMargins, side ), QCP::getMarginValue( mMinimumMargins, side ) );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2952,15 +2888,11 @@ void QCPLayout::releaseElement( QCPLayoutElement* el )
 
   The return value is a QVector containing the section sizes.
 */
-QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
-                                         QVector<int> minSizes,
-                                         QVector<double> stretchFactors,
-                                         int totalSize ) const
+QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes, QVector<int> minSizes, QVector<double> stretchFactors, int totalSize ) const
 {
   if( maxSizes.size() != minSizes.size() || minSizes.size() != stretchFactors.size() )
   {
-    qDebug() << Q_FUNC_INFO << "Passed vector sizes aren't equal:" << maxSizes << minSizes
-             << stretchFactors;
+    qDebug() << Q_FUNC_INFO << "Passed vector sizes aren't equal:" << maxSizes << minSizes << stretchFactors;
     return QVector<int>();
   }
   if( stretchFactors.isEmpty() )
@@ -2989,17 +2921,15 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
   double freeSize = totalSize;
 
   int outerIterations = 0;
-  while( !unfinishedSections.isEmpty() &&
-         outerIterations < sectionCount * 2 )  // the iteration check ist just a
-                                               // failsafe in case something
-                                               // really strange happens
+  while( !unfinishedSections.isEmpty() && outerIterations < sectionCount * 2 )  // the iteration check ist just a
+                                                                                // failsafe in case something
+                                                                                // really strange happens
   {
     ++outerIterations;
     int innerIterations = 0;
-    while( !unfinishedSections.isEmpty() &&
-           innerIterations < sectionCount * 2 )  // the iteration check ist just a
-                                                 // failsafe in case something
-                                                 // really strange happens
+    while( !unfinishedSections.isEmpty() && innerIterations < sectionCount * 2 )  // the iteration check ist just a
+                                                                                  // failsafe in case something
+                                                                                  // really strange happens
     {
       ++innerIterations;
       // find section that hits its maximum next:
@@ -3008,8 +2938,7 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
       for( int i = 0; i < unfinishedSections.size(); ++i )
       {
         int secId = unfinishedSections.at( i );
-        double hitsMaxAt =
-            ( maxSizes.at( secId ) - sectionSizes.at( secId ) ) / stretchFactors.at( secId );
+        double hitsMaxAt = ( maxSizes.at( secId ) - sectionSizes.at( secId ) ) / stretchFactors.at( secId );
         if( hitsMaxAt < nextMax )
         {
           nextMax = hitsMaxAt;
@@ -3031,8 +2960,7 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
       {
         for( int i = 0; i < unfinishedSections.size(); ++i )
         {
-          sectionSizes[unfinishedSections.at( i )] +=
-              nextMax * stretchFactors.at( unfinishedSections.at( i ) );  // increment all sections
+          sectionSizes[unfinishedSections.at( i )] += nextMax * stretchFactors.at( unfinishedSections.at( i ) );  // increment all sections
           freeSize -= nextMax * stretchFactors.at( unfinishedSections.at( i ) );
         }
         unfinishedSections.removeOne( nextId );  // exclude the section that is now
@@ -3042,9 +2970,7 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
             // remaining sections
       {
         for( int i = 0; i < unfinishedSections.size(); ++i )
-          sectionSizes[unfinishedSections.at( i )] +=
-              nextMaxLimit *
-              stretchFactors.at( unfinishedSections.at( i ) );  // increment all sections
+          sectionSizes[unfinishedSections.at( i )] += nextMaxLimit * stretchFactors.at( unfinishedSections.at( i ) );  // increment all sections
         unfinishedSections.clear();
       }
     }
@@ -3221,8 +3147,7 @@ bool QCPLayoutGrid::addElement( int row, int column, QCPLayoutElement* element )
       return true;
     }
     else
-      qDebug() << Q_FUNC_INFO << "There is already an element in the specified row/column:" << row
-               << column;
+      qDebug() << Q_FUNC_INFO << "There is already an element in the specified row/column:" << row << column;
   }
   else
     qDebug() << Q_FUNC_INFO << "Can't add null element to row/column:" << row << column;
@@ -3293,8 +3218,7 @@ void QCPLayoutGrid::setColumnStretchFactors( const QList<double>& factors )
     {
       if( mColumnStretchFactors.at( i ) <= 0 )
       {
-        qDebug() << Q_FUNC_INFO
-                 << "Invalid stretch factor, must be positive:" << mColumnStretchFactors.at( i );
+        qDebug() << Q_FUNC_INFO << "Invalid stretch factor, must be positive:" << mColumnStretchFactors.at( i );
         mColumnStretchFactors[i] = 1;
       }
     }
@@ -3352,8 +3276,7 @@ void QCPLayoutGrid::setRowStretchFactors( const QList<double>& factors )
     {
       if( mRowStretchFactors.at( i ) <= 0 )
       {
-        qDebug() << Q_FUNC_INFO
-                 << "Invalid stretch factor, must be positive:" << mRowStretchFactors.at( i );
+        qDebug() << Q_FUNC_INFO << "Invalid stretch factor, must be positive:" << mRowStretchFactors.at( i );
         mRowStretchFactors[i] = 1;
       }
     }
@@ -3429,8 +3352,7 @@ void QCPLayoutGrid::expandTo( int newRowCount, int newColumnCount )
 */
 void QCPLayoutGrid::insertRow( int newIndex )
 {
-  if( mElements.isEmpty() ||
-      mElements.first().isEmpty() )  // if grid is completely empty, add first cell
+  if( mElements.isEmpty() || mElements.first().isEmpty() )  // if grid is completely empty, add first cell
   {
     expandTo( 1, 1 );
     return;
@@ -3458,8 +3380,7 @@ void QCPLayoutGrid::insertRow( int newIndex )
 */
 void QCPLayoutGrid::insertColumn( int newIndex )
 {
-  if( mElements.isEmpty() ||
-      mElements.first().isEmpty() )  // if grid is completely empty, add first cell
+  if( mElements.isEmpty() || mElements.first().isEmpty() )  // if grid is completely empty, add first cell
   {
     expandTo( 1, 1 );
     return;
@@ -3484,12 +3405,8 @@ void QCPLayoutGrid::updateLayout()
 
   int totalRowSpacing = ( rowCount() - 1 ) * mRowSpacing;
   int totalColSpacing = ( columnCount() - 1 ) * mColumnSpacing;
-  QVector<int> colWidths =
-      getSectionSizes( maxColWidths, minColWidths, mColumnStretchFactors.toVector(),
-                       mRect.width() - totalColSpacing );
-  QVector<int> rowHeights =
-      getSectionSizes( maxRowHeights, minRowHeights, mRowStretchFactors.toVector(),
-                       mRect.height() - totalRowSpacing );
+  QVector<int> colWidths = getSectionSizes( maxColWidths, minColWidths, mColumnStretchFactors.toVector(), mRect.width() - totalColSpacing );
+  QVector<int> rowHeights = getSectionSizes( maxRowHeights, minRowHeights, mRowStretchFactors.toVector(), mRect.height() - totalRowSpacing );
 
   // go through cells and set rects accordingly:
   int yOffset = mRect.top();
@@ -3503,8 +3420,7 @@ void QCPLayoutGrid::updateLayout()
       if( col > 0 )
         xOffset += colWidths.at( col - 1 ) + mColumnSpacing;
       if( mElements.at( row ).at( col ) )
-        mElements.at( row ).at( col )->setOuterRect(
-            QRect( xOffset, yOffset, colWidths.at( col ), rowHeights.at( row ) ) );
+        mElements.at( row ).at( col )->setOuterRect( QRect( xOffset, yOffset, colWidths.at( col ), rowHeights.at( row ) ) );
     }
   }
 }
@@ -3648,8 +3564,7 @@ QSize QCPLayoutGrid::minimumSizeHint() const
     result.rwidth() += minColWidths.at( i );
   for( int i = 0; i < minRowHeights.size(); ++i )
     result.rheight() += minRowHeights.at( i );
-  result.rwidth() +=
-      qMax( 0, columnCount() - 1 ) * mColumnSpacing + mMargins.left() + mMargins.right();
+  result.rwidth() += qMax( 0, columnCount() - 1 ) * mColumnSpacing + mMargins.left() + mMargins.right();
   result.rheight() += qMax( 0, rowCount() - 1 ) * mRowSpacing + mMargins.top() + mMargins.bottom();
   return result;
 }
@@ -3665,8 +3580,7 @@ QSize QCPLayoutGrid::maximumSizeHint() const
     result.setWidth( qMin( result.width() + maxColWidths.at( i ), QWIDGETSIZE_MAX ) );
   for( int i = 0; i < maxRowHeights.size(); ++i )
     result.setHeight( qMin( result.height() + maxRowHeights.at( i ), QWIDGETSIZE_MAX ) );
-  result.rwidth() +=
-      qMax( 0, columnCount() - 1 ) * mColumnSpacing + mMargins.left() + mMargins.right();
+  result.rwidth() += qMax( 0, columnCount() - 1 ) * mColumnSpacing + mMargins.left() + mMargins.right();
   result.rheight() += qMax( 0, rowCount() - 1 ) * mRowSpacing + mMargins.top() + mMargins.bottom();
   return result;
 }
@@ -3685,8 +3599,7 @@ QSize QCPLayoutGrid::maximumSizeHint() const
 
   \see getMaximumRowColSizes
 */
-void QCPLayoutGrid::getMinimumRowColSizes( QVector<int>* minColWidths,
-                                           QVector<int>* minRowHeights ) const
+void QCPLayoutGrid::getMinimumRowColSizes( QVector<int>* minColWidths, QVector<int>* minRowHeights ) const
 {
   *minColWidths = QVector<int>( columnCount(), 0 );
   *minRowHeights = QVector<int>( rowCount(), 0 );
@@ -3698,8 +3611,7 @@ void QCPLayoutGrid::getMinimumRowColSizes( QVector<int>* minColWidths,
       {
         QSize minHint = mElements.at( row ).at( col )->minimumSizeHint();
         QSize min = mElements.at( row ).at( col )->minimumSize();
-        QSize final( min.width() > 0 ? min.width() : minHint.width(),
-                     min.height() > 0 ? min.height() : minHint.height() );
+        QSize final( min.width() > 0 ? min.width() : minHint.width(), min.height() > 0 ? min.height() : minHint.height() );
         if( minColWidths->at( col ) < final.width() )
           ( *minColWidths )[col] = final.width();
         if( minRowHeights->at( row ) < final.height() )
@@ -3724,8 +3636,7 @@ void QCPLayoutGrid::getMinimumRowColSizes( QVector<int>* minColWidths,
 
   \see getMinimumRowColSizes
 */
-void QCPLayoutGrid::getMaximumRowColSizes( QVector<int>* maxColWidths,
-                                           QVector<int>* maxRowHeights ) const
+void QCPLayoutGrid::getMaximumRowColSizes( QVector<int>* maxColWidths, QVector<int>* maxRowHeights ) const
 {
   *maxColWidths = QVector<int>( columnCount(), QWIDGETSIZE_MAX );
   *maxRowHeights = QVector<int>( rowCount(), QWIDGETSIZE_MAX );
@@ -3916,24 +3827,16 @@ void QCPLayoutInset::updateLayout()
     QSize finalMinSize, finalMaxSize;
     QSize minSizeHint = mElements.at( i )->minimumSizeHint();
     QSize maxSizeHint = mElements.at( i )->maximumSizeHint();
-    finalMinSize.setWidth( mElements.at( i )->minimumSize().width() > 0
-                               ? mElements.at( i )->minimumSize().width()
-                               : minSizeHint.width() );
-    finalMinSize.setHeight( mElements.at( i )->minimumSize().height() > 0
-                                ? mElements.at( i )->minimumSize().height()
-                                : minSizeHint.height() );
-    finalMaxSize.setWidth( mElements.at( i )->maximumSize().width() < QWIDGETSIZE_MAX
-                               ? mElements.at( i )->maximumSize().width()
-                               : maxSizeHint.width() );
-    finalMaxSize.setHeight( mElements.at( i )->maximumSize().height() < QWIDGETSIZE_MAX
-                                ? mElements.at( i )->maximumSize().height()
-                                : maxSizeHint.height() );
+    finalMinSize.setWidth( mElements.at( i )->minimumSize().width() > 0 ? mElements.at( i )->minimumSize().width() : minSizeHint.width() );
+    finalMinSize.setHeight( mElements.at( i )->minimumSize().height() > 0 ? mElements.at( i )->minimumSize().height() : minSizeHint.height() );
+    finalMaxSize.setWidth( mElements.at( i )->maximumSize().width() < QWIDGETSIZE_MAX ? mElements.at( i )->maximumSize().width()
+                                                                                      : maxSizeHint.width() );
+    finalMaxSize.setHeight( mElements.at( i )->maximumSize().height() < QWIDGETSIZE_MAX ? mElements.at( i )->maximumSize().height()
+                                                                                        : maxSizeHint.height() );
     if( mInsetPlacement.at( i ) == ipFree )
     {
-      insetRect = QRect( rect().x() + rect().width() * mInsetRect.at( i ).x(),
-                         rect().y() + rect().height() * mInsetRect.at( i ).y(),
-                         rect().width() * mInsetRect.at( i ).width(),
-                         rect().height() * mInsetRect.at( i ).height() );
+      insetRect = QRect( rect().x() + rect().width() * mInsetRect.at( i ).x(), rect().y() + rect().height() * mInsetRect.at( i ).y(),
+                         rect().width() * mInsetRect.at( i ).width(), rect().height() * mInsetRect.at( i ).height() );
       if( insetRect.size().width() < finalMinSize.width() )
         insetRect.setWidth( finalMinSize.width() );
       if( insetRect.size().height() < finalMinSize.height() )
@@ -3952,15 +3855,13 @@ void QCPLayoutInset::updateLayout()
       else if( al.testFlag( Qt::AlignRight ) )
         insetRect.moveRight( rect().x() + rect().width() );
       else
-        insetRect.moveLeft( rect().x() + rect().width() * 0.5 -
-                            finalMinSize.width() * 0.5 );  // default to Qt::AlignHCenter
+        insetRect.moveLeft( rect().x() + rect().width() * 0.5 - finalMinSize.width() * 0.5 );  // default to Qt::AlignHCenter
       if( al.testFlag( Qt::AlignTop ) )
         insetRect.moveTop( rect().y() );
       else if( al.testFlag( Qt::AlignBottom ) )
         insetRect.moveBottom( rect().y() + rect().height() );
       else
-        insetRect.moveTop( rect().y() + rect().height() * 0.5 -
-                           finalMinSize.height() * 0.5 );  // default to Qt::AlignVCenter
+        insetRect.moveTop( rect().y() + rect().height() * 0.5 - finalMinSize.height() * 0.5 );  // default to Qt::AlignVCenter
     }
     mElements.at( i )->setOuterRect( insetRect );
   }
@@ -4034,9 +3935,7 @@ bool QCPLayoutInset::take( QCPLayoutElement* element )
   See \ref QCPLayerable::selectTest for a general explanation of this virtual
   method.
 */
-double QCPLayoutInset::selectTest( const QPointF& pos,
-                                   bool onlySelectable,
-                                   QVariant* details ) const
+double QCPLayoutInset::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
   if( onlySelectable )
@@ -4047,8 +3946,7 @@ double QCPLayoutInset::selectTest( const QPointF& pos,
     // inset layout shall only return positive selectTest, if actually an inset
     // object is at pos
     // else it would block the entire underlying QCPAxisRect with its surface.
-    if( mElements.at( i )->realVisibility() &&
-        mElements.at( i )->selectTest( pos, onlySelectable ) >= 0 )
+    if( mElements.at( i )->realVisibility() && mElements.at( i )->selectTest( pos, onlySelectable ) >= 0 )
       return mParentPlot->selectionTolerance() * 0.99;
   }
   return -1;
@@ -4157,10 +4055,7 @@ QCPLineEnding::QCPLineEnding() : mStyle( esNone ), mWidth( 8 ), mLength( 10 ), m
 /*!
   Creates a QCPLineEnding instance with the specified values.
 */
-QCPLineEnding::QCPLineEnding( QCPLineEnding::EndingStyle style,
-                              double width,
-                              double length,
-                              bool inverted )
+QCPLineEnding::QCPLineEnding( QCPLineEnding::EndingStyle style, double width, double length, bool inverted )
     : mStyle( style ), mWidth( width ), mLength( length ), mInverted( inverted )
 {
 }
@@ -4320,8 +4215,7 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, const QVect
     break;
   case esFlatArrow:
   {
-    QPointF points[3] = {pos.toPointF(), ( pos - lengthVec + widthVec ).toPointF(),
-                         ( pos - lengthVec - widthVec ).toPointF()};
+    QPointF points[3] = {pos.toPointF(), ( pos - lengthVec + widthVec ).toPointF(), ( pos - lengthVec - widthVec ).toPointF()};
     painter->setPen( miterPen );
     painter->setBrush( brush );
     painter->drawConvexPolygon( points, 3 );
@@ -4331,8 +4225,7 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, const QVect
   }
   case esSpikeArrow:
   {
-    QPointF points[4] = {pos.toPointF(), ( pos - lengthVec + widthVec ).toPointF(),
-                         ( pos - lengthVec * 0.8f ).toPointF(),
+    QPointF points[4] = {pos.toPointF(), ( pos - lengthVec + widthVec ).toPointF(), ( pos - lengthVec * 0.8f ).toPointF(),
                          ( pos - lengthVec - widthVec ).toPointF()};
     painter->setPen( miterPen );
     painter->setBrush( brush );
@@ -4343,8 +4236,7 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, const QVect
   }
   case esLineArrow:
   {
-    QPointF points[3] = {( pos - lengthVec + widthVec ).toPointF(), pos.toPointF(),
-                         ( pos - lengthVec - widthVec ).toPointF()};
+    QPointF points[3] = {( pos - lengthVec + widthVec ).toPointF(), pos.toPointF(), ( pos - lengthVec - widthVec ).toPointF()};
     painter->setPen( miterPen );
     painter->drawPolyline( points, 3 );
     painter->setPen( penBackup );
@@ -4360,9 +4252,8 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, const QVect
   case esSquare:
   {
     QVector2D widthVecPerp( -widthVec.y(), widthVec.x() );
-    QPointF points[4] = {
-        ( pos - widthVecPerp + widthVec ).toPointF(), ( pos - widthVecPerp - widthVec ).toPointF(),
-        ( pos + widthVecPerp - widthVec ).toPointF(), ( pos + widthVecPerp + widthVec ).toPointF()};
+    QPointF points[4] = {( pos - widthVecPerp + widthVec ).toPointF(), ( pos - widthVecPerp - widthVec ).toPointF(),
+                         ( pos + widthVecPerp - widthVec ).toPointF(), ( pos + widthVecPerp + widthVec ).toPointF()};
     painter->setPen( miterPen );
     painter->setBrush( brush );
     painter->drawConvexPolygon( points, 4 );
@@ -4373,8 +4264,8 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, const QVect
   case esDiamond:
   {
     QVector2D widthVecPerp( -widthVec.y(), widthVec.x() );
-    QPointF points[4] = {( pos - widthVecPerp ).toPointF(), ( pos - widthVec ).toPointF(),
-                         ( pos + widthVecPerp ).toPointF(), ( pos + widthVec ).toPointF()};
+    QPointF points[4] = {( pos - widthVecPerp ).toPointF(), ( pos - widthVec ).toPointF(), ( pos + widthVecPerp ).toPointF(),
+                         ( pos + widthVec ).toPointF()};
     painter->setPen( miterPen );
     painter->setBrush( brush );
     painter->drawConvexPolygon( points, 4 );
@@ -4394,27 +4285,24 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, const QVect
   }
   case esSkewedBar:
   {
-    if( qFuzzyIsNull( painter->pen().widthF() ) &&
-        !painter->modes().testFlag( QCPPainter::pmNonCosmetic ) )
+    if( qFuzzyIsNull( painter->pen().widthF() ) && !painter->modes().testFlag( QCPPainter::pmNonCosmetic ) )
     {
       // if drawing with cosmetic pen (perfectly thin stroke, happens only in
       // vector exports), draw bar exactly on tip
       // of line
-      painter->drawLine(
-          ( pos + widthVec + lengthVec * 0.2f * ( mInverted ? -1 : 1 ) ).toPointF(),
-          ( pos - widthVec - lengthVec * 0.2f * ( mInverted ? -1 : 1 ) ).toPointF() );
+      painter->drawLine( ( pos + widthVec + lengthVec * 0.2f * ( mInverted ? -1 : 1 ) ).toPointF(),
+                         ( pos - widthVec - lengthVec * 0.2f * ( mInverted ? -1 : 1 ) ).toPointF() );
     }
     else
     {
       // if drawing with thick (non-cosmetic) pen, shift bar a little in line
       // direction to prevent line from sticking
       // through bar slightly
-      painter->drawLine( ( pos + widthVec + lengthVec * 0.2f * ( mInverted ? -1 : 1 ) +
-                           dir.normalized() * qMax( 1.0f, (float)painter->pen().widthF() ) * 0.5f )
-                             .toPointF(),
-                         ( pos - widthVec - lengthVec * 0.2f * ( mInverted ? -1 : 1 ) +
-                           dir.normalized() * qMax( 1.0f, (float)painter->pen().widthF() ) * 0.5f )
-                             .toPointF() );
+      painter->drawLine(
+          ( pos + widthVec + lengthVec * 0.2f * ( mInverted ? -1 : 1 ) + dir.normalized() * qMax( 1.0f, (float)painter->pen().widthF() ) * 0.5f )
+              .toPointF(),
+          ( pos - widthVec - lengthVec * 0.2f * ( mInverted ? -1 : 1 ) + dir.normalized() * qMax( 1.0f, (float)painter->pen().widthF() ) * 0.5f )
+              .toPointF() );
     }
     break;
   }
@@ -4461,8 +4349,7 @@ void QCPLineEnding::draw( QCPPainter* painter, const QVector2D& pos, double angl
   You shouldn't instantiate grids on their own, since every QCPAxis brings its
   own QCPGrid.
 */
-QCPGrid::QCPGrid( QCPAxis* parentAxis )
-    : QCPLayerable( parentAxis->parentPlot(), "", parentAxis ), mParentAxis( parentAxis )
+QCPGrid::QCPGrid( QCPAxis* parentAxis ) : QCPLayerable( parentAxis->parentPlot(), "", parentAxis ), mParentAxis( parentAxis )
 {
   // warning: this is called in QCPAxis constructor, so parentAxis members
   // should not be accessed/called
@@ -4593,8 +4480,7 @@ void QCPGrid::drawGridLines( QCPPainter* painter ) const
   {
     // draw zeroline:
     int zeroLineIndex = -1;
-    if( mZeroLinePen.style() != Qt::NoPen && mParentAxis->mRange.lower < 0 &&
-        mParentAxis->mRange.upper > 0 )
+    if( mZeroLinePen.style() != Qt::NoPen && mParentAxis->mRange.lower < 0 && mParentAxis->mRange.upper > 0 )
     {
       applyAntialiasingHint( painter, mAntialiasedZeroLine, QCP::aeZeroLine );
       painter->setPen( mZeroLinePen );
@@ -4605,8 +4491,7 @@ void QCPGrid::drawGridLines( QCPPainter* painter ) const
         {
           zeroLineIndex = i;
           t = mParentAxis->coordToPixel( mParentAxis->mTickVector.at( i ) );  // x
-          painter->drawLine(
-              QLineF( t, mParentAxis->mAxisRect->bottom(), t, mParentAxis->mAxisRect->top() ) );
+          painter->drawLine( QLineF( t, mParentAxis->mAxisRect->bottom(), t, mParentAxis->mAxisRect->top() ) );
           break;
         }
       }
@@ -4617,18 +4502,16 @@ void QCPGrid::drawGridLines( QCPPainter* painter ) const
     for( int i = lowTick; i <= highTick; ++i )
     {
       if( i == zeroLineIndex )
-        continue;  // don't draw a gridline on top of the zeroline
+        continue;                                                         // don't draw a gridline on top of the zeroline
       t = mParentAxis->coordToPixel( mParentAxis->mTickVector.at( i ) );  // x
-      painter->drawLine(
-          QLineF( t, mParentAxis->mAxisRect->bottom(), t, mParentAxis->mAxisRect->top() ) );
+      painter->drawLine( QLineF( t, mParentAxis->mAxisRect->bottom(), t, mParentAxis->mAxisRect->top() ) );
     }
   }
   else
   {
     // draw zeroline:
     int zeroLineIndex = -1;
-    if( mZeroLinePen.style() != Qt::NoPen && mParentAxis->mRange.lower < 0 &&
-        mParentAxis->mRange.upper > 0 )
+    if( mZeroLinePen.style() != Qt::NoPen && mParentAxis->mRange.lower < 0 && mParentAxis->mRange.upper > 0 )
     {
       applyAntialiasingHint( painter, mAntialiasedZeroLine, QCP::aeZeroLine );
       painter->setPen( mZeroLinePen );
@@ -4639,8 +4522,7 @@ void QCPGrid::drawGridLines( QCPPainter* painter ) const
         {
           zeroLineIndex = i;
           t = mParentAxis->coordToPixel( mParentAxis->mTickVector.at( i ) );  // y
-          painter->drawLine(
-              QLineF( mParentAxis->mAxisRect->left(), t, mParentAxis->mAxisRect->right(), t ) );
+          painter->drawLine( QLineF( mParentAxis->mAxisRect->left(), t, mParentAxis->mAxisRect->right(), t ) );
           break;
         }
       }
@@ -4651,10 +4533,9 @@ void QCPGrid::drawGridLines( QCPPainter* painter ) const
     for( int i = lowTick; i <= highTick; ++i )
     {
       if( i == zeroLineIndex )
-        continue;  // don't draw a gridline on top of the zeroline
+        continue;                                                         // don't draw a gridline on top of the zeroline
       t = mParentAxis->coordToPixel( mParentAxis->mTickVector.at( i ) );  // y
-      painter->drawLine(
-          QLineF( mParentAxis->mAxisRect->left(), t, mParentAxis->mAxisRect->right(), t ) );
+      painter->drawLine( QLineF( mParentAxis->mAxisRect->left(), t, mParentAxis->mAxisRect->right(), t ) );
     }
   }
 }
@@ -4681,8 +4562,7 @@ void QCPGrid::drawSubGridLines( QCPPainter* painter ) const
     for( int i = 0; i < mParentAxis->mSubTickVector.size(); ++i )
     {
       t = mParentAxis->coordToPixel( mParentAxis->mSubTickVector.at( i ) );  // x
-      painter->drawLine(
-          QLineF( t, mParentAxis->mAxisRect->bottom(), t, mParentAxis->mAxisRect->top() ) );
+      painter->drawLine( QLineF( t, mParentAxis->mAxisRect->bottom(), t, mParentAxis->mAxisRect->top() ) );
     }
   }
   else
@@ -4690,8 +4570,7 @@ void QCPGrid::drawSubGridLines( QCPPainter* painter ) const
     for( int i = 0; i < mParentAxis->mSubTickVector.size(); ++i )
     {
       t = mParentAxis->coordToPixel( mParentAxis->mSubTickVector.at( i ) );  // y
-      painter->drawLine(
-          QLineF( mParentAxis->mAxisRect->left(), t, mParentAxis->mAxisRect->right(), t ) );
+      painter->drawLine( QLineF( mParentAxis->mAxisRect->left(), t, mParentAxis->mAxisRect->right(), t ) );
     }
   }
 }
@@ -4838,8 +4717,7 @@ QCPAxis::QCPAxis( QCPAxisRect* parent, AxisType type )
     , mAutoTickLabels( true )
     , mTickLabelType( ltNumber )
     , mTickLabelFont( mParentPlot->font() )
-    , mSelectedTickLabelFont(
-          QFont( mTickLabelFont.family(), mTickLabelFont.pointSize(), QFont::Bold ) )
+    , mSelectedTickLabelFont( QFont( mTickLabelFont.family(), mTickLabelFont.pointSize(), QFont::Bold ) )
     , mTickLabelColor( Qt::black )
     , mSelectedTickLabelColor( Qt::blue )
     , mDateTimeFormat( "hh:mm:ss\ndd.MM.yy" )
@@ -5627,8 +5505,7 @@ void QCPAxis::setNumberFormat( const QString& formatCode )
   }
   else
   {
-    qDebug() << Q_FUNC_INFO
-             << "Invalid number format code (first char not in 'eEfgG'):" << formatCode;
+    qDebug() << Q_FUNC_INFO << "Invalid number format code (first char not in 'eEfgG'):" << formatCode;
     return;
   }
   if( formatCode.length() < 2 )
@@ -5668,8 +5545,7 @@ void QCPAxis::setNumberFormat( const QString& formatCode )
   }
   else
   {
-    qDebug() << Q_FUNC_INFO
-             << "Invalid number format code (third char neither 'c' nor 'd'):" << formatCode;
+    qDebug() << Q_FUNC_INFO << "Invalid number format code (third char neither 'c' nor 'd'):" << formatCode;
     return;
   }
 }
@@ -6178,8 +6054,7 @@ void QCPAxis::scaleRange( double factor, double center )
   }
   else  // mScaleType == stLogarithmic
   {
-    if( ( mRange.upper < 0 && center < 0 ) ||
-        ( mRange.upper > 0 && center > 0 ) )  // make sure center has same sign as range
+    if( ( mRange.upper < 0 && center < 0 ) || ( mRange.upper > 0 && center > 0 ) )  // make sure center has same sign as range
     {
       QCPRange newRange;
       newRange.lower = pow( mRange.lower / center, factor ) * center;
@@ -6255,8 +6130,7 @@ void QCPAxis::rescale( bool onlyVisiblePlottables )
     bool currentFoundRange;
     QCPAbstractPlottable::SignDomain signDomain = QCPAbstractPlottable::sdBoth;
     if( mScaleType == stLogarithmic )
-      signDomain = ( mRange.upper < 0 ? QCPAbstractPlottable::sdNegative
-                                      : QCPAbstractPlottable::sdPositive );
+      signDomain = ( mRange.upper < 0 ? QCPAbstractPlottable::sdNegative : QCPAbstractPlottable::sdPositive );
     if( p.at( i )->keyAxis() == this )
       plottableRange = p.at( i )->getKeyRange( currentFoundRange, signDomain );
     else
@@ -6277,10 +6151,9 @@ void QCPAxis::rescale( bool onlyVisiblePlottables )
                                              // this
     // axis dimension), shift current range to at least center the plottable
     {
-      double center = ( newRange.lower + newRange.upper ) *
-                      0.5;  // upper and lower should be equal anyway, but just to
-                            // make sure, incase validRange returned false for
-                            // other reason
+      double center = ( newRange.lower + newRange.upper ) * 0.5;  // upper and lower should be equal anyway, but just to
+                                                                  // make sure, incase validRange returned false for
+                                                                  // other reason
       if( mScaleType == stLinear )
       {
         newRange.lower = center - mRange.size() / 2.0;
@@ -6307,22 +6180,16 @@ double QCPAxis::pixelToCoord( double value ) const
     if( mScaleType == stLinear )
     {
       if( !mRangeReversed )
-        return ( value - mAxisRect->left() ) / (double)mAxisRect->width() * mRange.size() +
-               mRange.lower;
+        return ( value - mAxisRect->left() ) / (double)mAxisRect->width() * mRange.size() + mRange.lower;
       else
-        return -( value - mAxisRect->left() ) / (double)mAxisRect->width() * mRange.size() +
-               mRange.upper;
+        return -( value - mAxisRect->left() ) / (double)mAxisRect->width() * mRange.size() + mRange.upper;
     }
     else  // mScaleType == stLogarithmic
     {
       if( !mRangeReversed )
-        return pow( mRange.upper / mRange.lower,
-                    ( value - mAxisRect->left() ) / (double)mAxisRect->width() ) *
-               mRange.lower;
+        return pow( mRange.upper / mRange.lower, ( value - mAxisRect->left() ) / (double)mAxisRect->width() ) * mRange.lower;
       else
-        return pow( mRange.upper / mRange.lower,
-                    ( mAxisRect->left() - value ) / (double)mAxisRect->width() ) *
-               mRange.upper;
+        return pow( mRange.upper / mRange.lower, ( mAxisRect->left() - value ) / (double)mAxisRect->width() ) * mRange.upper;
     }
   }
   else  // orientation() == Qt::Vertical
@@ -6330,22 +6197,16 @@ double QCPAxis::pixelToCoord( double value ) const
     if( mScaleType == stLinear )
     {
       if( !mRangeReversed )
-        return ( mAxisRect->bottom() - value ) / (double)mAxisRect->height() * mRange.size() +
-               mRange.lower;
+        return ( mAxisRect->bottom() - value ) / (double)mAxisRect->height() * mRange.size() + mRange.lower;
       else
-        return -( mAxisRect->bottom() - value ) / (double)mAxisRect->height() * mRange.size() +
-               mRange.upper;
+        return -( mAxisRect->bottom() - value ) / (double)mAxisRect->height() * mRange.size() + mRange.upper;
     }
     else  // mScaleType == stLogarithmic
     {
       if( !mRangeReversed )
-        return pow( mRange.upper / mRange.lower,
-                    ( mAxisRect->bottom() - value ) / (double)mAxisRect->height() ) *
-               mRange.lower;
+        return pow( mRange.upper / mRange.lower, ( mAxisRect->bottom() - value ) / (double)mAxisRect->height() ) * mRange.lower;
       else
-        return pow( mRange.upper / mRange.lower,
-                    ( value - mAxisRect->bottom() ) / (double)mAxisRect->height() ) *
-               mRange.upper;
+        return pow( mRange.upper / mRange.lower, ( value - mAxisRect->bottom() ) / (double)mAxisRect->height() ) * mRange.upper;
     }
   }
 }
@@ -6378,13 +6239,9 @@ double QCPAxis::coordToPixel( double value ) const
       else
       {
         if( !mRangeReversed )
-          return baseLog( value / mRange.lower ) / baseLog( mRange.upper / mRange.lower ) *
-                     mAxisRect->width() +
-                 mAxisRect->left();
+          return baseLog( value / mRange.lower ) / baseLog( mRange.upper / mRange.lower ) * mAxisRect->width() + mAxisRect->left();
         else
-          return baseLog( mRange.upper / value ) / baseLog( mRange.upper / mRange.lower ) *
-                     mAxisRect->width() +
-                 mAxisRect->left();
+          return baseLog( mRange.upper / value ) / baseLog( mRange.upper / mRange.lower ) * mAxisRect->width() + mAxisRect->left();
       }
     }
   }
@@ -6410,13 +6267,9 @@ double QCPAxis::coordToPixel( double value ) const
       else
       {
         if( !mRangeReversed )
-          return mAxisRect->bottom() - baseLog( value / mRange.lower ) /
-                                           baseLog( mRange.upper / mRange.lower ) *
-                                           mAxisRect->height();
+          return mAxisRect->bottom() - baseLog( value / mRange.lower ) / baseLog( mRange.upper / mRange.lower ) * mAxisRect->height();
         else
-          return mAxisRect->bottom() - baseLog( mRange.upper / value ) /
-                                           baseLog( mRange.upper / mRange.lower ) *
-                                           mAxisRect->height();
+          return mAxisRect->bottom() - baseLog( mRange.upper / value ) / baseLog( mRange.upper / mRange.lower ) * mAxisRect->height();
       }
     }
   }
@@ -6478,8 +6331,7 @@ QList<QCPAbstractPlottable*> QCPAxis::plottables() const
 
   for( int i = 0; i < mParentPlot->mPlottables.size(); ++i )
   {
-    if( mParentPlot->mPlottables.at( i )->keyAxis() == this ||
-        mParentPlot->mPlottables.at( i )->valueAxis() == this )
+    if( mParentPlot->mPlottables.at( i )->keyAxis() == this || mParentPlot->mPlottables.at( i )->valueAxis() == this )
       result.append( mParentPlot->mPlottables.at( i ) );
   }
   return result;
@@ -6498,8 +6350,7 @@ QList<QCPGraph*> QCPAxis::graphs() const
 
   for( int i = 0; i < mParentPlot->mGraphs.size(); ++i )
   {
-    if( mParentPlot->mGraphs.at( i )->keyAxis() == this ||
-        mParentPlot->mGraphs.at( i )->valueAxis() == this )
+    if( mParentPlot->mGraphs.at( i )->keyAxis() == this || mParentPlot->mGraphs.at( i )->valueAxis() == this )
       result.append( mParentPlot->mGraphs.at( i ) );
   }
   return result;
@@ -6630,12 +6481,10 @@ void QCPAxis::setupTickVectors()
     int subTickIndex = 0;
     bool done = false;
     int lowTick = mLowestVisibleTick > 0 ? mLowestVisibleTick - 1 : mLowestVisibleTick;
-    int highTick = mHighestVisibleTick < mTickVector.size() - 1 ? mHighestVisibleTick + 1
-                                                                : mHighestVisibleTick;
+    int highTick = mHighestVisibleTick < mTickVector.size() - 1 ? mHighestVisibleTick + 1 : mHighestVisibleTick;
     for( int i = lowTick + 1; i <= highTick; ++i )
     {
-      subTickStep =
-          ( mTickVector.at( i ) - mTickVector.at( i - 1 ) ) / (double)( mSubTickCount + 1 );
+      subTickStep = ( mTickVector.at( i ) - mTickVector.at( i - 1 ) ) / (double)( mSubTickCount + 1 );
       for( int k = 1; k <= mSubTickCount; ++k )
       {
         subTickPosition = mTickVector.at( i - 1 ) + k * subTickStep;
@@ -6663,8 +6512,7 @@ void QCPAxis::setupTickVectors()
     if( mTickLabelType == ltNumber )
     {
       for( int i = mLowestVisibleTick; i <= mHighestVisibleTick; ++i )
-        mTickVectorLabels[i] = mParentPlot->locale().toString(
-            mTickVector.at( i ), mNumberFormatChar, mNumberPrecision );
+        mTickVectorLabels[i] = mParentPlot->locale().toString( mTickVector.at( i ), mNumberFormatChar, mNumberPrecision );
     }
     else if( mTickLabelType == ltDateTime )
     {
@@ -6673,14 +6521,11 @@ void QCPAxis::setupTickVectors()
 #if QT_VERSION < QT_VERSION_CHECK( 4, 7, 0 )  // use fromMSecsSinceEpoch function
                                               // if available, to gain sub-second
         // accuracy on tick labels (e.g. for format "hh:mm:ss:zzz")
-        mTickVectorLabels[i] = mParentPlot->locale().toString(
-            QDateTime::fromTime_t( mTickVector.at( i ) ).toTimeSpec( mDateTimeSpec ),
-            mDateTimeFormat );
+        mTickVectorLabels[i] =
+            mParentPlot->locale().toString( QDateTime::fromTime_t( mTickVector.at( i ) ).toTimeSpec( mDateTimeSpec ), mDateTimeFormat );
 #else
         mTickVectorLabels[i] = mParentPlot->locale().toString(
-            QDateTime::fromMSecsSinceEpoch( mTickVector.at( i ) * 1000 )
-                .toTimeSpec( mDateTimeSpec ),
-            mDateTimeFormat );
+            QDateTime::fromMSecsSinceEpoch( mTickVector.at( i ) * 1000 ).toTimeSpec( mDateTimeSpec ), mDateTimeFormat );
 #endif
       }
     }
@@ -6717,13 +6562,10 @@ void QCPAxis::generateAutoTicks()
     if( mAutoTickStep )
     {
       // Generate tick positions according to linear scaling:
-      mTickStep = mRange.size() /
-                  (double)( mAutoTickCount + 1e-10 );  // mAutoTickCount ticks on average, the small
-                                                       // addition is to prevent jitter on exact
-                                                       // integers
-      double magnitudeFactor =
-          qPow( 10.0, qFloor( qLn( mTickStep ) /
-                              qLn( 10.0 ) ) );  // get magnitude factor e.g. 0.01, 1, 10, 1000 etc.
+      mTickStep = mRange.size() / (double)( mAutoTickCount + 1e-10 );                   // mAutoTickCount ticks on average, the small
+                                                                                        // addition is to prevent jitter on exact
+                                                                                        // integers
+      double magnitudeFactor = qPow( 10.0, qFloor( qLn( mTickStep ) / qLn( 10.0 ) ) );  // get magnitude factor e.g. 0.01, 1, 10, 1000 etc.
       double tickStepMantissa = mTickStep / magnitudeFactor;
       if( tickStepMantissa < 5 )
       {
@@ -6785,8 +6627,7 @@ void QCPAxis::generateAutoTicks()
           // different sign
     {
       mTickVector.clear();
-      qDebug() << Q_FUNC_INFO << "Invalid range for logarithmic plot: " << mRange.lower << "-"
-               << mRange.upper;
+      qDebug() << Q_FUNC_INFO << "Invalid range for logarithmic plot: " << mRange.lower << "-" << mRange.upper;
     }
   }
 }
@@ -6817,9 +6658,7 @@ int QCPAxis::calculateAutoSubTickCount( double tickStep ) const
                                // can be found
 
   // get mantissa of tickstep:
-  double magnitudeFactor =
-      qPow( 10.0, qFloor( qLn( tickStep ) /
-                          qLn( 10.0 ) ) );  // get magnitude factor e.g. 0.01, 1, 10, 1000 etc.
+  double magnitudeFactor = qPow( 10.0, qFloor( qLn( tickStep ) / qLn( 10.0 ) ) );  // get magnitude factor e.g. 0.01, 1, 10, 1000 etc.
   double tickStepMantissa = tickStep / magnitudeFactor;
 
   // separate integer and fractional part of mantissa:
@@ -6910,10 +6749,7 @@ int QCPAxis::calculateAutoSubTickCount( double tickStep ) const
 }
 
 /* inherits documentation from base class */
-void QCPAxis::selectEvent( QMouseEvent* event,
-                           bool additive,
-                           const QVariant& details,
-                           bool* selectionStateChanged )
+void QCPAxis::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   SelectablePart part = details.value<SelectablePart>();
@@ -7002,8 +6838,7 @@ void QCPAxis::draw( QCPPainter* painter )
   mAxisPainter->labelFont = getLabelFont();
   mAxisPainter->labelColor = getLabelColor();
   mAxisPainter->label = mLabel;
-  mAxisPainter->substituteExponent =
-      mAutoTickLabels && mNumberBeautifulPowers && mTickLabelType == ltNumber;
+  mAxisPainter->substituteExponent = mAutoTickLabels && mNumberBeautifulPowers && mTickLabelType == ltNumber;
   mAxisPainter->tickPen = getTickPen();
   mAxisPainter->subTickPen = getSubTickPen();
   mAxisPainter->tickLabelFont = getTickLabelFont();
@@ -7357,11 +7192,9 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
   QLineF baseLine;
   painter->setPen( basePen );
   if( QCPAxis::orientation( type ) == Qt::Horizontal )
-    baseLine.setPoints( origin + QPointF( xCor, yCor ),
-                        origin + QPointF( alignmentRect.width() + xCor, yCor ) );
+    baseLine.setPoints( origin + QPointF( xCor, yCor ), origin + QPointF( alignmentRect.width() + xCor, yCor ) );
   else
-    baseLine.setPoints( origin + QPointF( xCor, yCor ),
-                        origin + QPointF( xCor, -alignmentRect.height() + yCor ) );
+    baseLine.setPoints( origin + QPointF( xCor, yCor ), origin + QPointF( xCor, -alignmentRect.height() + yCor ) );
   if( reversedEndings )
     baseLine = QLineF( baseLine.p2(), baseLine.p1() );  // won't make a difference
                                                         // for line itself, but for
@@ -7372,23 +7205,19 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
   if( !tickPositions.isEmpty() )
   {
     painter->setPen( tickPen );
-    int tickDir = ( type == QCPAxis::atBottom || type == QCPAxis::atRight )
-                      ? -1
-                      : 1;  // direction of ticks ("inward" is right for left
-                            // axis and left for right axis)
+    int tickDir = ( type == QCPAxis::atBottom || type == QCPAxis::atRight ) ? -1 : 1;  // direction of ticks ("inward" is right for left
+                                                                                       // axis and left for right axis)
     if( QCPAxis::orientation( type ) == Qt::Horizontal )
     {
       for( int i = 0; i < tickPositions.size(); ++i )
-        painter->drawLine(
-            QLineF( tickPositions.at( i ) + xCor, origin.y() - tickLengthOut * tickDir + yCor,
-                    tickPositions.at( i ) + xCor, origin.y() + tickLengthIn * tickDir + yCor ) );
+        painter->drawLine( QLineF( tickPositions.at( i ) + xCor, origin.y() - tickLengthOut * tickDir + yCor, tickPositions.at( i ) + xCor,
+                                   origin.y() + tickLengthIn * tickDir + yCor ) );
     }
     else
     {
       for( int i = 0; i < tickPositions.size(); ++i )
-        painter->drawLine(
-            QLineF( origin.x() - tickLengthOut * tickDir + xCor, tickPositions.at( i ) + yCor,
-                    origin.x() + tickLengthIn * tickDir + xCor, tickPositions.at( i ) + yCor ) );
+        painter->drawLine( QLineF( origin.x() - tickLengthOut * tickDir + xCor, tickPositions.at( i ) + yCor,
+                                   origin.x() + tickLengthIn * tickDir + xCor, tickPositions.at( i ) + yCor ) );
     }
   }
 
@@ -7402,16 +7231,14 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
     if( QCPAxis::orientation( type ) == Qt::Horizontal )
     {
       for( int i = 0; i < subTickPositions.size(); ++i )
-        painter->drawLine( QLineF(
-            subTickPositions.at( i ) + xCor, origin.y() - subTickLengthOut * tickDir + yCor,
-            subTickPositions.at( i ) + xCor, origin.y() + subTickLengthIn * tickDir + yCor ) );
+        painter->drawLine( QLineF( subTickPositions.at( i ) + xCor, origin.y() - subTickLengthOut * tickDir + yCor, subTickPositions.at( i ) + xCor,
+                                   origin.y() + subTickLengthIn * tickDir + yCor ) );
     }
     else
     {
       for( int i = 0; i < subTickPositions.size(); ++i )
-        painter->drawLine( QLineF(
-            origin.x() - subTickLengthOut * tickDir + xCor, subTickPositions.at( i ) + yCor,
-            origin.x() + subTickLengthIn * tickDir + xCor, subTickPositions.at( i ) + yCor ) );
+        painter->drawLine( QLineF( origin.x() - subTickLengthOut * tickDir + xCor, subTickPositions.at( i ) + yCor,
+                                   origin.x() + subTickLengthIn * tickDir + xCor, subTickPositions.at( i ) + yCor ) );
     }
   }
   margin += qMax( 0, qMax( tickLengthOut, subTickLengthOut ) );
@@ -7424,15 +7251,11 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
   QVector2D baseLineVector( baseLine.dx(), baseLine.dy() );
   if( lowerEnding.style() != QCPLineEnding::esNone )
     lowerEnding.draw( painter,
-                      QVector2D( baseLine.p1() ) - baseLineVector.normalized() *
-                                                       lowerEnding.realLength() *
-                                                       ( lowerEnding.inverted() ? -1 : 1 ),
+                      QVector2D( baseLine.p1() ) - baseLineVector.normalized() * lowerEnding.realLength() * ( lowerEnding.inverted() ? -1 : 1 ),
                       -baseLineVector );
   if( upperEnding.style() != QCPLineEnding::esNone )
     upperEnding.draw( painter,
-                      QVector2D( baseLine.p2() ) + baseLineVector.normalized() *
-                                                       upperEnding.realLength() *
-                                                       ( upperEnding.inverted() ? -1 : 1 ),
+                      QVector2D( baseLine.p2() ) + baseLineVector.normalized() * upperEnding.realLength() * ( upperEnding.inverted() ? -1 : 1 ),
                       baseLineVector );
   painter->setAntialiasing( antialiasingBackup );
 
@@ -7465,27 +7288,22 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
       QTransform oldTransform = painter->transform();
       painter->translate( ( origin.x() - margin - labelBounds.height() ), origin.y() );
       painter->rotate( -90 );
-      painter->drawText( 0, 0, alignmentRect.height(), labelBounds.height(),
-                         Qt::TextDontClip | Qt::AlignCenter, label );
+      painter->drawText( 0, 0, alignmentRect.height(), labelBounds.height(), Qt::TextDontClip | Qt::AlignCenter, label );
       painter->setTransform( oldTransform );
     }
     else if( type == QCPAxis::atRight )
     {
       QTransform oldTransform = painter->transform();
-      painter->translate( ( origin.x() + margin + labelBounds.height() ),
-                          origin.y() - alignmentRect.height() );
+      painter->translate( ( origin.x() + margin + labelBounds.height() ), origin.y() - alignmentRect.height() );
       painter->rotate( 90 );
-      painter->drawText( 0, 0, alignmentRect.height(), labelBounds.height(),
-                         Qt::TextDontClip | Qt::AlignCenter, label );
+      painter->drawText( 0, 0, alignmentRect.height(), labelBounds.height(), Qt::TextDontClip | Qt::AlignCenter, label );
       painter->setTransform( oldTransform );
     }
     else if( type == QCPAxis::atTop )
-      painter->drawText( origin.x(), origin.y() - margin - labelBounds.height(),
-                         alignmentRect.width(), labelBounds.height(),
+      painter->drawText( origin.x(), origin.y() - margin - labelBounds.height(), alignmentRect.width(), labelBounds.height(),
                          Qt::TextDontClip | Qt::AlignCenter, label );
     else if( type == QCPAxis::atBottom )
-      painter->drawText( origin.x(), origin.y() + margin, alignmentRect.width(),
-                         labelBounds.height(), Qt::TextDontClip | Qt::AlignCenter, label );
+      painter->drawText( origin.x(), origin.y() + margin, alignmentRect.width(), labelBounds.height(), Qt::TextDontClip | Qt::AlignCenter, label );
   }
 
   // set selection boxes:
@@ -7496,51 +7314,41 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
     qDebug() << Q_FUNC_INFO << "mParentPlot is null";
   int selAxisOutSize = qMax( qMax( tickLengthOut, subTickLengthOut ), selectionTolerance );
   int selAxisInSize = selectionTolerance;
-  int selTickLabelSize =
-      ( QCPAxis::orientation( type ) == Qt::Horizontal ? tickLabelsSize.height()
-                                                       : tickLabelsSize.width() );
+  int selTickLabelSize = ( QCPAxis::orientation( type ) == Qt::Horizontal ? tickLabelsSize.height() : tickLabelsSize.width() );
   int selTickLabelOffset = qMax( tickLengthOut, subTickLengthOut ) + tickLabelPadding;
   int selLabelSize = labelBounds.height();
   int selLabelOffset = selTickLabelOffset + selTickLabelSize + labelPadding;
   if( type == QCPAxis::atLeft )
   {
-    mAxisSelectionBox.setCoords( origin.x() - selAxisOutSize, alignmentRect.top(),
-                                 origin.x() + selAxisInSize, alignmentRect.bottom() );
-    mTickLabelsSelectionBox.setCoords( origin.x() - selTickLabelOffset - selTickLabelSize,
-                                       alignmentRect.top(), origin.x() - selTickLabelOffset,
+    mAxisSelectionBox.setCoords( origin.x() - selAxisOutSize, alignmentRect.top(), origin.x() + selAxisInSize, alignmentRect.bottom() );
+    mTickLabelsSelectionBox.setCoords( origin.x() - selTickLabelOffset - selTickLabelSize, alignmentRect.top(), origin.x() - selTickLabelOffset,
                                        alignmentRect.bottom() );
-    mLabelSelectionBox.setCoords( origin.x() - selLabelOffset - selLabelSize, alignmentRect.top(),
-                                  origin.x() - selLabelOffset, alignmentRect.bottom() );
+    mLabelSelectionBox.setCoords( origin.x() - selLabelOffset - selLabelSize, alignmentRect.top(), origin.x() - selLabelOffset,
+                                  alignmentRect.bottom() );
   }
   else if( type == QCPAxis::atRight )
   {
-    mAxisSelectionBox.setCoords( origin.x() - selAxisInSize, alignmentRect.top(),
-                                 origin.x() + selAxisOutSize, alignmentRect.bottom() );
-    mTickLabelsSelectionBox.setCoords( origin.x() + selTickLabelOffset + selTickLabelSize,
-                                       alignmentRect.top(), origin.x() + selTickLabelOffset,
+    mAxisSelectionBox.setCoords( origin.x() - selAxisInSize, alignmentRect.top(), origin.x() + selAxisOutSize, alignmentRect.bottom() );
+    mTickLabelsSelectionBox.setCoords( origin.x() + selTickLabelOffset + selTickLabelSize, alignmentRect.top(), origin.x() + selTickLabelOffset,
                                        alignmentRect.bottom() );
-    mLabelSelectionBox.setCoords( origin.x() + selLabelOffset + selLabelSize, alignmentRect.top(),
-                                  origin.x() + selLabelOffset, alignmentRect.bottom() );
+    mLabelSelectionBox.setCoords( origin.x() + selLabelOffset + selLabelSize, alignmentRect.top(), origin.x() + selLabelOffset,
+                                  alignmentRect.bottom() );
   }
   else if( type == QCPAxis::atTop )
   {
-    mAxisSelectionBox.setCoords( alignmentRect.left(), origin.y() - selAxisOutSize,
-                                 alignmentRect.right(), origin.y() + selAxisInSize );
-    mTickLabelsSelectionBox.setCoords( alignmentRect.left(),
-                                       origin.y() - selTickLabelOffset - selTickLabelSize,
-                                       alignmentRect.right(), origin.y() - selTickLabelOffset );
-    mLabelSelectionBox.setCoords( alignmentRect.left(), origin.y() - selLabelOffset - selLabelSize,
-                                  alignmentRect.right(), origin.y() - selLabelOffset );
+    mAxisSelectionBox.setCoords( alignmentRect.left(), origin.y() - selAxisOutSize, alignmentRect.right(), origin.y() + selAxisInSize );
+    mTickLabelsSelectionBox.setCoords( alignmentRect.left(), origin.y() - selTickLabelOffset - selTickLabelSize, alignmentRect.right(),
+                                       origin.y() - selTickLabelOffset );
+    mLabelSelectionBox.setCoords( alignmentRect.left(), origin.y() - selLabelOffset - selLabelSize, alignmentRect.right(),
+                                  origin.y() - selLabelOffset );
   }
   else if( type == QCPAxis::atBottom )
   {
-    mAxisSelectionBox.setCoords( alignmentRect.left(), origin.y() - selAxisInSize,
-                                 alignmentRect.right(), origin.y() + selAxisOutSize );
-    mTickLabelsSelectionBox.setCoords( alignmentRect.left(),
-                                       origin.y() + selTickLabelOffset + selTickLabelSize,
-                                       alignmentRect.right(), origin.y() + selTickLabelOffset );
-    mLabelSelectionBox.setCoords( alignmentRect.left(), origin.y() + selLabelOffset + selLabelSize,
-                                  alignmentRect.right(), origin.y() + selLabelOffset );
+    mAxisSelectionBox.setCoords( alignmentRect.left(), origin.y() - selAxisInSize, alignmentRect.right(), origin.y() + selAxisOutSize );
+    mTickLabelsSelectionBox.setCoords( alignmentRect.left(), origin.y() + selTickLabelOffset + selTickLabelSize, alignmentRect.right(),
+                                       origin.y() + selTickLabelOffset );
+    mLabelSelectionBox.setCoords( alignmentRect.left(), origin.y() + selLabelOffset + selLabelSize, alignmentRect.right(),
+                                  origin.y() + selLabelOffset );
   }
   // draw hitboxes for debug purposes:
   // painter->setBrush(Qt::NoBrush);
@@ -7568,8 +7376,7 @@ int QCPAxisPainterPrivate::size() const
   {
     for( int i = 0; i < tickLabels.size(); ++i )
       getMaxTickLabelSize( tickLabelFont, tickLabels.at( i ), &tickLabelsSize );
-    result += QCPAxis::orientation( type ) == Qt::Horizontal ? tickLabelsSize.height()
-                                                             : tickLabelsSize.width();
+    result += QCPAxis::orientation( type ) == Qt::Horizontal ? tickLabelsSize.height() : tickLabelsSize.width();
     result += tickLabelPadding;
   }
 
@@ -7579,8 +7386,7 @@ int QCPAxisPainterPrivate::size() const
   {
     QFontMetrics fontMetrics( labelFont );
     QRect bounds;
-    bounds = fontMetrics.boundingRect(
-        0, 0, 0, 0, Qt::TextDontClip | Qt::AlignHCenter | Qt::AlignVCenter, label );
+    bounds = fontMetrics.boundingRect( 0, 0, 0, 0, Qt::TextDontClip | Qt::AlignHCenter | Qt::AlignVCenter, label );
     result += bounds.height() + labelPadding;
   }
 
@@ -7651,11 +7457,7 @@ QByteArray QCPAxisPainterPrivate::generateLabelParameterHash() const
   (see \ref
   getTickLabelData).
 */
-void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter,
-                                            double position,
-                                            int distanceToAxis,
-                                            const QString& text,
-                                            QSize* tickLabelsSize )
+void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter, double position, int distanceToAxis, const QString& text, QSize* tickLabelsSize )
 {
   // warning: if you change anything here, also adapt getMaxTickLabelSize()
   // accordingly!
@@ -7678,8 +7480,7 @@ void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter,
     labelAnchor = QPointF( position, alignmentRect.bottom() + distanceToAxis + offset );
     break;
   }
-  if( mParentPlot->plottingHints().testFlag( QCP::phCacheLabels ) &&
-      !painter->modes().testFlag( QCPPainter::pmNoCaching ) )  // label caching enabled
+  if( mParentPlot->plottingHints().testFlag( QCP::phCacheLabels ) && !painter->modes().testFlag( QCPPainter::pmNoCaching ) )  // label caching enabled
   {
     if( !mLabelCache.contains( text ) )  // no cached label exists, create it
     {
@@ -7691,8 +7492,7 @@ void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter,
       newCachedLabel->pixmap.fill( Qt::transparent );
       QCPPainter cachePainter( &newCachedLabel->pixmap );
       cachePainter.setPen( painter->pen() );
-      drawTickLabel( &cachePainter, -labelData.rotatedTotalBounds.topLeft().x(),
-                     -labelData.rotatedTotalBounds.topLeft().y(), labelData );
+      drawTickLabel( &cachePainter, -labelData.rotatedTotalBounds.topLeft().x(), -labelData.rotatedTotalBounds.topLeft().y(), labelData );
       mLabelCache.insert( text, newCachedLabel, 1 );
     }
     // draw cached label:
@@ -7701,15 +7501,13 @@ void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter,
     // it:
     if( QCPAxis::orientation( type ) == Qt::Horizontal )
     {
-      if( labelAnchor.x() + cachedLabel->offset.x() + cachedLabel->pixmap.width() >
-              viewportRect.right() ||
+      if( labelAnchor.x() + cachedLabel->offset.x() + cachedLabel->pixmap.width() > viewportRect.right() ||
           labelAnchor.x() + cachedLabel->offset.x() < viewportRect.left() )
         return;
     }
     else
     {
-      if( labelAnchor.y() + cachedLabel->offset.y() + cachedLabel->pixmap.height() >
-              viewportRect.bottom() ||
+      if( labelAnchor.y() + cachedLabel->offset.y() + cachedLabel->pixmap.height() > viewportRect.bottom() ||
           labelAnchor.y() + cachedLabel->offset.y() < viewportRect.top() )
         return;
     }
@@ -7724,17 +7522,13 @@ void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter,
     // it:
     if( QCPAxis::orientation( type ) == Qt::Horizontal )
     {
-      if( finalPosition.x() +
-                  ( labelData.rotatedTotalBounds.width() + labelData.rotatedTotalBounds.left() ) >
-              viewportRect.right() ||
+      if( finalPosition.x() + ( labelData.rotatedTotalBounds.width() + labelData.rotatedTotalBounds.left() ) > viewportRect.right() ||
           finalPosition.x() + labelData.rotatedTotalBounds.left() < viewportRect.left() )
         return;
     }
     else
     {
-      if( finalPosition.y() +
-                  ( labelData.rotatedTotalBounds.height() + labelData.rotatedTotalBounds.top() ) >
-              viewportRect.bottom() ||
+      if( finalPosition.y() + ( labelData.rotatedTotalBounds.height() + labelData.rotatedTotalBounds.top() ) > viewportRect.bottom() ||
           finalPosition.y() + labelData.rotatedTotalBounds.top() < viewportRect.top() )
         return;
     }
@@ -7761,10 +7555,7 @@ void QCPAxisPainterPrivate::placeTickLabel( QCPPainter* painter,
   disabled, i.e. when
   QCP::phCacheLabels plotting hint is not set.
 */
-void QCPAxisPainterPrivate::drawTickLabel( QCPPainter* painter,
-                                           double x,
-                                           double y,
-                                           const TickLabelData& labelData ) const
+void QCPAxisPainterPrivate::drawTickLabel( QCPPainter* painter, double x, double y, const TickLabelData& labelData ) const
 {
   // backup painter settings that we're about to change:
   QTransform oldTransform = painter->transform();
@@ -7781,14 +7572,13 @@ void QCPAxisPainterPrivate::drawTickLabel( QCPPainter* painter,
     painter->setFont( labelData.baseFont );
     painter->drawText( 0, 0, 0, 0, Qt::TextDontClip, labelData.basePart );
     painter->setFont( labelData.expFont );
-    painter->drawText( labelData.baseBounds.width() + 1, 0, labelData.expBounds.width(),
-                       labelData.expBounds.height(), Qt::TextDontClip, labelData.expPart );
+    painter->drawText( labelData.baseBounds.width() + 1, 0, labelData.expBounds.width(), labelData.expBounds.height(), Qt::TextDontClip,
+                       labelData.expPart );
   }
   else
   {
     painter->setFont( labelData.baseFont );
-    painter->drawText( 0, 0, labelData.totalBounds.width(), labelData.totalBounds.height(),
-                       Qt::TextDontClip | Qt::AlignHCenter, labelData.basePart );
+    painter->drawText( 0, 0, labelData.totalBounds.width(), labelData.totalBounds.height(), Qt::TextDontClip | Qt::AlignHCenter, labelData.basePart );
   }
 
   // reset painter settings to what it was before:
@@ -7807,9 +7597,7 @@ void QCPAxisPainterPrivate::drawTickLabel( QCPPainter* painter,
   exponent if necessary (member substituteExponent) and calculates appropriate
   bounding boxes.
 */
-QCPAxisPainterPrivate::TickLabelData QCPAxisPainterPrivate::getTickLabelData(
-    const QFont& font,
-    const QString& text ) const
+QCPAxisPainterPrivate::TickLabelData QCPAxisPainterPrivate::getTickLabelData( const QFont& font, const QString& text ) const
 {
   TickLabelData result;
 
@@ -7829,10 +7617,9 @@ QCPAxisPainterPrivate::TickLabelData QCPAxisPainterPrivate::getTickLabelData(
   if( result.baseFont.pointSizeF() > 0 )  // On some rare systems, this sometimes
                                           // is initialized with -1 (Qt bug?), so
     // we check here before possibly setting a negative value in the next line
-    result.baseFont.setPointSizeF( result.baseFont.pointSizeF() +
-                                   0.05 );  // QFontMetrics.boundingRect has a bug for
-                                            // exact point sizes that make the results
-                                            // oscillate due to internal rounding
+    result.baseFont.setPointSizeF( result.baseFont.pointSizeF() + 0.05 );  // QFontMetrics.boundingRect has a bug for
+                                                                           // exact point sizes that make the results
+                                                                           // oscillate due to internal rounding
   if( useBeautifulPowers )
   {
     // split text into parts of number/symbol that will be drawn normally and
@@ -7843,13 +7630,10 @@ QCPAxisPainterPrivate::TickLabelData QCPAxisPainterPrivate::getTickLabelData(
     if( abbreviateDecimalPowers && result.basePart == "1" )
       result.basePart = "10";
     else
-      result.basePart +=
-          ( numberMultiplyCross ? QString( QChar( 215 ) ) : QString( QChar( 183 ) ) ) + "10";
+      result.basePart += ( numberMultiplyCross ? QString( QChar( 215 ) ) : QString( QChar( 183 ) ) ) + "10";
     result.expPart = text.mid( ePos + 1 );
     // clip "+" and leading zeros off expPart:
-    while( result.expPart.length() > 2 &&
-           result.expPart.at( 1 ) ==
-               '0' )  // length > 2 so we leave one zero when numberFormatChar is 'e'
+    while( result.expPart.length() > 2 && result.expPart.at( 1 ) == '0' )  // length > 2 so we leave one zero when numberFormatChar is 'e'
       result.expPart.remove( 1, 1 );
     if( !result.expPart.isEmpty() && result.expPart.at( 0 ) == '+' )
       result.expPart.remove( 0, 1 );
@@ -7857,25 +7641,19 @@ QCPAxisPainterPrivate::TickLabelData QCPAxisPainterPrivate::getTickLabelData(
     result.expFont = font;
     result.expFont.setPointSize( result.expFont.pointSize() * 0.75 );
     // calculate bounding rects of base part, exponent part and total one:
-    result.baseBounds = QFontMetrics( result.baseFont )
-                            .boundingRect( 0, 0, 0, 0, Qt::TextDontClip, result.basePart );
-    result.expBounds =
-        QFontMetrics( result.expFont ).boundingRect( 0, 0, 0, 0, Qt::TextDontClip, result.expPart );
-    result.totalBounds = result.baseBounds.adjusted(
-        0, 0, result.expBounds.width() + 2,
-        0 );  // +2 consists of the 1 pixel spacing between base and exponent (see
-              // drawTickLabel) and an extra pixel to include AA
+    result.baseBounds = QFontMetrics( result.baseFont ).boundingRect( 0, 0, 0, 0, Qt::TextDontClip, result.basePart );
+    result.expBounds = QFontMetrics( result.expFont ).boundingRect( 0, 0, 0, 0, Qt::TextDontClip, result.expPart );
+    result.totalBounds = result.baseBounds.adjusted( 0, 0, result.expBounds.width() + 2,
+                                                     0 );  // +2 consists of the 1 pixel spacing between base and exponent (see
+                                                           // drawTickLabel) and an extra pixel to include AA
   }
   else  // useBeautifulPowers == false
   {
     result.basePart = text;
-    result.totalBounds =
-        QFontMetrics( result.baseFont )
-            .boundingRect( 0, 0, 0, 0, Qt::TextDontClip | Qt::AlignHCenter, result.basePart );
+    result.totalBounds = QFontMetrics( result.baseFont ).boundingRect( 0, 0, 0, 0, Qt::TextDontClip | Qt::AlignHCenter, result.basePart );
   }
-  result.totalBounds.moveTopLeft(
-      QPoint( 0, 0 ) );  // want bounding box aligned top left at origin, independent of how
-                         // it was created, to make further processing simpler
+  result.totalBounds.moveTopLeft( QPoint( 0, 0 ) );  // want bounding box aligned top left at origin, independent of how
+                                                     // it was created, to make further processing simpler
 
   // calculate possibly different bounding rect after rotation:
   result.rotatedTotalBounds = result.totalBounds;
@@ -7921,8 +7699,7 @@ QPointF QCPAxisPainterPrivate::getTickLabelDrawOffset( const TickLabelData& labe
     labels.
   */
   bool doRotation = !qFuzzyIsNull( tickLabelRotation );
-  bool flip =
-      qFuzzyCompare( qAbs( tickLabelRotation ), 90.0 );  // perfect +/-90 degree flip. Indicates
+  bool flip = qFuzzyCompare( qAbs( tickLabelRotation ), 90.0 );  // perfect +/-90 degree flip. Indicates
   // vertical label centering on vertical axes.
   double radians = tickLabelRotation / 180.0 * M_PI;
   int x = 0, y = 0;
@@ -7934,16 +7711,13 @@ QPointF QCPAxisPainterPrivate::getTickLabelDrawOffset( const TickLabelData& labe
       {
         x = -qCos( radians ) * labelData.totalBounds.width();
         y = flip ? -labelData.totalBounds.width() / 2.0
-                 : -qSin( radians ) * labelData.totalBounds.width() -
-                       qCos( radians ) * labelData.totalBounds.height() / 2.0;
+                 : -qSin( radians ) * labelData.totalBounds.width() - qCos( radians ) * labelData.totalBounds.height() / 2.0;
       }
       else
       {
-        x = -qCos( -radians ) * labelData.totalBounds.width() -
-            qSin( -radians ) * labelData.totalBounds.height();
+        x = -qCos( -radians ) * labelData.totalBounds.width() - qSin( -radians ) * labelData.totalBounds.height();
         y = flip ? +labelData.totalBounds.width() / 2.0
-                 : +qSin( -radians ) * labelData.totalBounds.width() -
-                       qCos( -radians ) * labelData.totalBounds.height() / 2.0;
+                 : +qSin( -radians ) * labelData.totalBounds.width() - qCos( -radians ) * labelData.totalBounds.height() / 2.0;
       }
     }
     else
@@ -7959,14 +7733,12 @@ QPointF QCPAxisPainterPrivate::getTickLabelDrawOffset( const TickLabelData& labe
       if( tickLabelRotation > 0 )
       {
         x = +qSin( radians ) * labelData.totalBounds.height();
-        y = flip ? -labelData.totalBounds.width() / 2.0
-                 : -qCos( radians ) * labelData.totalBounds.height() / 2.0;
+        y = flip ? -labelData.totalBounds.width() / 2.0 : -qCos( radians ) * labelData.totalBounds.height() / 2.0;
       }
       else
       {
         x = 0;
-        y = flip ? +labelData.totalBounds.width() / 2.0
-                 : -qCos( -radians ) * labelData.totalBounds.height() / 2.0;
+        y = flip ? +labelData.totalBounds.width() / 2.0 : -qCos( -radians ) * labelData.totalBounds.height() / 2.0;
       }
     }
     else
@@ -7981,10 +7753,8 @@ QPointF QCPAxisPainterPrivate::getTickLabelDrawOffset( const TickLabelData& labe
     {
       if( tickLabelRotation > 0 )
       {
-        x = -qCos( radians ) * labelData.totalBounds.width() +
-            qSin( radians ) * labelData.totalBounds.height() / 2.0;
-        y = -qSin( radians ) * labelData.totalBounds.width() -
-            qCos( radians ) * labelData.totalBounds.height();
+        x = -qCos( radians ) * labelData.totalBounds.width() + qSin( radians ) * labelData.totalBounds.height() / 2.0;
+        y = -qSin( radians ) * labelData.totalBounds.width() - qCos( radians ) * labelData.totalBounds.height();
       }
       else
       {
@@ -8009,8 +7779,7 @@ QPointF QCPAxisPainterPrivate::getTickLabelDrawOffset( const TickLabelData& labe
       }
       else
       {
-        x = -qCos( -radians ) * labelData.totalBounds.width() -
-            qSin( -radians ) * labelData.totalBounds.height() / 2.0;
+        x = -qCos( -radians ) * labelData.totalBounds.width() - qSin( -radians ) * labelData.totalBounds.height() / 2.0;
         y = +qSin( -radians ) * labelData.totalBounds.width();
       }
     }
@@ -8034,15 +7803,12 @@ QPointF QCPAxisPainterPrivate::getTickLabelDrawOffset( const TickLabelData& labe
   currently set to a
   smaller width/height.
 */
-void QCPAxisPainterPrivate::getMaxTickLabelSize( const QFont& font,
-                                                 const QString& text,
-                                                 QSize* tickLabelsSize ) const
+void QCPAxisPainterPrivate::getMaxTickLabelSize( const QFont& font, const QString& text, QSize* tickLabelsSize ) const
 {
   // note: this function must return the same tick label sizes as the
   // placeTickLabel function.
   QSize finalSize;
-  if( mParentPlot->plottingHints().testFlag( QCP::phCacheLabels ) &&
-      mLabelCache.contains( text ) )  // label caching enabled and have cached label
+  if( mParentPlot->plottingHints().testFlag( QCP::phCacheLabels ) && mLabelCache.contains( text ) )  // label caching enabled and have cached label
   {
     const CachedLabel* cachedLabel = mLabelCache.object( text );
     finalSize = cachedLabel->pixmap.size();
@@ -8524,10 +8290,9 @@ void QCPAbstractPlottable::rescaleKeyAxis( bool onlyEnlarge ) const
                                              // this
     // axis dimension), shift current range to at least center the plottable
     {
-      double center = ( newRange.lower + newRange.upper ) *
-                      0.5;  // upper and lower should be equal anyway, but just to
-                            // make sure, incase validRange returned false for
-                            // other reason
+      double center = ( newRange.lower + newRange.upper ) * 0.5;  // upper and lower should be equal anyway, but just to
+                                                                  // make sure, incase validRange returned false for
+                                                                  // other reason
       if( keyAxis->scaleType() == QCPAxis::stLinear )
       {
         newRange.lower = center - keyAxis->range().size() / 2.0;
@@ -8576,10 +8341,9 @@ void QCPAbstractPlottable::rescaleValueAxis( bool onlyEnlarge ) const
                                              // this
     // axis dimension), shift current range to at least center the plottable
     {
-      double center = ( newRange.lower + newRange.upper ) *
-                      0.5;  // upper and lower should be equal anyway, but just to
-                            // make sure, incase validRange returned false for
-                            // other reason
+      double center = ( newRange.lower + newRange.upper ) * 0.5;  // upper and lower should be equal anyway, but just to
+                                                                  // make sure, incase validRange returned false for
+                                                                  // other reason
       if( valueAxis->scaleType() == QCPAxis::stLinear )
       {
         newRange.lower = center - valueAxis->range().size() / 2.0;
@@ -8760,9 +8524,7 @@ void QCPAbstractPlottable::pixelsToCoords( double x, double y, double& key, doub
 
   Returns the pixel input \a pixelPos as plot coordinates \a key and \a value.
 */
-void QCPAbstractPlottable::pixelsToCoords( const QPointF& pixelPos,
-                                           double& key,
-                                           double& value ) const
+void QCPAbstractPlottable::pixelsToCoords( const QPointF& pixelPos, double& key, double& value ) const
 {
   pixelsToCoords( pixelPos.x(), pixelPos.y(), key, value );
 }
@@ -8880,9 +8642,7 @@ void QCPAbstractPlottable::applyErrorBarsAntialiasingHint( QCPPainter* painter )
 
   \note This function is identical to QCPAbstractItem::distSqrToLine
 */
-double QCPAbstractPlottable::distSqrToLine( const QPointF& start,
-                                            const QPointF& end,
-                                            const QPointF& point ) const
+double QCPAbstractPlottable::distSqrToLine( const QPointF& start, const QPointF& end, const QPointF& point ) const
 {
   QVector2D a( start );
   QVector2D b( end );
@@ -8905,10 +8665,7 @@ double QCPAbstractPlottable::distSqrToLine( const QPointF& start,
 }
 
 /* inherits documentation from base class */
-void QCPAbstractPlottable::selectEvent( QMouseEvent* event,
-                                        bool additive,
-                                        const QVariant& details,
-                                        bool* selectionStateChanged )
+void QCPAbstractPlottable::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   Q_UNUSED( details )
@@ -8991,10 +8748,7 @@ void QCPAbstractPlottable::deselectEvent( bool* selectionStateChanged )
   instead, as
   explained in the subclassing section of the QCPAbstractItem documentation.
 */
-QCPItemAnchor::QCPItemAnchor( QCustomPlot* parentPlot,
-                              QCPAbstractItem* parentItem,
-                              const QString name,
-                              int anchorId )
+QCPItemAnchor::QCPItemAnchor( QCustomPlot* parentPlot, QCPAbstractItem* parentItem, const QString name, int anchorId )
     : mName( name ), mParentPlot( parentPlot ), mParentItem( parentItem ), mAnchorId( anchorId )
 {
 }
@@ -9117,14 +8871,8 @@ void QCPItemAnchor::removeChild( QCPItemPosition* pos )
   instead, as
   explained in the subclassing section of the QCPAbstractItem documentation.
 */
-QCPItemPosition::QCPItemPosition( QCustomPlot* parentPlot,
-                                  QCPAbstractItem* parentItem,
-                                  const QString name )
-    : QCPItemAnchor( parentPlot, parentItem, name )
-    , mPositionType( ptAbsolute )
-    , mKey( 0 )
-    , mValue( 0 )
-    , mParentAnchor( 0 )
+QCPItemPosition::QCPItemPosition( QCustomPlot* parentPlot, QCPAbstractItem* parentItem, const QString name )
+    : QCPItemAnchor( parentPlot, parentItem, name ), mPositionType( ptAbsolute ), mKey( 0 ), mValue( 0 ), mParentAnchor( 0 )
 {
 }
 
@@ -9238,8 +8986,7 @@ bool QCPItemPosition::setParentAnchor( QCPItemAnchor* parentAnchor, bool keepPix
   // make sure self is not assigned as parent:
   if( parentAnchor == this )
   {
-    qDebug() << Q_FUNC_INFO << "can't set self as parent anchor"
-             << reinterpret_cast<quintptr>( parentAnchor );
+    qDebug() << Q_FUNC_INFO << "can't set self as parent anchor" << reinterpret_cast<quintptr>( parentAnchor );
     return false;
   }
   // make sure no recursive parent-child-relationships are created:
@@ -9251,8 +8998,7 @@ bool QCPItemPosition::setParentAnchor( QCPItemAnchor* parentAnchor, bool keepPix
       // is a QCPItemPosition, might have further parent, so keep iterating
       if( currentParentPos == this )
       {
-        qDebug() << Q_FUNC_INFO << "can't create recursive parent-child-relationship"
-                 << reinterpret_cast<quintptr>( parentAnchor );
+        qDebug() << Q_FUNC_INFO << "can't create recursive parent-child-relationship" << reinterpret_cast<quintptr>( parentAnchor );
         return false;
       }
       currentParent = currentParentPos->mParentAnchor;
@@ -9360,15 +9106,11 @@ QPointF QCPItemPosition::pixelPoint() const
   {
     if( mParentAnchor )
     {
-      return QPointF( mKey * mParentPlot->viewport().width(),
-                      mValue * mParentPlot->viewport().height() ) +
-             mParentAnchor->pixelPoint();
+      return QPointF( mKey * mParentPlot->viewport().width(), mValue * mParentPlot->viewport().height() ) + mParentAnchor->pixelPoint();
     }
     else
     {
-      return QPointF( mKey * mParentPlot->viewport().width(),
-                      mValue * mParentPlot->viewport().height() ) +
-             mParentPlot->viewport().topLeft();
+      return QPointF( mKey * mParentPlot->viewport().width(), mValue * mParentPlot->viewport().height() ) + mParentPlot->viewport().topLeft();
     }
   }
 
@@ -9378,13 +9120,11 @@ QPointF QCPItemPosition::pixelPoint() const
     {
       if( mParentAnchor )
       {
-        return QPointF( mKey * mAxisRect.data()->width(), mValue * mAxisRect.data()->height() ) +
-               mParentAnchor->pixelPoint();
+        return QPointF( mKey * mAxisRect.data()->width(), mValue * mAxisRect.data()->height() ) + mParentAnchor->pixelPoint();
       }
       else
       {
-        return QPointF( mKey * mAxisRect.data()->width(), mValue * mAxisRect.data()->height() ) +
-               mAxisRect.data()->topLeft();
+        return QPointF( mKey * mAxisRect.data()->width(), mValue * mAxisRect.data()->height() ) + mAxisRect.data()->topLeft();
       }
     }
     else
@@ -10051,9 +9791,7 @@ void QCPAbstractItem::applyDefaultAntialiasingHint( QCPPainter* painter ) const
 
   \see rectSelectTest
 */
-double QCPAbstractItem::distSqrToLine( const QPointF& start,
-                                       const QPointF& end,
-                                       const QPointF& point ) const
+double QCPAbstractItem::distSqrToLine( const QPointF& start, const QPointF& end, const QPointF& point ) const
 {
   QVector2D a( start );
   QVector2D b( end );
@@ -10099,17 +9837,13 @@ double QCPAbstractItem::distSqrToLine( const QPointF& start,
 
   \see distSqrToLine
 */
-double QCPAbstractItem::rectSelectTest( const QRectF& rect,
-                                        const QPointF& pos,
-                                        bool filledRect ) const
+double QCPAbstractItem::rectSelectTest( const QRectF& rect, const QPointF& pos, bool filledRect ) const
 {
   double result = -1;
 
   // distance to border:
   QList<QLineF> lines;
-  lines << QLineF( rect.topLeft(), rect.topRight() )
-        << QLineF( rect.bottomLeft(), rect.bottomRight() )
-        << QLineF( rect.topLeft(), rect.bottomLeft() )
+  lines << QLineF( rect.topLeft(), rect.topRight() ) << QLineF( rect.bottomLeft(), rect.bottomRight() ) << QLineF( rect.topLeft(), rect.bottomLeft() )
         << QLineF( rect.topRight(), rect.bottomRight() );
   double minDistSqr = std::numeric_limits<double>::max();
   for( int i = 0; i < lines.size(); ++i )
@@ -10223,10 +9957,7 @@ QCPItemAnchor* QCPAbstractItem::createAnchor( const QString& name, int anchorId
 }
 
 /* inherits documentation from base class */
-void QCPAbstractItem::selectEvent( QMouseEvent* event,
-                                   bool additive,
-                                   const QVariant& details,
-                                   bool* selectionStateChanged )
+void QCPAbstractItem::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   Q_UNUSED( details )
@@ -11102,8 +10833,7 @@ void QCustomPlot::setAntialiasedElement( QCP::AntialiasedElement antialiasedElem
 
   \see setAntialiasedElements
 */
-void QCustomPlot::setNotAntialiasedElements(
-    const QCP::AntialiasedElements& notAntialiasedElements )
+void QCustomPlot::setNotAntialiasedElements( const QCP::AntialiasedElements& notAntialiasedElements )
 {
   mNotAntialiasedElements = notAntialiasedElements;
 
@@ -11121,8 +10851,7 @@ void QCustomPlot::setNotAntialiasedElements(
 
   \see setAntialiasedElement
 */
-void QCustomPlot::setNotAntialiasedElement( QCP::AntialiasedElement notAntialiasedElement,
-                                            bool enabled )
+void QCustomPlot::setNotAntialiasedElement( QCP::AntialiasedElement notAntialiasedElement, bool enabled )
 {
   if( !enabled && mNotAntialiasedElements.testFlag( notAntialiasedElement ) )
     mNotAntialiasedElements &= ~notAntialiasedElement;
@@ -11512,14 +11241,12 @@ bool QCustomPlot::addPlottable( QCPAbstractPlottable* plottable )
 {
   if( mPlottables.contains( plottable ) )
   {
-    qDebug() << Q_FUNC_INFO << "plottable already added to this QCustomPlot:"
-             << reinterpret_cast<quintptr>( plottable );
+    qDebug() << Q_FUNC_INFO << "plottable already added to this QCustomPlot:" << reinterpret_cast<quintptr>( plottable );
     return false;
   }
   if( plottable->parentPlot() != this )
   {
-    qDebug() << Q_FUNC_INFO << "plottable not created with this QCustomPlot as parent:"
-             << reinterpret_cast<quintptr>( plottable );
+    qDebug() << Q_FUNC_INFO << "plottable not created with this QCustomPlot as parent:" << reinterpret_cast<quintptr>( plottable );
     return false;
   }
 
@@ -12026,10 +11753,9 @@ QCPAbstractItem* QCustomPlot::itemAt( const QPointF& pos, bool onlySelectable )
       // but checking here is faster, because we have access to
       // QCPAbstractItem::selectable
       continue;
-    if( !item->clipToAxisRect() ||
-        item->clipRect().contains( pos.toPoint() ) )  // only consider clicks inside
-                                                      // axis cliprect of the item
-                                                      // if actually clipped to it
+    if( !item->clipToAxisRect() || item->clipRect().contains( pos.toPoint() ) )  // only consider clicks inside
+                                                                                 // axis cliprect of the item
+                                                                                 // if actually clipped to it
     {
       double currentDistance = item->selectTest( pos, false );
       if( currentDistance >= 0 && currentDistance < resultDistance )
@@ -12137,8 +11863,7 @@ bool QCustomPlot::setCurrentLayer( QCPLayer* layer )
 {
   if( !mLayers.contains( layer ) )
   {
-    qDebug() << Q_FUNC_INFO
-             << "layer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( layer );
+    qDebug() << Q_FUNC_INFO << "layer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( layer );
     return false;
   }
 
@@ -12173,16 +11898,13 @@ int QCustomPlot::layerCount() const
 
   \see layer, moveLayer, removeLayer
 */
-bool QCustomPlot::addLayer( const QString& name,
-                            QCPLayer* otherLayer,
-                            QCustomPlot::LayerInsertMode insertMode )
+bool QCustomPlot::addLayer( const QString& name, QCPLayer* otherLayer, QCustomPlot::LayerInsertMode insertMode )
 {
   if( !otherLayer )
     otherLayer = mLayers.last();
   if( !mLayers.contains( otherLayer ) )
   {
-    qDebug() << Q_FUNC_INFO << "otherLayer not a layer of this QCustomPlot:"
-             << reinterpret_cast<quintptr>( otherLayer );
+    qDebug() << Q_FUNC_INFO << "otherLayer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( otherLayer );
     return false;
   }
   if( layer( name ) )
@@ -12219,8 +11941,7 @@ bool QCustomPlot::removeLayer( QCPLayer* layer )
 {
   if( !mLayers.contains( layer ) )
   {
-    qDebug() << Q_FUNC_INFO
-             << "layer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( layer );
+    qDebug() << Q_FUNC_INFO << "layer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( layer );
     return false;
   }
   if( mLayers.size() < 2 )
@@ -12233,8 +11954,7 @@ bool QCustomPlot::removeLayer( QCPLayer* layer )
   // prepend to layer above)
   int removedIndex = layer->index();
   bool isFirstLayer = removedIndex == 0;
-  QCPLayer* targetLayer =
-      isFirstLayer ? mLayers.at( removedIndex + 1 ) : mLayers.at( removedIndex - 1 );
+  QCPLayer* targetLayer = isFirstLayer ? mLayers.at( removedIndex + 1 ) : mLayers.at( removedIndex - 1 );
   QList<QCPLayerable*> children = layer->children();
   if( isFirstLayer )  // prepend in reverse order (so order relative to each other
                       // stays the same)
@@ -12269,20 +11989,16 @@ bool QCustomPlot::removeLayer( QCPLayer* layer )
 
   \see layer, addLayer, moveLayer
 */
-bool QCustomPlot::moveLayer( QCPLayer* layer,
-                             QCPLayer* otherLayer,
-                             QCustomPlot::LayerInsertMode insertMode )
+bool QCustomPlot::moveLayer( QCPLayer* layer, QCPLayer* otherLayer, QCustomPlot::LayerInsertMode insertMode )
 {
   if( !mLayers.contains( layer ) )
   {
-    qDebug() << Q_FUNC_INFO
-             << "layer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( layer );
+    qDebug() << Q_FUNC_INFO << "layer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( layer );
     return false;
   }
   if( !mLayers.contains( otherLayer ) )
   {
-    qDebug() << Q_FUNC_INFO << "otherLayer not a layer of this QCustomPlot:"
-             << reinterpret_cast<quintptr>( otherLayer );
+    qDebug() << Q_FUNC_INFO << "otherLayer not a layer of this QCustomPlot:" << reinterpret_cast<quintptr>( otherLayer );
     return false;
   }
 
@@ -12499,21 +12215,18 @@ void QCustomPlot::replot( QCustomPlot::RefreshPriority refreshPriority )
   mReplotting = true;
   emit beforeReplot();
 
-  mPaintBuffer.fill( mBackgroundBrush.style() == Qt::SolidPattern ? mBackgroundBrush.color()
-                                                                  : Qt::transparent );
+  mPaintBuffer.fill( mBackgroundBrush.style() == Qt::SolidPattern ? mBackgroundBrush.color() : Qt::transparent );
   QCPPainter painter;
   painter.begin( &mPaintBuffer );
   if( painter.isActive() )
   {
-    painter.setRenderHint(
-        QPainter::HighQualityAntialiasing );  // to make Antialiasing look good if
-                                              // using the OpenGL graphicssystem
+    painter.setRenderHint( QPainter::HighQualityAntialiasing );  // to make Antialiasing look good if
+                                                                 // using the OpenGL graphicssystem
     if( mBackgroundBrush.style() != Qt::SolidPattern && mBackgroundBrush.style() != Qt::NoBrush )
       painter.fillRect( mViewport, mBackgroundBrush );
     draw( &painter );
     painter.end();
-    if( ( refreshPriority == rpHint && mPlottingHints.testFlag( QCP::phForceRepaint ) ) ||
-        refreshPriority == rpImmediate )
+    if( ( refreshPriority == rpHint && mPlottingHints.testFlag( QCP::phForceRepaint ) ) || refreshPriority == rpImmediate )
       repaint();
     else
       update();
@@ -12602,12 +12315,7 @@ void QCustomPlot::rescaleAxes( bool onlyVisiblePlottables )
 
   \see savePng, saveBmp, saveJpg, saveRastered
 */
-bool QCustomPlot::savePdf( const QString& fileName,
-                           bool noCosmeticPen,
-                           int width,
-                           int height,
-                           const QString& pdfCreator,
-                           const QString& pdfTitle )
+bool QCustomPlot::savePdf( const QString& fileName, bool noCosmeticPen, int width, int height, const QString& pdfCreator, const QString& pdfTitle )
 {
   bool success = false;
 #ifdef QT_NO_PRINTER
@@ -12648,10 +12356,8 @@ bool QCustomPlot::savePdf( const QString& fileName,
     printpainter.setMode( QCPPainter::pmNoCaching );
     printpainter.setMode( QCPPainter::pmNonCosmetic, noCosmeticPen );
     printpainter.setWindow( mViewport );
-    if( mBackgroundBrush.style() != Qt::NoBrush && mBackgroundBrush.color() != Qt::white &&
-        mBackgroundBrush.color() != Qt::transparent &&
-        mBackgroundBrush.color().alpha() >
-            0 )  // draw pdf background color if not white/transparent
+    if( mBackgroundBrush.style() != Qt::NoBrush && mBackgroundBrush.color() != Qt::white && mBackgroundBrush.color() != Qt::transparent &&
+        mBackgroundBrush.color().alpha() > 0 )  // draw pdf background color if not white/transparent
       printpainter.fillRect( viewport(), mBackgroundBrush );
     draw( &printpainter );
     printpainter.end();
@@ -12719,11 +12425,7 @@ bool QCustomPlot::savePdf( const QString& fileName,
 
   \see savePdf, saveBmp, saveJpg, saveRastered
 */
-bool QCustomPlot::savePng( const QString& fileName,
-                           int width,
-                           int height,
-                           double scale,
-                           int quality )
+bool QCustomPlot::savePng( const QString& fileName, int width, int height, double scale, int quality )
 {
   return saveRastered( fileName, width, height, scale, "PNG", quality );
 }
@@ -12780,11 +12482,7 @@ bool QCustomPlot::savePng( const QString& fileName,
 
   \see savePdf, savePng, saveBmp, saveRastered
 */
-bool QCustomPlot::saveJpg( const QString& fileName,
-                           int width,
-                           int height,
-                           double scale,
-                           int quality )
+bool QCustomPlot::saveJpg( const QString& fileName, int width, int height, double scale, int quality )
 {
   return saveRastered( fileName, width, height, scale, "JPG", quality );
 }
@@ -13018,8 +12716,7 @@ void QCustomPlot::mouseReleaseEvent( QMouseEvent* event )
   emit mouseRelease( event );
   bool doReplot = false;
 
-  if( ( mMousePressPos - event->pos() ).manhattanLength() <
-      5 )  // determine whether it was a click operation
+  if( ( mMousePressPos - event->pos() ).manhattanLength() < 5 )  // determine whether it was a click operation
   {
     if( event->button() == Qt::LeftButton )
     {
@@ -13027,8 +12724,7 @@ void QCustomPlot::mouseReleaseEvent( QMouseEvent* event )
       QVariant details;
       QCPLayerable* clickedLayerable = layerableAt( event->pos(), true, &details );
       bool selectionStateChanged = false;
-      bool additive = mInteractions.testFlag( QCP::iMultiSelect ) &&
-                      event->modifiers().testFlag( mMultiSelectModifier );
+      bool additive = mInteractions.testFlag( QCP::iMultiSelect ) && event->modifiers().testFlag( mMultiSelectModifier );
       // deselect all other layerables if not additive selection:
       if( !additive )
       {
@@ -13036,8 +12732,7 @@ void QCustomPlot::mouseReleaseEvent( QMouseEvent* event )
         {
           foreach( QCPLayerable* layerable, layer->children() )
           {
-            if( layerable != clickedLayerable &&
-                mInteractions.testFlag( layerable->selectionCategory() ) )
+            if( layerable != clickedLayerable && mInteractions.testFlag( layerable->selectionCategory() ) )
             {
               bool selChanged = false;
               layerable->deselectEvent( &selChanged );
@@ -13060,10 +12755,9 @@ void QCustomPlot::mouseReleaseEvent( QMouseEvent* event )
 
     // emit specialized object click signals:
     QVariant details;
-    QCPLayerable* clickedLayerable =
-        layerableAt( event->pos(), false,
-                     &details );  // for these signals, selectability is ignored, that's why we
-                                  // call this again with onlySelectable set to false
+    QCPLayerable* clickedLayerable = layerableAt( event->pos(), false,
+                                                  &details );  // for these signals, selectability is ignored, that's why we
+                                                               // call this again with onlySelectable set to false
     if( QCPAbstractPlottable* ap = qobject_cast<QCPAbstractPlottable*>( clickedLayerable ) )
       emit plottableClick( ap, event );
     else if( QCPAxis* ax = qobject_cast<QCPAxis*>( clickedLayerable ) )
@@ -13194,16 +12888,13 @@ void QCustomPlot::drawBackground( QCPPainter* painter )
       QSize scaledSize( mBackgroundPixmap.size() );
       scaledSize.scale( mViewport.size(), mBackgroundScaledMode );
       if( mScaledBackgroundPixmap.size() != scaledSize )
-        mScaledBackgroundPixmap = mBackgroundPixmap.scaled( mViewport.size(), mBackgroundScaledMode,
-                                                            Qt::SmoothTransformation );
-      painter->drawPixmap(
-          mViewport.topLeft(), mScaledBackgroundPixmap,
-          QRect( 0, 0, mViewport.width(), mViewport.height() ) & mScaledBackgroundPixmap.rect() );
+        mScaledBackgroundPixmap = mBackgroundPixmap.scaled( mViewport.size(), mBackgroundScaledMode, Qt::SmoothTransformation );
+      painter->drawPixmap( mViewport.topLeft(), mScaledBackgroundPixmap,
+                           QRect( 0, 0, mViewport.width(), mViewport.height() ) & mScaledBackgroundPixmap.rect() );
     }
     else
     {
-      painter->drawPixmap( mViewport.topLeft(), mBackgroundPixmap,
-                           QRect( 0, 0, mViewport.width(), mViewport.height() ) );
+      painter->drawPixmap( mViewport.topLeft(), mBackgroundPixmap, QRect( 0, 0, mViewport.width(), mViewport.height() ) );
     }
   }
 }
@@ -13274,9 +12965,7 @@ void QCustomPlot::updateLayerIndices() const
   layerables (e.g.
   QCPAxis::SelectablePart).
 */
-QCPLayerable* QCustomPlot::layerableAt( const QPointF& pos,
-                                        bool onlySelectable,
-                                        QVariant* selectionDetails ) const
+QCPLayerable* QCustomPlot::layerableAt( const QPointF& pos, bool onlySelectable, QVariant* selectionDetails ) const
 {
   for( int layerIndex = mLayers.size() - 1; layerIndex >= 0; --layerIndex )
   {
@@ -13318,12 +13007,7 @@ QCPLayerable* QCustomPlot::layerableAt( const QPointF& pos,
 
   \see saveBmp, saveJpg, savePng, savePdf
 */
-bool QCustomPlot::saveRastered( const QString& fileName,
-                                int width,
-                                int height,
-                                double scale,
-                                const char* format,
-                                int quality )
+bool QCustomPlot::saveRastered( const QString& fileName, int width, int height, double scale, const char* format, int quality )
 {
   QPixmap buffer = toPixmap( width, height, scale );
   if( !buffer.isNull() )
@@ -13361,9 +13045,7 @@ QPixmap QCustomPlot::toPixmap( int width, int height, double scale )
   int scaledHeight = qRound( scale * newHeight );
 
   QPixmap result( scaledWidth, scaledHeight );
-  result.fill( mBackgroundBrush.style() == Qt::SolidPattern
-                   ? mBackgroundBrush.color()
-                   : Qt::transparent );  // if using non-solid pattern, make
+  result.fill( mBackgroundBrush.style() == Qt::SolidPattern ? mBackgroundBrush.color() : Qt::transparent );  // if using non-solid pattern, make
   // transparent now and draw brush pattern
   // later
   QCPPainter painter;
@@ -13495,10 +13177,7 @@ void QCustomPlot::toPainter( QCPPainter* painter, int width, int height )
   The color level count is initialized to 350.
 */
 QCPColorGradient::QCPColorGradient( GradientPreset preset )
-    : mLevelCount( 350 )
-    , mColorInterpolation( ciRGB )
-    , mPeriodic( false )
-    , mColorBufferInvalidated( true )
+    : mLevelCount( 350 ), mColorInterpolation( ciRGB ), mPeriodic( false ), mColorBufferInvalidated( true )
 {
   mColorBuffer.fill( qRgb( 0, 0, 0 ), mLevelCount );
   loadPreset( preset );
@@ -13507,8 +13186,7 @@ QCPColorGradient::QCPColorGradient( GradientPreset preset )
 /* undocumented operator */
 bool QCPColorGradient::operator==( const QCPColorGradient& other ) const
 {
-  return ( ( other.mLevelCount == this->mLevelCount ) &&
-           ( other.mColorInterpolation == this->mColorInterpolation ) &&
+  return ( ( other.mLevelCount == this->mLevelCount ) && ( other.mColorInterpolation == this->mColorInterpolation ) &&
            ( other.mPeriodic == this->mPeriodic ) && ( other.mColorStops == this->mColorStops ) );
 }
 
@@ -13629,12 +13307,7 @@ void QCPColorGradient::setPeriodic( bool enabled )
   works because \a data
   is addressed <tt>data[i*dataIndexFactor]</tt>.
 */
-void QCPColorGradient::colorize( const double* data,
-                                 const QCPRange& range,
-                                 QRgb* scanLine,
-                                 int n,
-                                 int dataIndexFactor,
-                                 bool logarithmic )
+void QCPColorGradient::colorize( const double* data, const QCPRange& range, QRgb* scanLine, int n, int dataIndexFactor, bool logarithmic )
 {
   // If you change something here, make sure to also adapt ::color()
   if( !data )
@@ -13657,8 +13330,7 @@ void QCPColorGradient::colorize( const double* data,
     {
       for( int i = 0; i < n; ++i )
       {
-        int index =
-            (int)( ( data[dataIndexFactor * i] - range.lower ) * posToIndexFactor ) % mLevelCount;
+        int index = (int)( ( data[dataIndexFactor * i] - range.lower ) * posToIndexFactor ) % mLevelCount;
         if( index < 0 )
           index += mLevelCount;
         scanLine[i] = mColorBuffer.at( index );
@@ -13683,9 +13355,7 @@ void QCPColorGradient::colorize( const double* data,
     {
       for( int i = 0; i < n; ++i )
       {
-        int index = (int)( qLn( data[dataIndexFactor * i] / range.lower ) /
-                           qLn( range.upper / range.lower ) * mLevelCount ) %
-                    mLevelCount;
+        int index = (int)( qLn( data[dataIndexFactor * i] / range.lower ) / qLn( range.upper / range.lower ) * mLevelCount ) % mLevelCount;
         if( index < 0 )
           index += mLevelCount;
         scanLine[i] = mColorBuffer.at( index );
@@ -13695,8 +13365,7 @@ void QCPColorGradient::colorize( const double* data,
     {
       for( int i = 0; i < n; ++i )
       {
-        int index = qLn( data[dataIndexFactor * i] / range.lower ) /
-                    qLn( range.upper / range.lower ) * mLevelCount;
+        int index = qLn( data[dataIndexFactor * i] / range.lower ) / qLn( range.upper / range.lower ) * mLevelCount;
         if( index < 0 )
           index = 0;
         else if( index >= mLevelCount )
@@ -13880,8 +13549,7 @@ QCPColorGradient QCPColorGradient::inverted() const
 {
   QCPColorGradient result( *this );
   result.clearColorStops();
-  for( QMap<double, QColor>::const_iterator it = mColorStops.constBegin();
-       it != mColorStops.constEnd(); ++it )
+  for( QMap<double, QColor>::const_iterator it = mColorStops.constBegin(); it != mColorStops.constEnd(); ++it )
     result.setColorStopAt( 1.0 - it.key(), it.value() );
   return result;
 }
@@ -13920,14 +13588,12 @@ void QCPColorGradient::updateColorBuffer()
       {
         QMap<double, QColor>::const_iterator high = it;
         QMap<double, QColor>::const_iterator low = it - 1;
-        double t =
-            ( position - low.key() ) / ( high.key() - low.key() );  // interpolation factor 0..1
+        double t = ( position - low.key() ) / ( high.key() - low.key() );  // interpolation factor 0..1
         switch( mColorInterpolation )
         {
         case ciRGB:
         {
-          mColorBuffer[i] = qRgb( ( 1 - t ) * low.value().red() + t * high.value().red(),
-                                  ( 1 - t ) * low.value().green() + t * high.value().green(),
+          mColorBuffer[i] = qRgb( ( 1 - t ) * low.value().red() + t * high.value().red(), ( 1 - t ) * low.value().green() + t * high.value().green(),
                                   ( 1 - t ) * low.value().blue() + t * high.value().blue() );
           break;
         }
@@ -13947,10 +13613,9 @@ void QCPColorGradient::updateColorBuffer()
             hue += 1.0;
           else if( hue >= 1.0 )
             hue -= 1.0;
-          mColorBuffer[i] =
-              QColor::fromHsvF( hue, ( 1 - t ) * lowHsv.saturationF() + t * highHsv.saturationF(),
-                                ( 1 - t ) * lowHsv.valueF() + t * highHsv.valueF() )
-                  .rgb();
+          mColorBuffer[i] = QColor::fromHsvF( hue, ( 1 - t ) * lowHsv.saturationF() + t * highHsv.saturationF(),
+                                              ( 1 - t ) * lowHsv.valueF() + t * highHsv.valueF() )
+                                .rgb();
           break;
         }
         }
@@ -14450,8 +14115,7 @@ QList<QCPAbstractPlottable*> QCPAxisRect::plottables() const
   QList<QCPAbstractPlottable*> result;
   for( int i = 0; i < mParentPlot->mPlottables.size(); ++i )
   {
-    if( mParentPlot->mPlottables.at( i )->keyAxis()->axisRect() == this ||
-        mParentPlot->mPlottables.at( i )->valueAxis()->axisRect() == this )
+    if( mParentPlot->mPlottables.at( i )->keyAxis()->axisRect() == this || mParentPlot->mPlottables.at( i )->valueAxis()->axisRect() == this )
       result.append( mParentPlot->mPlottables.at( i ) );
   }
   return result;
@@ -14473,8 +14137,7 @@ QList<QCPGraph*> QCPAxisRect::graphs() const
   QList<QCPGraph*> result;
   for( int i = 0; i < mParentPlot->mGraphs.size(); ++i )
   {
-    if( mParentPlot->mGraphs.at( i )->keyAxis()->axisRect() == this ||
-        mParentPlot->mGraphs.at( i )->valueAxis()->axisRect() == this )
+    if( mParentPlot->mGraphs.at( i )->keyAxis()->axisRect() == this || mParentPlot->mGraphs.at( i )->valueAxis()->axisRect() == this )
       result.append( mParentPlot->mGraphs.at( i ) );
   }
   return result;
@@ -14508,8 +14171,7 @@ QList<QCPAbstractItem*> QCPAxisRect::items() const
     QList<QCPItemPosition*> positions = mParentPlot->mItems.at( itemId )->positions();
     for( int posId = 0; posId < positions.size(); ++posId )
     {
-      if( positions.at( posId )->axisRect() == this ||
-          positions.at( posId )->keyAxis()->axisRect() == this ||
+      if( positions.at( posId )->axisRect() == this || positions.at( posId )->keyAxis()->axisRect() == this ||
           positions.at( posId )->valueAxis()->axisRect() == this )
       {
         result.append( mParentPlot->mItems.at( itemId ) );
@@ -14862,16 +14524,12 @@ void QCPAxisRect::drawBackground( QCPPainter* painter )
       QSize scaledSize( mBackgroundPixmap.size() );
       scaledSize.scale( mRect.size(), mBackgroundScaledMode );
       if( mScaledBackgroundPixmap.size() != scaledSize )
-        mScaledBackgroundPixmap = mBackgroundPixmap.scaled( mRect.size(), mBackgroundScaledMode,
-                                                            Qt::SmoothTransformation );
-      painter->drawPixmap(
-          mRect.topLeft(), mScaledBackgroundPixmap,
-          QRect( 0, 0, mRect.width(), mRect.height() ) & mScaledBackgroundPixmap.rect() );
+        mScaledBackgroundPixmap = mBackgroundPixmap.scaled( mRect.size(), mBackgroundScaledMode, Qt::SmoothTransformation );
+      painter->drawPixmap( mRect.topLeft(), mScaledBackgroundPixmap, QRect( 0, 0, mRect.width(), mRect.height() ) & mScaledBackgroundPixmap.rect() );
     }
     else
     {
-      painter->drawPixmap( mRect.topLeft(), mBackgroundPixmap,
-                           QRect( 0, 0, mRect.width(), mRect.height() ) );
+      painter->drawPixmap( mRect.topLeft(), mBackgroundPixmap, QRect( 0, 0, mRect.width(), mRect.height() ) );
     }
   }
 }
@@ -14990,17 +14648,13 @@ void QCPAxisRect::mouseMoveEvent( QMouseEvent* event )
       {
         if( rangeDragHorzAxis->mScaleType == QCPAxis::stLinear )
         {
-          double diff = rangeDragHorzAxis->pixelToCoord( mDragStart.x() ) -
-                        rangeDragHorzAxis->pixelToCoord( event->pos().x() );
-          rangeDragHorzAxis->setRange( mDragStartHorzRange.lower + diff,
-                                       mDragStartHorzRange.upper + diff );
+          double diff = rangeDragHorzAxis->pixelToCoord( mDragStart.x() ) - rangeDragHorzAxis->pixelToCoord( event->pos().x() );
+          rangeDragHorzAxis->setRange( mDragStartHorzRange.lower + diff, mDragStartHorzRange.upper + diff );
         }
         else if( rangeDragHorzAxis->mScaleType == QCPAxis::stLogarithmic )
         {
-          double diff = rangeDragHorzAxis->pixelToCoord( mDragStart.x() ) /
-                        rangeDragHorzAxis->pixelToCoord( event->pos().x() );
-          rangeDragHorzAxis->setRange( mDragStartHorzRange.lower * diff,
-                                       mDragStartHorzRange.upper * diff );
+          double diff = rangeDragHorzAxis->pixelToCoord( mDragStart.x() ) / rangeDragHorzAxis->pixelToCoord( event->pos().x() );
+          rangeDragHorzAxis->setRange( mDragStartHorzRange.lower * diff, mDragStartHorzRange.upper * diff );
         }
       }
     }
@@ -15010,17 +14664,13 @@ void QCPAxisRect::mouseMoveEvent( QMouseEvent* event )
       {
         if( rangeDragVertAxis->mScaleType == QCPAxis::stLinear )
         {
-          double diff = rangeDragVertAxis->pixelToCoord( mDragStart.y() ) -
-                        rangeDragVertAxis->pixelToCoord( event->pos().y() );
-          rangeDragVertAxis->setRange( mDragStartVertRange.lower + diff,
-                                       mDragStartVertRange.upper + diff );
+          double diff = rangeDragVertAxis->pixelToCoord( mDragStart.y() ) - rangeDragVertAxis->pixelToCoord( event->pos().y() );
+          rangeDragVertAxis->setRange( mDragStartVertRange.lower + diff, mDragStartVertRange.upper + diff );
         }
         else if( rangeDragVertAxis->mScaleType == QCPAxis::stLogarithmic )
         {
-          double diff = rangeDragVertAxis->pixelToCoord( mDragStart.y() ) /
-                        rangeDragVertAxis->pixelToCoord( event->pos().y() );
-          rangeDragVertAxis->setRange( mDragStartVertRange.lower * diff,
-                                       mDragStartVertRange.upper * diff );
+          double diff = rangeDragVertAxis->pixelToCoord( mDragStart.y() ) / rangeDragVertAxis->pixelToCoord( event->pos().y() );
+          rangeDragVertAxis->setRange( mDragStartVertRange.lower * diff, mDragStartVertRange.upper * diff );
         }
       }
     }
@@ -15081,15 +14731,13 @@ void QCPAxisRect::wheelEvent( QWheelEvent* event )
       {
         factor = pow( mRangeZoomFactorHorz, wheelSteps );
         if( mRangeZoomHorzAxis.data() )
-          mRangeZoomHorzAxis.data()->scaleRange(
-              factor, mRangeZoomHorzAxis.data()->pixelToCoord( event->pos().x() ) );
+          mRangeZoomHorzAxis.data()->scaleRange( factor, mRangeZoomHorzAxis.data()->pixelToCoord( event->pos().x() ) );
       }
       if( mRangeZoom.testFlag( Qt::Vertical ) )
       {
         factor = pow( mRangeZoomFactorVert, wheelSteps );
         if( mRangeZoomVertAxis.data() )
-          mRangeZoomVertAxis.data()->scaleRange(
-              factor, mRangeZoomVertAxis.data()->pixelToCoord( event->pos().y() ) );
+          mRangeZoomVertAxis.data()->scaleRange( factor, mRangeZoomVertAxis.data()->pixelToCoord( event->pos().y() ) );
       }
       mParentPlot->replot();
     }
@@ -15236,15 +14884,12 @@ void QCPAbstractLegendItem::setSelected( bool selected )
 }
 
 /* inherits documentation from base class */
-double QCPAbstractLegendItem::selectTest( const QPointF& pos,
-                                          bool onlySelectable,
-                                          QVariant* details ) const
+double QCPAbstractLegendItem::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
   if( !mParentPlot )
     return -1;
-  if( onlySelectable &&
-      ( !mSelectable || !mParentLegend->selectableParts().testFlag( QCPLegend::spItems ) ) )
+  if( onlySelectable && ( !mSelectable || !mParentLegend->selectableParts().testFlag( QCPLegend::spItems ) ) )
     return -1;
 
   if( mRect.contains( pos.toPoint() ) )
@@ -15266,10 +14911,7 @@ QRect QCPAbstractLegendItem::clipRect() const
 }
 
 /* inherits documentation from base class */
-void QCPAbstractLegendItem::selectEvent( QMouseEvent* event,
-                                         bool additive,
-                                         const QVariant& details,
-                                         bool* selectionStateChanged )
+void QCPAbstractLegendItem::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   Q_UNUSED( details )
@@ -15399,14 +15041,13 @@ void QCPPlottableLegendItem::draw( QCPPainter* painter )
   painter->setFont( getFont() );
   painter->setPen( QPen( getTextColor() ) );
   QSizeF iconSize = mParentLegend->iconSize();
-  QRectF textRect = painter->fontMetrics().boundingRect( 0, 0, 0, iconSize.height(),
-                                                         Qt::TextDontClip, mPlottable->name() );
+  QRectF textRect = painter->fontMetrics().boundingRect( 0, 0, 0, iconSize.height(), Qt::TextDontClip, mPlottable->name() );
   QRectF iconRect( mRect.topLeft(), iconSize );
   int textHeight = qMax( textRect.height(), iconSize.height() );  // if text has smaller height than
                                                                   // icon, center text vertically in
                                                                   // icon height, else align tops
-  painter->drawText( mRect.x() + iconSize.width() + mParentLegend->iconTextPadding(), mRect.y(),
-                     textRect.width(), textHeight, Qt::TextDontClip, mPlottable->name() );
+  painter->drawText( mRect.x() + iconSize.width() + mParentLegend->iconTextPadding(), mRect.y(), textRect.width(), textHeight, Qt::TextDontClip,
+                     mPlottable->name() );
   // draw icon:
   painter->save();
   painter->setClipRect( iconRect, Qt::IntersectClip );
@@ -15435,12 +15076,9 @@ QSize QCPPlottableLegendItem::minimumSizeHint() const
   QRect textRect;
   QFontMetrics fontMetrics( getFont() );
   QSize iconSize = mParentLegend->iconSize();
-  textRect =
-      fontMetrics.boundingRect( 0, 0, 0, iconSize.height(), Qt::TextDontClip, mPlottable->name() );
-  result.setWidth( iconSize.width() + mParentLegend->iconTextPadding() + textRect.width() +
-                   mMargins.left() + mMargins.right() );
-  result.setHeight( qMax( textRect.height(), iconSize.height() ) + mMargins.top() +
-                    mMargins.bottom() );
+  textRect = fontMetrics.boundingRect( 0, 0, 0, iconSize.height(), Qt::TextDontClip, mPlottable->name() );
+  result.setWidth( iconSize.width() + mParentLegend->iconTextPadding() + textRect.width() + mMargins.left() + mMargins.right() );
+  result.setHeight( qMax( textRect.height(), iconSize.height() ) + mMargins.top() + mMargins.bottom() );
   return result;
 }
 
@@ -15715,16 +15353,14 @@ void QCPLegend::setSelectedParts( const SelectableParts& selected )
 
   if( mSelectedParts != newSelected )
   {
-    if( !mSelectedParts.testFlag( spItems ) &&
-        newSelected.testFlag( spItems ) )  // attempt to set spItems flag (can't do that)
+    if( !mSelectedParts.testFlag( spItems ) && newSelected.testFlag( spItems ) )  // attempt to set spItems flag (can't do that)
     {
       qDebug() << Q_FUNC_INFO
                << "spItems flag can not be set, it can only be "
                   "unset with this function";
       newSelected &= ~spItems;
     }
-    if( mSelectedParts.testFlag( spItems ) &&
-        !newSelected.testFlag( spItems ) )  // spItems flag was unset, so clear item selection
+    if( mSelectedParts.testFlag( spItems ) && !newSelected.testFlag( spItems ) )  // spItems flag was unset, so clear item selection
     {
       for( int i = 0; i < itemCount(); ++i )
       {
@@ -16029,21 +15665,17 @@ double QCPLegend::selectTest( const QPointF& pos, bool onlySelectable, QVariant*
 }
 
 /* inherits documentation from base class */
-void QCPLegend::selectEvent( QMouseEvent* event,
-                             bool additive,
-                             const QVariant& details,
-                             bool* selectionStateChanged )
+void QCPLegend::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   mSelectedParts = selectedParts();  // in case item selection has changed
   if( details.value<SelectablePart>() == spLegendBox && mSelectableParts.testFlag( spLegendBox ) )
   {
     SelectableParts selBefore = mSelectedParts;
-    setSelectedParts( additive ? mSelectedParts ^ spLegendBox
-                               : mSelectedParts | spLegendBox );  // no need to
-                                                                  // unset spItems
-                                                                  // in !additive
-                                                                  // case, because
+    setSelectedParts( additive ? mSelectedParts ^ spLegendBox : mSelectedParts | spLegendBox );  // no need to
+                                                                                                 // unset spItems
+                                                                                                 // in !additive
+                                                                                                 // case, because
     // they will be deselected by QCustomPlot (they're
     // normal QCPLayerables with own deselectEvent)
     if( selectionStateChanged )
@@ -16139,8 +15771,7 @@ QCPPlotTitle::QCPPlotTitle( QCustomPlot* parentPlot )
   {
     setLayer( parentPlot->currentLayer() );
     mFont = QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.5, QFont::Bold );
-    mSelectedFont =
-        QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.6, QFont::Bold );
+    mSelectedFont = QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.6, QFont::Bold );
   }
   setMargins( QMargins( 5, 5, 5, 0 ) );
 }
@@ -16153,11 +15784,9 @@ QCPPlotTitle::QCPPlotTitle( QCustomPlot* parentPlot )
 QCPPlotTitle::QCPPlotTitle( QCustomPlot* parentPlot, const QString& text )
     : QCPLayoutElement( parentPlot )
     , mText( text )
-    , mFont(
-          QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.5, QFont::Bold ) )
+    , mFont( QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.5, QFont::Bold ) )
     , mTextColor( Qt::black )
-    , mSelectedFont(
-          QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.6, QFont::Bold ) )
+    , mSelectedFont( QFont( parentPlot->font().family(), parentPlot->font().pointSize() * 1.6, QFont::Bold ) )
     , mSelectedTextColor( Qt::blue )
     , mSelectable( false )
     , mSelected( false )
@@ -16288,10 +15917,7 @@ QSize QCPPlotTitle::maximumSizeHint() const
 }
 
 /* inherits documentation from base class */
-void QCPPlotTitle::selectEvent( QMouseEvent* event,
-                                bool additive,
-                                const QVariant& details,
-                                bool* selectionStateChanged )
+void QCPPlotTitle::selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged )
 {
   Q_UNUSED( event )
   Q_UNUSED( details )
@@ -16518,8 +16144,7 @@ bool QCPColorScale::rangeDrag() const
 
   return mAxisRect.data()->rangeDrag().testFlag( QCPAxis::orientation( mType ) ) &&
          mAxisRect.data()->rangeDragAxis( QCPAxis::orientation( mType ) ) &&
-         mAxisRect.data()->rangeDragAxis( QCPAxis::orientation( mType ) )->orientation() ==
-             QCPAxis::orientation( mType );
+         mAxisRect.data()->rangeDragAxis( QCPAxis::orientation( mType ) )->orientation() == QCPAxis::orientation( mType );
 }
 
 /* undocumented getter */
@@ -16533,8 +16158,7 @@ bool QCPColorScale::rangeZoom() const
 
   return mAxisRect.data()->rangeZoom().testFlag( QCPAxis::orientation( mType ) ) &&
          mAxisRect.data()->rangeZoomAxis( QCPAxis::orientation( mType ) ) &&
-         mAxisRect.data()->rangeZoomAxis( QCPAxis::orientation( mType ) )->orientation() ==
-             QCPAxis::orientation( mType );
+         mAxisRect.data()->rangeZoomAxis( QCPAxis::orientation( mType ) )->orientation() == QCPAxis::orientation( mType );
 }
 
 /*!
@@ -16567,14 +16191,10 @@ void QCPColorScale::setType( QCPAxis::AxisType type )
       labelTransfer = mColorAxis.data()->label();
       logBaseTransfer = mColorAxis.data()->scaleLogBase();
       mColorAxis.data()->setLabel( "" );
-      disconnect( mColorAxis.data(), SIGNAL( rangeChanged( QCPRange ) ), this,
-                  SLOT( setDataRange( QCPRange ) ) );
-      disconnect( mColorAxis.data(), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), this,
-                  SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
+      disconnect( mColorAxis.data(), SIGNAL( rangeChanged( QCPRange ) ), this, SLOT( setDataRange( QCPRange ) ) );
+      disconnect( mColorAxis.data(), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), this, SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
     }
-    foreach( QCPAxis::AxisType atype, QList<QCPAxis::AxisType>()
-                                          << QCPAxis::atLeft << QCPAxis::atRight
-                                          << QCPAxis::atBottom << QCPAxis::atTop )
+    foreach( QCPAxis::AxisType atype, QList<QCPAxis::AxisType>() << QCPAxis::atLeft << QCPAxis::atRight << QCPAxis::atBottom << QCPAxis::atTop )
     {
       mAxisRect.data()->axis( atype )->setTicks( atype == mType );
       mAxisRect.data()->axis( atype )->setTickLabels( atype == mType );
@@ -16592,13 +16212,10 @@ void QCPColorScale::setType( QCPAxis::AxisType type )
                                                             // axes in realtime via
     // signals (connected in QCPColorScale ctor), so we only
     // need to take care of log base here
-    connect( mColorAxis.data(), SIGNAL( rangeChanged( QCPRange ) ), this,
-             SLOT( setDataRange( QCPRange ) ) );
-    connect( mColorAxis.data(), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), this,
-             SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
-    mAxisRect.data()->setRangeDragAxes(
-        QCPAxis::orientation( mType ) == Qt::Horizontal ? mColorAxis.data() : 0,
-        QCPAxis::orientation( mType ) == Qt::Vertical ? mColorAxis.data() : 0 );
+    connect( mColorAxis.data(), SIGNAL( rangeChanged( QCPRange ) ), this, SLOT( setDataRange( QCPRange ) ) );
+    connect( mColorAxis.data(), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), this, SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
+    mAxisRect.data()->setRangeDragAxes( QCPAxis::orientation( mType ) == Qt::Horizontal ? mColorAxis.data() : 0,
+                                        QCPAxis::orientation( mType ) == Qt::Vertical ? mColorAxis.data() : 0 );
   }
 }
 
@@ -16809,10 +16426,9 @@ void QCPColorScale::rescaleDataRange( bool onlyVisibleMaps )
                                              // this
     // dimension), shift current range to at least center the data
     {
-      double center = ( newRange.lower + newRange.upper ) *
-                      0.5;  // upper and lower should be equal anyway, but just to
-                            // make sure, incase validRange returned false for
-                            // other reason
+      double center = ( newRange.lower + newRange.upper ) * 0.5;  // upper and lower should be equal anyway, but just to
+                                                                  // make sure, incase validRange returned false for
+                                                                  // other reason
       if( mDataScaleType == QCPAxis::stLinear )
       {
         newRange.lower = center - mDataRange.size() / 2.0;
@@ -16846,22 +16462,16 @@ void QCPColorScale::update( UpdatePhase phase )
   {
     if( mType == QCPAxis::atBottom || mType == QCPAxis::atTop )
     {
-      setMaximumSize( QWIDGETSIZE_MAX, mBarWidth + mAxisRect.data()->margins().top() +
-                                           mAxisRect.data()->margins().bottom() + margins().top() +
-                                           margins().bottom() );
-      setMinimumSize( 0, mBarWidth + mAxisRect.data()->margins().top() +
-                             mAxisRect.data()->margins().bottom() + margins().top() +
-                             margins().bottom() );
+      setMaximumSize( QWIDGETSIZE_MAX,
+                      mBarWidth + mAxisRect.data()->margins().top() + mAxisRect.data()->margins().bottom() + margins().top() + margins().bottom() );
+      setMinimumSize( 0,
+                      mBarWidth + mAxisRect.data()->margins().top() + mAxisRect.data()->margins().bottom() + margins().top() + margins().bottom() );
     }
     else
     {
-      setMaximumSize( mBarWidth + mAxisRect.data()->margins().left() +
-                          mAxisRect.data()->margins().right() + margins().left() +
-                          margins().right(),
+      setMaximumSize( mBarWidth + mAxisRect.data()->margins().left() + mAxisRect.data()->margins().right() + margins().left() + margins().right(),
                       QWIDGETSIZE_MAX );
-      setMinimumSize( mBarWidth + mAxisRect.data()->margins().left() +
-                          mAxisRect.data()->margins().right() + margins().left() +
-                          margins().right(),
+      setMinimumSize( mBarWidth + mAxisRect.data()->margins().left() + mAxisRect.data()->margins().right() + margins().left() + margins().right(),
                       0 );
     }
     break;
@@ -16944,52 +16554,38 @@ void QCPColorScale::wheelEvent( QWheelEvent* event )
   Creates a new instance, as a child of \a parentColorScale.
 */
 QCPColorScaleAxisRectPrivate::QCPColorScaleAxisRectPrivate( QCPColorScale* parentColorScale )
-    : QCPAxisRect( parentColorScale->parentPlot(), true )
-    , mParentColorScale( parentColorScale )
-    , mGradientImageInvalidated( true )
+    : QCPAxisRect( parentColorScale->parentPlot(), true ), mParentColorScale( parentColorScale ), mGradientImageInvalidated( true )
 {
   setParentLayerable( parentColorScale );
   setMinimumMargins( QMargins( 0, 0, 0, 0 ) );
-  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>()
-                                       << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft
-                                       << QCPAxis::atRight )
+  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>() << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft << QCPAxis::atRight )
   {
     axis( type )->setVisible( true );
     axis( type )->grid()->setVisible( false );
     axis( type )->setPadding( 0 );
-    connect( axis( type ), SIGNAL( selectionChanged( QCPAxis::SelectableParts ) ), this,
-             SLOT( axisSelectionChanged( QCPAxis::SelectableParts ) ) );
-    connect( axis( type ), SIGNAL( selectableChanged( QCPAxis::SelectableParts ) ), this,
-             SLOT( axisSelectableChanged( QCPAxis::SelectableParts ) ) );
+    connect( axis( type ), SIGNAL( selectionChanged( QCPAxis::SelectableParts ) ), this, SLOT( axisSelectionChanged( QCPAxis::SelectableParts ) ) );
+    connect( axis( type ), SIGNAL( selectableChanged( QCPAxis::SelectableParts ) ), this, SLOT( axisSelectableChanged( QCPAxis::SelectableParts ) ) );
   }
 
-  connect( axis( QCPAxis::atLeft ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atRight ),
-           SLOT( setRange( QCPRange ) ) );
-  connect( axis( QCPAxis::atRight ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atLeft ),
-           SLOT( setRange( QCPRange ) ) );
-  connect( axis( QCPAxis::atBottom ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atTop ),
-           SLOT( setRange( QCPRange ) ) );
-  connect( axis( QCPAxis::atTop ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atBottom ),
-           SLOT( setRange( QCPRange ) ) );
-  connect( axis( QCPAxis::atLeft ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ),
-           axis( QCPAxis::atRight ), SLOT( setScaleType( QCPAxis::ScaleType ) ) );
-  connect( axis( QCPAxis::atRight ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ),
-           axis( QCPAxis::atLeft ), SLOT( setScaleType( QCPAxis::ScaleType ) ) );
-  connect( axis( QCPAxis::atBottom ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ),
-           axis( QCPAxis::atTop ), SLOT( setScaleType( QCPAxis::ScaleType ) ) );
-  connect( axis( QCPAxis::atTop ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ),
-           axis( QCPAxis::atBottom ), SLOT( setScaleType( QCPAxis::ScaleType ) ) );
+  connect( axis( QCPAxis::atLeft ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atRight ), SLOT( setRange( QCPRange ) ) );
+  connect( axis( QCPAxis::atRight ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atLeft ), SLOT( setRange( QCPRange ) ) );
+  connect( axis( QCPAxis::atBottom ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atTop ), SLOT( setRange( QCPRange ) ) );
+  connect( axis( QCPAxis::atTop ), SIGNAL( rangeChanged( QCPRange ) ), axis( QCPAxis::atBottom ), SLOT( setRange( QCPRange ) ) );
+  connect( axis( QCPAxis::atLeft ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), axis( QCPAxis::atRight ),
+           SLOT( setScaleType( QCPAxis::ScaleType ) ) );
+  connect( axis( QCPAxis::atRight ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), axis( QCPAxis::atLeft ),
+           SLOT( setScaleType( QCPAxis::ScaleType ) ) );
+  connect( axis( QCPAxis::atBottom ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), axis( QCPAxis::atTop ),
+           SLOT( setScaleType( QCPAxis::ScaleType ) ) );
+  connect( axis( QCPAxis::atTop ), SIGNAL( scaleTypeChanged( QCPAxis::ScaleType ) ), axis( QCPAxis::atBottom ),
+           SLOT( setScaleType( QCPAxis::ScaleType ) ) );
 
   // make layer transfers of color scale transfer to axis rect and axes
   // the axes must be set after axis rect, such that they appear above color
   // gradient drawn by axis rect:
-  connect( parentColorScale, SIGNAL( layerChanged( QCPLayer* ) ), this,
-           SLOT( setLayer( QCPLayer* ) ) );
-  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>()
-                                       << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft
-                                       << QCPAxis::atRight )
-    connect( parentColorScale, SIGNAL( layerChanged( QCPLayer* ) ), axis( type ),
-             SLOT( setLayer( QCPLayer* ) ) );
+  connect( parentColorScale, SIGNAL( layerChanged( QCPLayer* ) ), this, SLOT( setLayer( QCPLayer* ) ) );
+  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>() << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft << QCPAxis::atRight )
+    connect( parentColorScale, SIGNAL( layerChanged( QCPLayer* ) ), axis( type ), SLOT( setLayer( QCPLayer* ) ) );
 }
 
 /*! \internal
@@ -17008,11 +16604,9 @@ void QCPColorScaleAxisRectPrivate::draw( QCPPainter* painter )
   if( mParentColorScale->mColorAxis )
   {
     mirrorHorz = mParentColorScale->mColorAxis.data()->rangeReversed() &&
-                 ( mParentColorScale->type() == QCPAxis::atBottom ||
-                   mParentColorScale->type() == QCPAxis::atTop );
+                 ( mParentColorScale->type() == QCPAxis::atBottom || mParentColorScale->type() == QCPAxis::atTop );
     mirrorVert = mParentColorScale->mColorAxis.data()->rangeReversed() &&
-                 ( mParentColorScale->type() == QCPAxis::atLeft ||
-                   mParentColorScale->type() == QCPAxis::atRight );
+                 ( mParentColorScale->type() == QCPAxis::atLeft || mParentColorScale->type() == QCPAxis::atRight );
   }
 
   painter->drawImage( rect(), mGradientImage.mirrored( mirrorHorz, mirrorVert ) );
@@ -17044,8 +16638,7 @@ void QCPColorScaleAxisRectPrivate::updateGradientImage()
     QVector<QRgb*> pixels;
     for( int y = 0; y < h; ++y )
       pixels.append( reinterpret_cast<QRgb*>( mGradientImage.scanLine( y ) ) );
-    mParentColorScale->mGradient.colorize( data.constData(), QCPRange( 0, n - 1 ), pixels.first(),
-                                           n );
+    mParentColorScale->mGradient.colorize( data.constData(), QCPRange( 0, n - 1 ), pixels.first(), n );
     for( int y = 1; y < h; ++y )
       memcpy( pixels.at( y ), pixels.first(), n * sizeof( QRgb ) );
   }
@@ -17057,8 +16650,7 @@ void QCPColorScaleAxisRectPrivate::updateGradientImage()
     for( int y = 0; y < h; ++y )
     {
       QRgb* pixels = reinterpret_cast<QRgb*>( mGradientImage.scanLine( y ) );
-      const QRgb lineColor =
-          mParentColorScale->mGradient.color( data[h - 1 - y], QCPRange( 0, n - 1 ) );
+      const QRgb lineColor = mParentColorScale->mGradient.color( data[h - 1 - y], QCPRange( 0, n - 1 ) );
       for( int x = 0; x < w; ++x )
         pixels[x] = lineColor;
     }
@@ -17075,9 +16667,7 @@ void QCPColorScaleAxisRectPrivate::updateGradientImage()
 void QCPColorScaleAxisRectPrivate::axisSelectionChanged( QCPAxis::SelectableParts selectedParts )
 {
   // axis bases of four axes shall always (de-)selected synchronously:
-  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>()
-                                       << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft
-                                       << QCPAxis::atRight )
+  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>() << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft << QCPAxis::atRight )
   {
     if( QCPAxis* senderAxis = qobject_cast<QCPAxis*>( sender() ) )
       if( senderAxis->axisType() == type )
@@ -17102,9 +16692,7 @@ void QCPColorScaleAxisRectPrivate::axisSelectionChanged( QCPAxis::SelectablePart
 void QCPColorScaleAxisRectPrivate::axisSelectableChanged( QCPAxis::SelectableParts selectableParts )
 {
   // synchronize axis base selectability:
-  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>()
-                                       << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft
-                                       << QCPAxis::atRight )
+  foreach( QCPAxis::AxisType type, QList<QCPAxis::AxisType>() << QCPAxis::atBottom << QCPAxis::atTop << QCPAxis::atLeft << QCPAxis::atRight )
   {
     if( QCPAxis* senderAxis = qobject_cast<QCPAxis*>( sender() ) )
       if( senderAxis->axisType() == type )
@@ -17143,27 +16731,14 @@ void QCPColorScaleAxisRectPrivate::axisSelectableChanged( QCPAxis::SelectablePar
 /*!
   Constructs a data point with key, value and all errors set to zero.
 */
-QCPData::QCPData()
-    : key( 0 )
-    , value( 0 )
-    , keyErrorPlus( 0 )
-    , keyErrorMinus( 0 )
-    , valueErrorPlus( 0 )
-    , valueErrorMinus( 0 )
-{
-}
+QCPData::QCPData() : key( 0 ), value( 0 ), keyErrorPlus( 0 ), keyErrorMinus( 0 ), valueErrorPlus( 0 ), valueErrorMinus( 0 ) {}
 
 /*!
   Constructs a data point with the specified \a key and \a value. All errors are
   set to zero.
 */
 QCPData::QCPData( double key, double value )
-    : key( key )
-    , value( value )
-    , keyErrorPlus( 0 )
-    , keyErrorMinus( 0 )
-    , valueErrorPlus( 0 )
-    , valueErrorMinus( 0 )
+    : key( key ), value( value ), keyErrorPlus( 0 ), keyErrorMinus( 0 ), valueErrorPlus( 0 ), valueErrorMinus( 0 )
 {
 }
 
@@ -17246,8 +16821,7 @@ QCPData::QCPData( double key, double value )
   To directly create a graph inside a plot, you can also use the simpler
   QCustomPlot::addGraph function.
 */
-QCPGraph::QCPGraph( QCPAxis* keyAxis, QCPAxis* valueAxis )
-    : QCPAbstractPlottable( keyAxis, valueAxis )
+QCPGraph::QCPGraph( QCPAxis* keyAxis, QCPAxis* valueAxis ) : QCPAbstractPlottable( keyAxis, valueAxis )
 {
   mData = new QCPDataMap;
 
@@ -17331,9 +16905,7 @@ void QCPGraph::setData( const QVector<double>& key, const QVector<double>& value
   For asymmetrical errors (plus different from minus), see the overloaded
   version of this function.
 */
-void QCPGraph::setDataValueError( const QVector<double>& key,
-                                  const QVector<double>& value,
-                                  const QVector<double>& valueError )
+void QCPGraph::setDataValueError( const QVector<double>& key, const QVector<double>& value, const QVector<double>& valueError )
 {
   mData->clear();
   int n = key.size();
@@ -17395,9 +16967,7 @@ void QCPGraph::setDataValueError( const QVector<double>& key,
   For asymmetrical errors (plus different from minus), see the overloaded
   version of this function.
 */
-void QCPGraph::setDataKeyError( const QVector<double>& key,
-                                const QVector<double>& value,
-                                const QVector<double>& keyError )
+void QCPGraph::setDataKeyError( const QVector<double>& key, const QVector<double>& value, const QVector<double>& keyError )
 {
   mData->clear();
   int n = key.size();
@@ -17968,8 +17538,7 @@ void QCPGraph::draw( QCPPainter* painter )
   QCPDataMap::const_iterator it;
   for( it = mData->constBegin(); it != mData->constEnd(); ++it )
   {
-    if( QCP::isInvalidData( it.value().key, it.value().value ) ||
-        QCP::isInvalidData( it.value().keyErrorPlus, it.value().keyErrorMinus ) ||
+    if( QCP::isInvalidData( it.value().key, it.value().value ) || QCP::isInvalidData( it.value().keyErrorPlus, it.value().keyErrorMinus ) ||
         QCP::isInvalidData( it.value().valueErrorPlus, it.value().valueErrorPlus ) )
       qDebug() << Q_FUNC_INFO << "Data point at" << it.key() << "invalid."
                << "Plottable name:" << name();
@@ -18002,9 +17571,7 @@ void QCPGraph::drawLegendIcon( QCPPainter* painter, const QRectF& rect ) const
   if( mBrush.style() != Qt::NoBrush )
   {
     applyFillAntialiasingHint( painter );
-    painter->fillRect(
-        QRectF( rect.left(), rect.top() + rect.height() / 2.0, rect.width(), rect.height() / 3.0 ),
-        mBrush );
+    painter->fillRect( QRectF( rect.left(), rect.top() + rect.height() / 2.0, rect.width(), rect.height() / 3.0 ), mBrush );
   }
   // draw line vertically centered:
   if( mLineStyle != lsNone )
@@ -18022,12 +17589,10 @@ void QCPGraph::drawLegendIcon( QCPPainter* painter, const QRectF& rect ) const
     applyScattersAntialiasingHint( painter );
     // scale scatter pixmap if it's too large to fit in legend icon rect:
     if( mScatterStyle.shape() == QCPScatterStyle::ssPixmap &&
-        ( mScatterStyle.pixmap().size().width() > rect.width() ||
-          mScatterStyle.pixmap().size().height() > rect.height() ) )
+        ( mScatterStyle.pixmap().size().width() > rect.width() || mScatterStyle.pixmap().size().height() > rect.height() ) )
     {
       QCPScatterStyle scaledStyle( mScatterStyle );
-      scaledStyle.setPixmap( scaledStyle.pixmap().scaled( rect.size().toSize(), Qt::KeepAspectRatio,
-                                                          Qt::SmoothTransformation ) );
+      scaledStyle.setPixmap( scaledStyle.pixmap().scaled( rect.size().toSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
       scaledStyle.applyTo( painter, mPen );
       scaledStyle.drawShape( painter, QRectF( rect ).center() );
     }
@@ -18126,8 +17691,7 @@ void QCPGraph::getScatterPlotData( QVector<QCPData>* scatterData ) const
 
   \see drawLinePlot
 */
-void QCPGraph::getLinePlotData( QVector<QPointF>* linePixelData,
-                                QVector<QCPData>* scatterData ) const
+void QCPGraph::getLinePlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const
 {
   QCPAxis* keyAxis = mKeyAxis.data();
   QCPAxis* valueAxis = mValueAxis.data();
@@ -18183,8 +17747,7 @@ void QCPGraph::getLinePlotData( QVector<QPointF>* linePixelData,
 
   \see drawLinePlot
 */
-void QCPGraph::getStepLeftPlotData( QVector<QPointF>* linePixelData,
-                                    QVector<QCPData>* scatterData ) const
+void QCPGraph::getStepLeftPlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const
 {
   QCPAxis* keyAxis = mKeyAxis.data();
   QCPAxis* valueAxis = mValueAxis.data();
@@ -18253,8 +17816,7 @@ void QCPGraph::getStepLeftPlotData( QVector<QPointF>* linePixelData,
 
   \see drawLinePlot
 */
-void QCPGraph::getStepRightPlotData( QVector<QPointF>* linePixelData,
-                                     QVector<QCPData>* scatterData ) const
+void QCPGraph::getStepRightPlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const
 {
   QCPAxis* keyAxis = mKeyAxis.data();
   QCPAxis* valueAxis = mValueAxis.data();
@@ -18323,8 +17885,7 @@ void QCPGraph::getStepRightPlotData( QVector<QPointF>* linePixelData,
 
   \see drawLinePlot
 */
-void QCPGraph::getStepCenterPlotData( QVector<QPointF>* linePixelData,
-                                      QVector<QCPData>* scatterData ) const
+void QCPGraph::getStepCenterPlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const
 {
   QCPAxis* keyAxis = mKeyAxis.data();
   QCPAxis* valueAxis = mValueAxis.data();
@@ -18403,8 +17964,7 @@ void QCPGraph::getStepCenterPlotData( QVector<QPointF>* linePixelData,
 
   \see drawImpulsePlot
 */
-void QCPGraph::getImpulsePlotData( QVector<QPointF>* linePixelData,
-                                   QVector<QCPData>* scatterData ) const
+void QCPGraph::getImpulsePlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const
 {
   QCPAxis* keyAxis = mKeyAxis.data();
   QCPAxis* valueAxis = mValueAxis.data();
@@ -18421,8 +17981,7 @@ void QCPGraph::getImpulsePlotData( QVector<QPointF>* linePixelData,
 
   QVector<QCPData> lineData;
   getPreparedData( &lineData, scatterData );
-  linePixelData->resize( lineData.size() *
-                         2 );  // no need to reserve 2 extra points because impulse plot has no fill
+  linePixelData->resize( lineData.size() * 2 );  // no need to reserve 2 extra points because impulse plot has no fill
 
   // transform lineData points to pixels:
   if( keyAxis->orientation() == Qt::Vertical )
@@ -18526,14 +18085,14 @@ void QCPGraph::drawScatterPlot( QCPPainter* painter, QVector<QCPData>* scatterDa
     if( keyAxis->orientation() == Qt::Vertical )
     {
       for( int i = 0; i < scatterData->size(); ++i )
-        drawError( painter, valueAxis->coordToPixel( scatterData->at( i ).value ),
-                   keyAxis->coordToPixel( scatterData->at( i ).key ), scatterData->at( i ) );
+        drawError( painter, valueAxis->coordToPixel( scatterData->at( i ).value ), keyAxis->coordToPixel( scatterData->at( i ).key ),
+                   scatterData->at( i ) );
     }
     else
     {
       for( int i = 0; i < scatterData->size(); ++i )
-        drawError( painter, keyAxis->coordToPixel( scatterData->at( i ).key ),
-                   valueAxis->coordToPixel( scatterData->at( i ).value ), scatterData->at( i ) );
+        drawError( painter, keyAxis->coordToPixel( scatterData->at( i ).key ), valueAxis->coordToPixel( scatterData->at( i ).value ),
+                   scatterData->at( i ) );
     }
   }
 
@@ -18543,14 +18102,12 @@ void QCPGraph::drawScatterPlot( QCPPainter* painter, QVector<QCPData>* scatterDa
   if( keyAxis->orientation() == Qt::Vertical )
   {
     for( int i = 0; i < scatterData->size(); ++i )
-      mScatterStyle.drawShape( painter, valueAxis->coordToPixel( scatterData->at( i ).value ),
-                               keyAxis->coordToPixel( scatterData->at( i ).key ) );
+      mScatterStyle.drawShape( painter, valueAxis->coordToPixel( scatterData->at( i ).value ), keyAxis->coordToPixel( scatterData->at( i ).key ) );
   }
   else
   {
     for( int i = 0; i < scatterData->size(); ++i )
-      mScatterStyle.drawShape( painter, keyAxis->coordToPixel( scatterData->at( i ).key ),
-                               valueAxis->coordToPixel( scatterData->at( i ).value ) );
+      mScatterStyle.drawShape( painter, keyAxis->coordToPixel( scatterData->at( i ).key ), valueAxis->coordToPixel( scatterData->at( i ).value ) );
   }
 }
 
@@ -18593,10 +18150,8 @@ void QCPGraph::drawLinePlot( QCPPainter* painter, QVector<QPointF>* lineData ) c
 
     // if drawing solid line and not in PDF, use much faster line drawing
     // instead of polyline:
-    if( mParentPlot->plottingHints().testFlag( QCP::phFastPolylines ) &&
-        painter->pen().style() == Qt::SolidLine &&
-        !painter->modes().testFlag( QCPPainter::pmVectorized ) &&
-        !painter->modes().testFlag( QCPPainter::pmNoCaching ) )
+    if( mParentPlot->plottingHints().testFlag( QCP::phFastPolylines ) && painter->pen().style() == Qt::SolidLine &&
+        !painter->modes().testFlag( QCPPainter::pmVectorized ) && !painter->modes().testFlag( QCPPainter::pmNoCaching ) )
     {
       for( int i = 1; i < lineData->size(); ++i )
         painter->drawLine( lineData->at( i - 1 ), lineData->at( i ) );
@@ -18670,8 +18225,7 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
   int maxCount = std::numeric_limits<int>::max();
   if( mAdaptiveSampling )
   {
-    int keyPixelSpan =
-        qAbs( keyAxis->coordToPixel( lower.key() ) - keyAxis->coordToPixel( upper.key() ) );
+    int keyPixelSpan = qAbs( keyAxis->coordToPixel( lower.key() ) - keyAxis->coordToPixel( upper.key() ) );
     maxCount = 2 * keyPixelSpan + 2;
   }
   int dataCount = countDataInBounds( lower, upper, maxCount );
@@ -18693,20 +18247,16 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
                                                                // (normal) and ceil (reversed)
                                                                // rounding of
                                                                // currentIntervalStartKey
-      double currentIntervalStartKey =
-          keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( lower.key() ) + reversedRound ) );
+      double currentIntervalStartKey = keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( lower.key() ) + reversedRound ) );
       double lastIntervalEndKey = currentIntervalStartKey;
-      double keyEpsilon =
-          qAbs( currentIntervalStartKey -
-                keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) +
-                                       1.0 * reversedFactor ) );  // interval of one pixel
-                                                                  // on screen when mapped
-                                                                  // to plot key
-                                                                  // coordinates
-      bool keyEpsilonVariable =
-          keyAxis->scaleType() == QCPAxis::stLogarithmic;  // indicates whether keyEpsilon needs
-                                                           // to be updated after every interval
-                                                           // (for log axes)
+      double keyEpsilon = qAbs( currentIntervalStartKey - keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) +
+                                                                                 1.0 * reversedFactor ) );  // interval of one pixel
+                                                                                                            // on screen when mapped
+                                                                                                            // to plot key
+                                                                                                            // coordinates
+      bool keyEpsilonVariable = keyAxis->scaleType() == QCPAxis::stLogarithmic;                             // indicates whether keyEpsilon needs
+                                                                                                            // to be updated after every interval
+                                                                                                            // (for log axes)
       int intervalDataCount = 1;
       ++it;  // advance iterator to second data point because adaptive sampling
              // works in 1 point retrospect
@@ -18729,35 +18279,27 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
           if( intervalDataCount >= 2 )  // last pixel had multiple data points,
                                         // consolidate them to a cluster
           {
-            if( lastIntervalEndKey <
-                currentIntervalStartKey - keyEpsilon )  // last point is further away, so first
-                                                        // point of this cluster must be at a real
-                                                        // data point
-              lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.2,
-                                         currentIntervalFirstPoint.value().value ) );
+            if( lastIntervalEndKey < currentIntervalStartKey - keyEpsilon )  // last point is further away, so first
+                                                                             // point of this cluster must be at a real
+                                                                             // data point
+              lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.2, currentIntervalFirstPoint.value().value ) );
             lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.25, minValue ) );
             lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.75, maxValue ) );
-            if( it.key() > currentIntervalStartKey +
-                               keyEpsilon * 2 )  // new pixel started further away from previous
-                                                 // cluster, so make sure the last point of the
-                                                 // cluster is at a real data point
-              lineData->append(
-                  QCPData( currentIntervalStartKey + keyEpsilon * 0.8, ( it - 1 ).value().value ) );
+            if( it.key() > currentIntervalStartKey + keyEpsilon * 2 )  // new pixel started further away from previous
+                                                                       // cluster, so make sure the last point of the
+                                                                       // cluster is at a real data point
+              lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.8, ( it - 1 ).value().value ) );
           }
           else
-            lineData->append( QCPData( currentIntervalFirstPoint.key(),
-                                       currentIntervalFirstPoint.value().value ) );
+            lineData->append( QCPData( currentIntervalFirstPoint.key(), currentIntervalFirstPoint.value().value ) );
           lastIntervalEndKey = ( it - 1 ).value().key;
           minValue = it.value().value;
           maxValue = it.value().value;
           currentIntervalFirstPoint = it;
-          currentIntervalStartKey =
-              keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( it.key() ) + reversedRound ) );
+          currentIntervalStartKey = keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( it.key() ) + reversedRound ) );
           if( keyEpsilonVariable )
             keyEpsilon =
-                qAbs( currentIntervalStartKey -
-                      keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) +
-                                             1.0 * reversedFactor ) );
+                qAbs( currentIntervalStartKey - keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) + 1.0 * reversedFactor ) );
           intervalDataCount = 1;
         }
         ++it;
@@ -18766,17 +18308,14 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
       if( intervalDataCount >= 2 )  // last pixel had multiple data points,
                                     // consolidate them to a cluster
       {
-        if( lastIntervalEndKey <
-            currentIntervalStartKey - keyEpsilon )  // last point wasn't a cluster, so first point
-                                                    // of this cluster must be at a real data point
-          lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.2,
-                                     currentIntervalFirstPoint.value().value ) );
+        if( lastIntervalEndKey < currentIntervalStartKey - keyEpsilon )  // last point wasn't a cluster, so first point
+                                                                         // of this cluster must be at a real data point
+          lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.2, currentIntervalFirstPoint.value().value ) );
         lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.25, minValue ) );
         lineData->append( QCPData( currentIntervalStartKey + keyEpsilon * 0.75, maxValue ) );
       }
       else
-        lineData->append(
-            QCPData( currentIntervalFirstPoint.key(), currentIntervalFirstPoint.value().value ) );
+        lineData->append( QCPData( currentIntervalFirstPoint.key(), currentIntervalFirstPoint.value().value ) );
     }
 
     if( scatterData )
@@ -18796,19 +18335,15 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
                                                                // (normal) and ceil (reversed)
                                                                // rounding of
                                                                // currentIntervalStartKey
-      double currentIntervalStartKey =
-          keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( lower.key() ) + reversedRound ) );
-      double keyEpsilon =
-          qAbs( currentIntervalStartKey -
-                keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) +
-                                       1.0 * reversedFactor ) );  // interval of one pixel
-                                                                  // on screen when mapped
-                                                                  // to plot key
-                                                                  // coordinates
-      bool keyEpsilonVariable =
-          keyAxis->scaleType() == QCPAxis::stLogarithmic;  // indicates whether keyEpsilon needs
-                                                           // to be updated after every interval
-                                                           // (for log axes)
+      double currentIntervalStartKey = keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( lower.key() ) + reversedRound ) );
+      double keyEpsilon = qAbs( currentIntervalStartKey - keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) +
+                                                                                 1.0 * reversedFactor ) );  // interval of one pixel
+                                                                                                            // on screen when mapped
+                                                                                                            // to plot key
+                                                                                                            // coordinates
+      bool keyEpsilonVariable = keyAxis->scaleType() == QCPAxis::stLogarithmic;                             // indicates whether keyEpsilon needs
+                                                                                                            // to be updated after every interval
+                                                                                                            // (for log axes)
       int intervalDataCount = 1;
       ++it;  // advance iterator to second data point because adaptive sampling
              // works in 1 point retrospect
@@ -18820,14 +18355,12 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
                                                                // skip it and
         // expand value span of this pixel if necessary
         {
-          if( it.value().value < minValue && it.value().value > valueMinRange &&
-              it.value().value < valueMaxRange )
+          if( it.value().value < minValue && it.value().value > valueMinRange && it.value().value < valueMaxRange )
           {
             minValue = it.value().value;
             minValueIt = it;
           }
-          else if( it.value().value > maxValue && it.value().value > valueMinRange &&
-                   it.value().value < valueMaxRange )
+          else if( it.value().value > maxValue && it.value().value > valueMinRange && it.value().value < valueMaxRange )
           {
             maxValue = it.value().value;
             maxValueIt = it;
@@ -18841,38 +18374,31 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
             // determine value pixel span and add as many points in interval to
             // maintain certain vertical data density
             // (this is specific to scatter plot):
-            double valuePixelSpan =
-                qAbs( valueAxis->coordToPixel( minValue ) - valueAxis->coordToPixel( maxValue ) );
-            int dataModulo = qMax(
-                1,
-                qRound( intervalDataCount / ( valuePixelSpan / 4.0 ) ) );  // approximately every 4
-                                                                           // value pixels one data
-                                                                           // point on average
+            double valuePixelSpan = qAbs( valueAxis->coordToPixel( minValue ) - valueAxis->coordToPixel( maxValue ) );
+            int dataModulo = qMax( 1,
+                                   qRound( intervalDataCount / ( valuePixelSpan / 4.0 ) ) );  // approximately every 4
+                                                                                              // value pixels one data
+                                                                                              // point on average
             QCPDataMap::const_iterator intervalIt = currentIntervalStart;
             int c = 0;
             while( intervalIt != it )
             {
-              if( ( c % dataModulo == 0 || intervalIt == minValueIt || intervalIt == maxValueIt ) &&
-                  intervalIt.value().value > valueMinRange &&
+              if( ( c % dataModulo == 0 || intervalIt == minValueIt || intervalIt == maxValueIt ) && intervalIt.value().value > valueMinRange &&
                   intervalIt.value().value < valueMaxRange )
                 scatterData->append( intervalIt.value() );
               ++c;
               ++intervalIt;
             }
           }
-          else if( currentIntervalStart.value().value > valueMinRange &&
-                   currentIntervalStart.value().value < valueMaxRange )
+          else if( currentIntervalStart.value().value > valueMinRange && currentIntervalStart.value().value < valueMaxRange )
             scatterData->append( currentIntervalStart.value() );
           minValue = it.value().value;
           maxValue = it.value().value;
           currentIntervalStart = it;
-          currentIntervalStartKey =
-              keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( it.key() ) + reversedRound ) );
+          currentIntervalStartKey = keyAxis->pixelToCoord( (int)( keyAxis->coordToPixel( it.key() ) + reversedRound ) );
           if( keyEpsilonVariable )
             keyEpsilon =
-                qAbs( currentIntervalStartKey -
-                      keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) +
-                                             1.0 * reversedFactor ) );
+                qAbs( currentIntervalStartKey - keyAxis->pixelToCoord( keyAxis->coordToPixel( currentIntervalStartKey ) + 1.0 * reversedFactor ) );
           intervalDataCount = 1;
         }
         ++it;
@@ -18883,25 +18409,22 @@ void QCPGraph::getPreparedData( QVector<QCPData>* lineData, QVector<QCPData>* sc
         // determine value pixel span and add as many points in interval to
         // maintain certain vertical data density (this
         // is specific to scatter plot):
-        double valuePixelSpan =
-            qAbs( valueAxis->coordToPixel( minValue ) - valueAxis->coordToPixel( maxValue ) );
-        int dataModulo = qMax(
-            1, qRound( intervalDataCount / ( valuePixelSpan / 4.0 ) ) );  // approximately every 4
-                                                                          // value pixels one data
-                                                                          // point on average
+        double valuePixelSpan = qAbs( valueAxis->coordToPixel( minValue ) - valueAxis->coordToPixel( maxValue ) );
+        int dataModulo = qMax( 1, qRound( intervalDataCount / ( valuePixelSpan / 4.0 ) ) );  // approximately every 4
+                                                                                             // value pixels one data
+                                                                                             // point on average
         QCPDataMap::const_iterator intervalIt = currentIntervalStart;
         int c = 0;
         while( intervalIt != it )
         {
-          if( ( c % dataModulo == 0 || intervalIt == minValueIt || intervalIt == maxValueIt ) &&
-              intervalIt.value().value > valueMinRange && intervalIt.value().value < valueMaxRange )
+          if( ( c % dataModulo == 0 || intervalIt == minValueIt || intervalIt == maxValueIt ) && intervalIt.value().value > valueMinRange &&
+              intervalIt.value().value < valueMaxRange )
             scatterData->append( intervalIt.value() );
           ++c;
           ++intervalIt;
         }
       }
-      else if( currentIntervalStart.value().value > valueMinRange &&
-               currentIntervalStart.value().value < valueMaxRange )
+      else if( currentIntervalStart.value().value > valueMinRange && currentIntervalStart.value().value < valueMaxRange )
         scatterData->append( currentIntervalStart.value() );
     }
   }
@@ -19067,8 +18590,7 @@ void QCPGraph::drawError( QCPPainter* painter, double x, double y, const QCPData
 
   if the graph contains no data, both \a lower and \a upper point to constEnd.
 */
-void QCPGraph::getVisibleDataBounds( QCPDataMap::const_iterator& lower,
-                                     QCPDataMap::const_iterator& upper ) const
+void QCPGraph::getVisibleDataBounds( QCPDataMap::const_iterator& lower, QCPDataMap::const_iterator& upper ) const
 {
   if( !mKeyAxis )
   {
@@ -19088,8 +18610,7 @@ void QCPGraph::getVisibleDataBounds( QCPDataMap::const_iterator& lower,
   bool lowoutlier = lbound != mData->constBegin();  // indicates whether there
                                                     // exist points below axis
                                                     // range
-  bool highoutlier =
-      ubound != mData->constEnd();  // indicates whether there exist points above axis range
+  bool highoutlier = ubound != mData->constEnd();   // indicates whether there exist points above axis range
 
   lower = ( lowoutlier ? lbound - 1 : lbound );   // data point range that will be actually drawn
   upper = ( highoutlier ? ubound : ubound - 1 );  // data point range that will be actually drawn
@@ -19109,9 +18630,7 @@ void QCPGraph::getVisibleDataBounds( QCPDataMap::const_iterator& lower,
   number of data
   points at which adaptive sampling sets in.
 */
-int QCPGraph::countDataInBounds( const QCPDataMap::const_iterator& lower,
-                                 const QCPDataMap::const_iterator& upper,
-                                 int maxCount ) const
+int QCPGraph::countDataInBounds( const QCPDataMap::const_iterator& lower, const QCPDataMap::const_iterator& upper, int maxCount ) const
 {
   if( upper == mData->constEnd() && lower == mData->constEnd() )
     return 0;
@@ -19242,9 +18761,8 @@ QPointF QCPGraph::lowerFillBasePoint( double lowerKey ) const
     if( keyAxis->orientation() == Qt::Vertical )
     {
       if( ( valueAxis->range().upper < 0 && !valueAxis->rangeReversed() ) ||
-          ( valueAxis->range().upper > 0 &&
-            valueAxis->rangeReversed() ) )  // if range is negative, zero is on
-                                            // opposite side of key axis
+          ( valueAxis->range().upper > 0 && valueAxis->rangeReversed() ) )  // if range is negative, zero is on
+                                                                            // opposite side of key axis
         point.setX( keyAxis->axisRect()->right() );
       else
         point.setX( keyAxis->axisRect()->left() );
@@ -19254,9 +18772,8 @@ QPointF QCPGraph::lowerFillBasePoint( double lowerKey ) const
     {
       point.setX( lowerKey );
       if( ( valueAxis->range().upper < 0 && !valueAxis->rangeReversed() ) ||
-          ( valueAxis->range().upper > 0 &&
-            valueAxis->rangeReversed() ) )  // if range is negative, zero is on
-                                            // opposite side of key axis
+          ( valueAxis->range().upper > 0 && valueAxis->rangeReversed() ) )  // if range is negative, zero is on
+                                                                            // opposite side of key axis
         point.setY( keyAxis->axisRect()->top() );
       else
         point.setY( keyAxis->axisRect()->bottom() );
@@ -19327,9 +18844,8 @@ QPointF QCPGraph::upperFillBasePoint( double upperKey ) const
     if( keyAxis->orientation() == Qt::Vertical )
     {
       if( ( valueAxis->range().upper < 0 && !valueAxis->rangeReversed() ) ||
-          ( valueAxis->range().upper > 0 &&
-            valueAxis->rangeReversed() ) )  // if range is negative, zero is on
-                                            // opposite side of key axis
+          ( valueAxis->range().upper > 0 && valueAxis->rangeReversed() ) )  // if range is negative, zero is on
+                                                                            // opposite side of key axis
         point.setX( keyAxis->axisRect()->right() );
       else
         point.setX( keyAxis->axisRect()->left() );
@@ -19339,9 +18855,8 @@ QPointF QCPGraph::upperFillBasePoint( double upperKey ) const
     {
       point.setX( upperKey );
       if( ( valueAxis->range().upper < 0 && !valueAxis->rangeReversed() ) ||
-          ( valueAxis->range().upper > 0 &&
-            valueAxis->rangeReversed() ) )  // if range is negative, zero is on
-                                            // opposite side of key axis
+          ( valueAxis->range().upper > 0 && valueAxis->rangeReversed() ) )  // if range is negative, zero is on
+                                                                            // opposite side of key axis
         point.setY( keyAxis->axisRect()->top() );
       else
         point.setY( keyAxis->axisRect()->bottom() );
@@ -19442,12 +18957,10 @@ const QPolygonF QCPGraph::getChannelFillPolygon( const QVector<QPointF>* lineDat
       return QPolygonF();  // need at least two points for interpolation
     double slope;
     if( croppedData->at( 1 ).x() - croppedData->at( 0 ).x() != 0 )
-      slope = ( croppedData->at( 1 ).y() - croppedData->at( 0 ).y() ) /
-              ( croppedData->at( 1 ).x() - croppedData->at( 0 ).x() );
+      slope = ( croppedData->at( 1 ).y() - croppedData->at( 0 ).y() ) / ( croppedData->at( 1 ).x() - croppedData->at( 0 ).x() );
     else
       slope = 0;
-    ( *croppedData )[0].setY( croppedData->at( 0 ).y() +
-                              slope * ( staticData->first().x() - croppedData->at( 0 ).x() ) );
+    ( *croppedData )[0].setY( croppedData->at( 0 ).y() + slope * ( staticData->first().x() - croppedData->at( 0 ).x() ) );
     ( *croppedData )[0].setX( staticData->first().x() );
 
     // crop upper bound:
@@ -19464,12 +18977,10 @@ const QPolygonF QCPGraph::getChannelFillPolygon( const QVector<QPointF>* lineDat
       return QPolygonF();              // need at least two points for interpolation
     int li = croppedData->size() - 1;  // last index
     if( croppedData->at( li ).x() - croppedData->at( li - 1 ).x() != 0 )
-      slope = ( croppedData->at( li ).y() - croppedData->at( li - 1 ).y() ) /
-              ( croppedData->at( li ).x() - croppedData->at( li - 1 ).x() );
+      slope = ( croppedData->at( li ).y() - croppedData->at( li - 1 ).y() ) / ( croppedData->at( li ).x() - croppedData->at( li - 1 ).x() );
     else
       slope = 0;
-    ( *croppedData )[li].setY( croppedData->at( li - 1 ).y() +
-                               slope * ( staticData->last().x() - croppedData->at( li - 1 ).x() ) );
+    ( *croppedData )[li].setY( croppedData->at( li - 1 ).y() + slope * ( staticData->last().x() - croppedData->at( li - 1 ).x() ) );
     ( *croppedData )[li].setX( staticData->last().x() );
   }
   else  // mKeyAxis->orientation() == Qt::Vertical
@@ -19507,14 +19018,11 @@ const QPolygonF QCPGraph::getChannelFillPolygon( const QVector<QPointF>* lineDat
     if( croppedData->size() < 2 )
       return QPolygonF();  // need at least two points for interpolation
     double slope;
-    if( croppedData->at( 1 ).y() - croppedData->at( 0 ).y() !=
-        0 )  // avoid division by zero in step plots
-      slope = ( croppedData->at( 1 ).x() - croppedData->at( 0 ).x() ) /
-              ( croppedData->at( 1 ).y() - croppedData->at( 0 ).y() );
+    if( croppedData->at( 1 ).y() - croppedData->at( 0 ).y() != 0 )  // avoid division by zero in step plots
+      slope = ( croppedData->at( 1 ).x() - croppedData->at( 0 ).x() ) / ( croppedData->at( 1 ).y() - croppedData->at( 0 ).y() );
     else
       slope = 0;
-    ( *croppedData )[0].setX( croppedData->at( 0 ).x() +
-                              slope * ( staticData->first().y() - croppedData->at( 0 ).y() ) );
+    ( *croppedData )[0].setX( croppedData->at( 0 ).x() + slope * ( staticData->first().y() - croppedData->at( 0 ).y() ) );
     ( *croppedData )[0].setY( staticData->first().y() );
 
     // crop upper bound:
@@ -19528,22 +19036,18 @@ const QPolygonF QCPGraph::getChannelFillPolygon( const QVector<QPointF>* lineDat
     // static data
     // point via linear interpolation:
     if( croppedData->size() < 2 )
-      return QPolygonF();              // need at least two points for interpolation
-    int li = croppedData->size() - 1;  // last index
-    if( croppedData->at( li ).y() - croppedData->at( li - 1 ).y() !=
-        0 )  // avoid division by zero in step plots
-      slope = ( croppedData->at( li ).x() - croppedData->at( li - 1 ).x() ) /
-              ( croppedData->at( li ).y() - croppedData->at( li - 1 ).y() );
+      return QPolygonF();                                                 // need at least two points for interpolation
+    int li = croppedData->size() - 1;                                     // last index
+    if( croppedData->at( li ).y() - croppedData->at( li - 1 ).y() != 0 )  // avoid division by zero in step plots
+      slope = ( croppedData->at( li ).x() - croppedData->at( li - 1 ).x() ) / ( croppedData->at( li ).y() - croppedData->at( li - 1 ).y() );
     else
       slope = 0;
-    ( *croppedData )[li].setX( croppedData->at( li - 1 ).x() +
-                               slope * ( staticData->last().y() - croppedData->at( li - 1 ).y() ) );
+    ( *croppedData )[li].setX( croppedData->at( li - 1 ).x() + slope * ( staticData->last().y() - croppedData->at( li - 1 ).y() ) );
     ( *croppedData )[li].setY( staticData->last().y() );
   }
 
   // return joined:
-  for( int i = otherData.size() - 1; i >= 0;
-       --i )  // insert reversed, otherwise the polygon will be twisted
+  for( int i = otherData.size() - 1; i >= 0; --i )  // insert reversed, otherwise the polygon will be twisted
     thisData << otherData.at( i );
   return QPolygonF( thisData );
 }
@@ -19643,8 +19147,7 @@ double QCPGraph::pointDistance( const QPointF& pixelPoint ) const
   }
   if( mData->size() == 1 )
   {
-    QPointF dataPoint =
-        coordsToPixels( mData->constBegin().key(), mData->constBegin().value().value );
+    QPointF dataPoint = coordsToPixels( mData->constBegin().key(), mData->constBegin().value().value );
     return QVector2D( dataPoint - pixelPoint ).length();
   }
 
@@ -19686,8 +19189,7 @@ double QCPGraph::pointDistance( const QPointF& pixelPoint ) const
       // are only pairwise connected:
       for( int i = 0; i < lineData->size() - 1; i += 2 )  // iterate pairs
       {
-        double currentDistSqr =
-            distSqrToLine( lineData->at( i ), lineData->at( i + 1 ), pixelPoint );
+        double currentDistSqr = distSqrToLine( lineData->at( i ), lineData->at( i + 1 ), pixelPoint );
         if( currentDistSqr < minDistSqr )
           minDistSqr = currentDistSqr;
       }
@@ -19697,8 +19199,7 @@ double QCPGraph::pointDistance( const QPointF& pixelPoint ) const
       // all other line plots (line and step) connect points directly:
       for( int i = 0; i < lineData->size() - 1; ++i )
       {
-        double currentDistSqr =
-            distSqrToLine( lineData->at( i ), lineData->at( i + 1 ), pixelPoint );
+        double currentDistSqr = distSqrToLine( lineData->at( i ), lineData->at( i + 1 ), pixelPoint );
         if( currentDistSqr < minDistSqr )
           minDistSqr = currentDistSqr;
       }
@@ -19760,9 +19261,7 @@ QCPRange QCPGraph::getValueRange( bool& foundRange, SignDomain inSignDomain ) co
 
   \see getKeyRange(bool &foundRange, SignDomain inSignDomain)
 */
-QCPRange QCPGraph::getKeyRange( bool& foundRange,
-                                SignDomain inSignDomain,
-                                bool includeErrors ) const
+QCPRange QCPGraph::getKeyRange( bool& foundRange, SignDomain inSignDomain, bool includeErrors ) const
 {
   QCPRange range;
   bool haveLower = false;
@@ -19799,14 +19298,12 @@ QCPRange QCPGraph::getKeyRange( bool& foundRange,
       current = it.value().key;
       currentErrorMinus = ( includeErrors ? it.value().keyErrorMinus : 0 );
       currentErrorPlus = ( includeErrors ? it.value().keyErrorPlus : 0 );
-      if( ( current - currentErrorMinus < range.lower || !haveLower ) &&
-          current - currentErrorMinus < 0 )
+      if( ( current - currentErrorMinus < range.lower || !haveLower ) && current - currentErrorMinus < 0 )
       {
         range.lower = current - currentErrorMinus;
         haveLower = true;
       }
-      if( ( current + currentErrorPlus > range.upper || !haveUpper ) &&
-          current + currentErrorPlus < 0 )
+      if( ( current + currentErrorPlus > range.upper || !haveUpper ) && current + currentErrorPlus < 0 )
       {
         range.upper = current + currentErrorPlus;
         haveUpper = true;
@@ -19837,14 +19334,12 @@ QCPRange QCPGraph::getKeyRange( bool& foundRange,
       current = it.value().key;
       currentErrorMinus = ( includeErrors ? it.value().keyErrorMinus : 0 );
       currentErrorPlus = ( includeErrors ? it.value().keyErrorPlus : 0 );
-      if( ( current - currentErrorMinus < range.lower || !haveLower ) &&
-          current - currentErrorMinus > 0 )
+      if( ( current - currentErrorMinus < range.lower || !haveLower ) && current - currentErrorMinus > 0 )
       {
         range.lower = current - currentErrorMinus;
         haveLower = true;
       }
-      if( ( current + currentErrorPlus > range.upper || !haveUpper ) &&
-          current + currentErrorPlus > 0 )
+      if( ( current + currentErrorPlus > range.upper || !haveUpper ) && current + currentErrorPlus > 0 )
       {
         range.upper = current + currentErrorPlus;
         haveUpper = true;
@@ -19879,9 +19374,7 @@ QCPRange QCPGraph::getKeyRange( bool& foundRange,
 
   \see getValueRange(bool &foundRange, SignDomain inSignDomain)
 */
-QCPRange QCPGraph::getValueRange( bool& foundRange,
-                                  SignDomain inSignDomain,
-                                  bool includeErrors ) const
+QCPRange QCPGraph::getValueRange( bool& foundRange, SignDomain inSignDomain, bool includeErrors ) const
 {
   QCPRange range;
   bool haveLower = false;
@@ -19918,14 +19411,12 @@ QCPRange QCPGraph::getValueRange( bool& foundRange,
       current = it.value().value;
       currentErrorMinus = ( includeErrors ? it.value().valueErrorMinus : 0 );
       currentErrorPlus = ( includeErrors ? it.value().valueErrorPlus : 0 );
-      if( ( current - currentErrorMinus < range.lower || !haveLower ) &&
-          current - currentErrorMinus < 0 )
+      if( ( current - currentErrorMinus < range.lower || !haveLower ) && current - currentErrorMinus < 0 )
       {
         range.lower = current - currentErrorMinus;
         haveLower = true;
       }
-      if( ( current + currentErrorPlus > range.upper || !haveUpper ) &&
-          current + currentErrorPlus < 0 )
+      if( ( current + currentErrorPlus > range.upper || !haveUpper ) && current + currentErrorPlus < 0 )
       {
         range.upper = current + currentErrorPlus;
         haveUpper = true;
@@ -19956,14 +19447,12 @@ QCPRange QCPGraph::getValueRange( bool& foundRange,
       current = it.value().value;
       currentErrorMinus = ( includeErrors ? it.value().valueErrorMinus : 0 );
       currentErrorPlus = ( includeErrors ? it.value().valueErrorPlus : 0 );
-      if( ( current - currentErrorMinus < range.lower || !haveLower ) &&
-          current - currentErrorMinus > 0 )
+      if( ( current - currentErrorMinus < range.lower || !haveLower ) && current - currentErrorMinus > 0 )
       {
         range.lower = current - currentErrorMinus;
         haveLower = true;
       }
-      if( ( current + currentErrorPlus > range.upper || !haveUpper ) &&
-          current + currentErrorPlus > 0 )
+      if( ( current + currentErrorPlus > range.upper || !haveUpper ) && current + currentErrorPlus > 0 )
       {
         range.upper = current + currentErrorPlus;
         haveUpper = true;
@@ -20017,10 +19506,7 @@ QCPCurveData::QCPCurveData() : t( 0 ), key( 0 ), value( 0 ) {}
 /*!
   Constructs a curve data point with the specified \a t, \a key and \a value.
 */
-QCPCurveData::QCPCurveData( double t, double key, double value )
-    : t( t ), key( key ), value( value )
-{
-}
+QCPCurveData::QCPCurveData( double t, double key, double value ) : t( t ), key( key ), value( value ) {}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////// QCPCurve
@@ -20079,8 +19565,7 @@ QCPCurveData::QCPCurveData( double t, double key, double value )
   QCustomPlot::addPlottable, QCustomPlot
   then takes ownership of the graph.
 */
-QCPCurve::QCPCurve( QCPAxis* keyAxis, QCPAxis* valueAxis )
-    : QCPAbstractPlottable( keyAxis, valueAxis )
+QCPCurve::QCPCurve( QCPAxis* keyAxis, QCPAxis* valueAxis ) : QCPAbstractPlottable( keyAxis, valueAxis )
 {
   mData = new QCPCurveDataMap;
   mPen.setColor( Qt::blue );
@@ -20131,9 +19616,7 @@ void QCPCurve::setData( QCPCurveDataMap* data, bool copy )
   will be the size of
   the smallest vector.
 */
-void QCPCurve::setData( const QVector<double>& t,
-                        const QVector<double>& key,
-                        const QVector<double>& value )
+void QCPCurve::setData( const QVector<double>& t, const QVector<double>& key, const QVector<double>& value )
 {
   mData->clear();
   int n = t.size();
@@ -20257,9 +19740,7 @@ void QCPCurve::addData( double key, double value )
   current data.
   \see removeData
 */
-void QCPCurve::addData( const QVector<double>& ts,
-                        const QVector<double>& keys,
-                        const QVector<double>& values )
+void QCPCurve::addData( const QVector<double>& ts, const QVector<double>& keys, const QVector<double>& values )
 {
   int n = ts.size();
   n = qMin( n, keys.size() );
@@ -20378,8 +19859,7 @@ void QCPCurve::draw( QCPPainter* painter )
   QCPCurveDataMap::const_iterator it;
   for( it = mData->constBegin(); it != mData->constEnd(); ++it )
   {
-    if( QCP::isInvalidData( it.value().t ) ||
-        QCP::isInvalidData( it.value().key, it.value().value ) )
+    if( QCP::isInvalidData( it.value().t ) || QCP::isInvalidData( it.value().key, it.value().value ) )
       qDebug() << Q_FUNC_INFO << "Data point at" << it.key() << "invalid."
                << "Plottable name:" << name();
   }
@@ -20402,10 +19882,8 @@ void QCPCurve::draw( QCPPainter* painter )
     painter->setBrush( Qt::NoBrush );
     // if drawing solid line and not in PDF, use much faster line drawing
     // instead of polyline:
-    if( mParentPlot->plottingHints().testFlag( QCP::phFastPolylines ) &&
-        painter->pen().style() == Qt::SolidLine &&
-        !painter->modes().testFlag( QCPPainter::pmVectorized ) &&
-        !painter->modes().testFlag( QCPPainter::pmNoCaching ) )
+    if( mParentPlot->plottingHints().testFlag( QCP::phFastPolylines ) && painter->pen().style() == Qt::SolidLine &&
+        !painter->modes().testFlag( QCPPainter::pmVectorized ) && !painter->modes().testFlag( QCPPainter::pmNoCaching ) )
     {
       for( int i = 1; i < lineData->size(); ++i )
         painter->drawLine( lineData->at( i - 1 ), lineData->at( i ) );
@@ -20431,9 +19909,7 @@ void QCPCurve::drawLegendIcon( QCPPainter* painter, const QRectF& rect ) const
   if( mBrush.style() != Qt::NoBrush )
   {
     applyFillAntialiasingHint( painter );
-    painter->fillRect(
-        QRectF( rect.left(), rect.top() + rect.height() / 2.0, rect.width(), rect.height() / 3.0 ),
-        mBrush );
+    painter->fillRect( QRectF( rect.left(), rect.top() + rect.height() / 2.0, rect.width(), rect.height() / 3.0 ), mBrush );
   }
   // draw line vertically centered:
   if( mLineStyle != lsNone )
@@ -20451,12 +19927,10 @@ void QCPCurve::drawLegendIcon( QCPPainter* painter, const QRectF& rect ) const
     applyScattersAntialiasingHint( painter );
     // scale scatter pixmap if it's too large to fit in legend icon rect:
     if( mScatterStyle.shape() == QCPScatterStyle::ssPixmap &&
-        ( mScatterStyle.pixmap().size().width() > rect.width() ||
-          mScatterStyle.pixmap().size().height() > rect.height() ) )
+        ( mScatterStyle.pixmap().size().width() > rect.width() || mScatterStyle.pixmap().size().height() > rect.height() ) )
     {
       QCPScatterStyle scaledStyle( mScatterStyle );
-      scaledStyle.setPixmap( scaledStyle.pixmap().scaled( rect.size().toSize(), Qt::KeepAspectRatio,
-                                                          Qt::SmoothTransformation ) );
+      scaledStyle.setPixmap( scaledStyle.pixmap().scaled( rect.size().toSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
       scaledStyle.applyTo( painter, mPen );
       scaledStyle.drawShape( painter, QRectF( rect ).center() );
     }
@@ -20572,18 +20046,17 @@ void QCPCurve::getCurveData( QVector<QPointF>* lineData ) const
       some.
     */
     // determine whether to keep current point:
-    if( currentRegion == 5 ||
-        ( firstPoint && mBrush.style() != Qt::NoBrush ) )  // current is in R, add
-                                                           // current and last if it
-                                                           // wasn't added already
+    if( currentRegion == 5 || ( firstPoint && mBrush.style() != Qt::NoBrush ) )  // current is in R, add
+                                                                                 // current and last if it
+                                                                                 // wasn't added already
     {
       if( !addedLastAlready )  // in case curve just entered R, make sure the last
                                // point outside R is also drawn
                                // correctly
         lineData->append( coordsToPixels( ( it - 1 ).value().key,
                                           ( it - 1 ).value().value ) );  // add last point to vector
-      else if( lastRegion != 5 )  // added last already. If that's the case, we
-                                  // probably added it at optimized position.
+      else if( lastRegion != 5 )                                         // added last already. If that's the case, we
+                                                                         // probably added it at optimized position.
       // So go back and make sure it's at original position (else the angle
       // changes under
       // which this segment enters R)
@@ -20591,12 +20064,10 @@ void QCPCurve::getCurveData( QVector<QPointF>* lineData ) const
         if( !firstPoint )  // because on firstPoint, currentRegion is 5 and
                            // addedLastAlready is true, although there is
                            // no last point
-          lineData->replace( lineData->size() - 1,
-                             coordsToPixels( ( it - 1 ).value().key, ( it - 1 ).value().value ) );
+          lineData->replace( lineData->size() - 1, coordsToPixels( ( it - 1 ).value().key, ( it - 1 ).value().value ) );
       }
-      lineData->append(
-          coordsToPixels( it.value().key, it.value().value ) );  // add current point to vector
-      addedLastAlready = true;  // so in next iteration, we don't add this point twice
+      lineData->append( coordsToPixels( it.value().key, it.value().value ) );  // add current point to vector
+      addedLastAlready = true;                                                 // so in next iteration, we don't add this point twice
     }
     else if( currentRegion != lastRegion )  // changed region, add current and
                                             // last if not added already
@@ -20608,15 +20079,11 @@ void QCPCurve::getCurveData( QVector<QPointF>* lineData ) const
       // if we're coming from R or we skip diagonally over the corner regions
       // (so line might still be visible in R), we
       // can't place points optimized
-      if( lastRegion == 5 ||  // coming from R
-          ( ( lastRegion == 2 && currentRegion == 4 ) ||
-            ( lastRegion == 4 && currentRegion == 2 ) ) ||  // skip top left diagonal
-          ( ( lastRegion == 4 && currentRegion == 8 ) ||
-            ( lastRegion == 8 && currentRegion == 4 ) ) ||  // skip top right diagonal
-          ( ( lastRegion == 8 && currentRegion == 6 ) ||
-            ( lastRegion == 6 && currentRegion == 8 ) ) ||  // skip bottom right diagonal
-          ( ( lastRegion == 6 && currentRegion == 2 ) ||
-            ( lastRegion == 2 && currentRegion == 6 ) )  // skip bottom left diagonal
+      if( lastRegion == 5 ||                                                                             // coming from R
+          ( ( lastRegion == 2 && currentRegion == 4 ) || ( lastRegion == 4 && currentRegion == 2 ) ) ||  // skip top left diagonal
+          ( ( lastRegion == 4 && currentRegion == 8 ) || ( lastRegion == 8 && currentRegion == 4 ) ) ||  // skip top right diagonal
+          ( ( lastRegion == 8 && currentRegion == 6 ) || ( lastRegion == 6 && currentRegion == 8 ) ) ||  // skip bottom right diagonal
+          ( ( lastRegion == 6 && currentRegion == 2 ) || ( lastRegion == 2 && currentRegion == 6 ) )     // skip bottom left diagonal
       )
       {
         // always add last point if not added already, original:
@@ -20630,11 +20097,9 @@ void QCPCurve::getCurveData( QVector<QPointF>* lineData ) const
       {
         // always add last point if not added already, optimized:
         if( !addedLastAlready )
-          lineData->append( outsideCoordsToPixels( ( it - 1 ).value().key, ( it - 1 ).value().value,
-                                                   currentRegion, axisRect ) );
+          lineData->append( outsideCoordsToPixels( ( it - 1 ).value().key, ( it - 1 ).value().value, currentRegion, axisRect ) );
         // add current point, optimized:
-        lineData->append(
-            outsideCoordsToPixels( it.value().key, it.value().value, currentRegion, axisRect ) );
+        lineData->append( outsideCoordsToPixels( it.value().key, it.value().value, currentRegion, axisRect ) );
       }
       addedLastAlready = true;  // so that if next point enters 5, or crosses
                                 // another region boundary, we don't add this
@@ -20651,8 +20116,7 @@ void QCPCurve::getCurveData( QVector<QPointF>* lineData ) const
   // like it should when the curve started
   // inside R:
   if( lastRegion != 5 && mBrush.style() != Qt::NoBrush && !mData->isEmpty() )
-    lineData->append( coordsToPixels( ( mData->constEnd() - 1 ).value().key,
-                                      ( mData->constEnd() - 1 ).value().value ) );
+    lineData->append( coordsToPixels( ( mData->constEnd() - 1 ).value().key, ( mData->constEnd() - 1 ).value().value ) );
 }
 
 /*! \internal
@@ -20672,8 +20136,7 @@ double QCPCurve::pointDistance( const QPointF& pixelPoint ) const
   }
   if( mData->size() == 1 )
   {
-    QPointF dataPoint =
-        coordsToPixels( mData->constBegin().key(), mData->constBegin().value().value );
+    QPointF dataPoint = coordsToPixels( mData->constBegin().key(), mData->constBegin().value().value );
     return QVector2D( dataPoint - pixelPoint ).length();
   }
 
@@ -20709,10 +20172,7 @@ double QCPCurve::pointDistance( const QPointF& pixelPoint ) const
   filling is still being
   drawn for the viewer.
 */
-QPointF QCPCurve::outsideCoordsToPixels( double key,
-                                         double value,
-                                         int region,
-                                         QRect axisRect ) const
+QPointF QCPCurve::outsideCoordsToPixels( double key, double value, int region, QRect axisRect ) const
 {
   int margin = qCeil( qMax( mScatterStyle.size(), (double)mPen.widthF() ) ) + 2;
   QPointF result = coordsToPixels( key, value );
@@ -20763,8 +20223,7 @@ QCPRange QCPCurve::getKeyRange( bool& foundRange, SignDomain inSignDomain ) cons
   while( it != mData->constEnd() )
   {
     current = it.value().key;
-    if( inSignDomain == sdBoth || ( inSignDomain == sdNegative && current < 0 ) ||
-        ( inSignDomain == sdPositive && current > 0 ) )
+    if( inSignDomain == sdBoth || ( inSignDomain == sdNegative && current < 0 ) || ( inSignDomain == sdPositive && current > 0 ) )
     {
       if( current < range.lower || !haveLower )
       {
@@ -20797,8 +20256,7 @@ QCPRange QCPCurve::getValueRange( bool& foundRange, SignDomain inSignDomain ) co
   while( it != mData->constEnd() )
   {
     current = it.value().value;
-    if( inSignDomain == sdBoth || ( inSignDomain == sdNegative && current < 0 ) ||
-        ( inSignDomain == sdPositive && current > 0 ) )
+    if( inSignDomain == sdBoth || ( inSignDomain == sdNegative && current < 0 ) || ( inSignDomain == sdPositive && current > 0 ) )
     {
       if( current < range.lower || !haveLower )
       {
@@ -20912,8 +20370,7 @@ QCPBarData::QCPBarData( double key, double value ) : key( key ), value( value )
   QCustomPlot::addPlottable, QCustomPlot
   then takes ownership of the bar chart.
 */
-QCPBars::QCPBars( QCPAxis* keyAxis, QCPAxis* valueAxis )
-    : QCPAbstractPlottable( keyAxis, valueAxis )
+QCPBars::QCPBars( QCPAxis* keyAxis, QCPAxis* valueAxis ) : QCPAbstractPlottable( keyAxis, valueAxis )
 {
   mData = new QCPBarDataMap;
   mPen.setColor( Qt::blue );
@@ -21232,8 +20689,7 @@ void QCPBars::draw( QCPPainter* painter )
   for( it = mData->constBegin(); it != mData->constEnd(); ++it )
   {
     // skip bar if not visible in key axis range:
-    if( it.key() + mWidth * 0.5 < mKeyAxis.data()->range().lower ||
-        it.key() - mWidth * 0.5 > mKeyAxis.data()->range().upper )
+    if( it.key() + mWidth * 0.5 < mKeyAxis.data()->range().lower || it.key() - mWidth * 0.5 > mKeyAxis.data()->range().upper )
       continue;
 // check data validity if flag set:
 #ifdef QCUSTOMPLOT_CHECK_DATA
@@ -21413,8 +20869,7 @@ QCPRange QCPBars::getValueRange( bool& foundRange, SignDomain inSignDomain ) con
   while( it != mData->constEnd() )
   {
     current = it.value().value + getBaseValue( it.value().key, it.value().value >= 0 );
-    if( inSignDomain == sdBoth || ( inSignDomain == sdNegative && current < 0 ) ||
-        ( inSignDomain == sdPositive && current > 0 ) )
+    if( inSignDomain == sdBoth || ( inSignDomain == sdNegative && current < 0 ) || ( inSignDomain == sdPositive && current > 0 ) )
     {
       if( current < range.lower || !haveLower )
       {
@@ -21516,13 +20971,7 @@ QCPRange QCPBars::getValueRange( bool& foundRange, SignDomain inSignDomain ) con
   QCustomPlot then takes ownership of the statistical box.
 */
 QCPStatisticalBox::QCPStatisticalBox( QCPAxis* keyAxis, QCPAxis* valueAxis )
-    : QCPAbstractPlottable( keyAxis, valueAxis )
-    , mKey( 0 )
-    , mMinimum( 0 )
-    , mLowerQuartile( 0 )
-    , mMedian( 0 )
-    , mUpperQuartile( 0 )
-    , mMaximum( 0 )
+    : QCPAbstractPlottable( keyAxis, valueAxis ), mKey( 0 ), mMinimum( 0 ), mLowerQuartile( 0 ), mMedian( 0 ), mUpperQuartile( 0 ), mMaximum( 0 )
 {
   setOutlierStyle( QCPScatterStyle( QCPScatterStyle::ssCircle, Qt::blue, 6 ) );
   setWhiskerWidth( 0.2 );
@@ -21633,12 +21082,7 @@ void QCPStatisticalBox::setOutliers( const QVector<double>& values )
   \see setKey, setMinimum, setLowerQuartile, setMedian, setUpperQuartile,
   setMaximum
 */
-void QCPStatisticalBox::setData( double key,
-                                 double minimum,
-                                 double lowerQuartile,
-                                 double median,
-                                 double upperQuartile,
-                                 double maximum )
+void QCPStatisticalBox::setData( double key, double minimum, double lowerQuartile, double median, double upperQuartile, double maximum )
 {
   setKey( key );
   setMinimum( minimum );
@@ -21728,9 +21172,7 @@ void QCPStatisticalBox::clearData()
 }
 
 /* inherits documentation from base class */
-double QCPStatisticalBox::selectTest( const QPointF& pos,
-                                      bool onlySelectable,
-                                      QVariant* details ) const
+double QCPStatisticalBox::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
   if( onlySelectable && !mSelectable )
@@ -21753,8 +21195,7 @@ double QCPStatisticalBox::selectTest( const QPointF& pos,
 
     // min/max whiskers:
     if( QCPRange( mMinimum, mMaximum ).contains( posValue ) )
-      return qAbs( mKeyAxis.data()->coordToPixel( mKey ) -
-                   mKeyAxis.data()->coordToPixel( posKey ) );
+      return qAbs( mKeyAxis.data()->coordToPixel( mKey ) - mKeyAxis.data()->coordToPixel( posKey ) );
   }
   return -1;
 }
@@ -21770,8 +21211,7 @@ void QCPStatisticalBox::draw( QCPPainter* painter )
 
 // check data validity if flag set:
 #ifdef QCUSTOMPLOT_CHECK_DATA
-  if( QCP::isInvalidData( mKey, mMedian ) || QCP::isInvalidData( mLowerQuartile, mUpperQuartile ) ||
-      QCP::isInvalidData( mMinimum, mMaximum ) )
+  if( QCP::isInvalidData( mKey, mMedian ) || QCP::isInvalidData( mLowerQuartile, mUpperQuartile ) || QCP::isInvalidData( mMinimum, mMaximum ) )
     qDebug() << Q_FUNC_INFO << "Data point at" << mKey << "of drawn range has invalid data."
              << "Plottable name:" << name();
   for( int i = 0; i < mOutliers.size(); ++i )
@@ -21848,10 +21288,8 @@ void QCPStatisticalBox::drawWhiskers( QCPPainter* painter ) const
   QLineF backboneMin, backboneMax, barMin, barMax;
   backboneMax.setPoints( coordsToPixels( mKey, mUpperQuartile ), coordsToPixels( mKey, mMaximum ) );
   backboneMin.setPoints( coordsToPixels( mKey, mLowerQuartile ), coordsToPixels( mKey, mMinimum ) );
-  barMax.setPoints( coordsToPixels( mKey - mWhiskerWidth * 0.5, mMaximum ),
-                    coordsToPixels( mKey + mWhiskerWidth * 0.5, mMaximum ) );
-  barMin.setPoints( coordsToPixels( mKey - mWhiskerWidth * 0.5, mMinimum ),
-                    coordsToPixels( mKey + mWhiskerWidth * 0.5, mMinimum ) );
+  barMax.setPoints( coordsToPixels( mKey - mWhiskerWidth * 0.5, mMaximum ), coordsToPixels( mKey + mWhiskerWidth * 0.5, mMaximum ) );
+  barMin.setPoints( coordsToPixels( mKey - mWhiskerWidth * 0.5, mMinimum ), coordsToPixels( mKey + mWhiskerWidth * 0.5, mMinimum ) );
   applyErrorBarsAntialiasingHint( painter );
   painter->setPen( mWhiskerPen );
   painter->drawLine( backboneMin );
@@ -21924,8 +21362,7 @@ QCPRange QCPStatisticalBox::getValueRange( bool& foundRange, SignDomain inSignDo
   double lower = 0;
   for( int i = 0; i < values.size(); ++i )
   {
-    if( ( inSignDomain == sdNegative && values.at( i ) < 0 ) ||
-        ( inSignDomain == sdPositive && values.at( i ) > 0 ) || ( inSignDomain == sdBoth ) )
+    if( ( inSignDomain == sdNegative && values.at( i ) < 0 ) || ( inSignDomain == sdPositive && values.at( i ) > 0 ) || ( inSignDomain == sdBoth ) )
     {
       if( values.at( i ) > upper || !haveUpper )
       {
@@ -22020,17 +21457,8 @@ QCPRange QCPStatisticalBox::getValueRange( bool& foundRange, SignDomain inSignDo
 
   \see setSize, setKeySize, setValueSize, setRange, setKeyRange, setValueRange
 */
-QCPColorMapData::QCPColorMapData( int keySize,
-                                  int valueSize,
-                                  const QCPRange& keyRange,
-                                  const QCPRange& valueRange )
-    : mKeySize( 0 )
-    , mValueSize( 0 )
-    , mKeyRange( keyRange )
-    , mValueRange( valueRange )
-    , mIsEmpty( true )
-    , mData( 0 )
-    , mDataModified( true )
+QCPColorMapData::QCPColorMapData( int keySize, int valueSize, const QCPRange& keyRange, const QCPRange& valueRange )
+    : mKeySize( 0 ), mValueSize( 0 ), mKeyRange( keyRange ), mValueRange( valueRange ), mIsEmpty( true ), mData( 0 ), mDataModified( true )
 {
   setSize( keySize, valueSize );
   fill( 0 );
@@ -22046,8 +21474,7 @@ QCPColorMapData::~QCPColorMapData()
   Constructs a new QCPColorMapData instance copying the data and range of \a
   other.
 */
-QCPColorMapData::QCPColorMapData( const QCPColorMapData& other )
-    : mKeySize( 0 ), mValueSize( 0 ), mIsEmpty( true ), mData( 0 ), mDataModified( true )
+QCPColorMapData::QCPColorMapData( const QCPColorMapData& other ) : mKeySize( 0 ), mValueSize( 0 ), mIsEmpty( true ), mData( 0 ), mDataModified( true )
 {
   *this = other;
 }
@@ -22074,12 +21501,8 @@ QCPColorMapData& QCPColorMapData::operator=( const QCPColorMapData& other )
 /* undocumented getter */
 double QCPColorMapData::data( double key, double value )
 {
-  int keyCell =
-      ( key - mKeyRange.lower ) / ( mKeyRange.upper - mKeyRange.lower ) * ( mKeySize - 1 ) + 0.5;
-  int valueCell =
-      ( 1.0 - ( value - mValueRange.lower ) / ( mValueRange.upper - mValueRange.lower ) ) *
-          ( mValueSize - 1 ) +
-      0.5;
+  int keyCell = ( key - mKeyRange.lower ) / ( mKeyRange.upper - mKeyRange.lower ) * ( mKeySize - 1 ) + 0.5;
+  int valueCell = ( 1.0 - ( value - mValueRange.lower ) / ( mValueRange.upper - mValueRange.lower ) ) * ( mValueSize - 1 ) + 0.5;
   if( keyCell >= 0 && keyCell < mKeySize && valueCell >= 0 && valueCell < mValueSize )
     return mData[valueCell * mKeySize + keyCell];
   else
@@ -22137,8 +21560,7 @@ void QCPColorMapData::setSize( int keySize, int valueSize )
       if( mData )
         fill( 0 );
       else
-        qDebug() << Q_FUNC_INFO << "out of memory for data dimensions " << mKeySize << "*"
-                 << mValueSize;
+        qDebug() << Q_FUNC_INFO << "out of memory for data dimensions " << mKeySize << "*" << mValueSize;
     }
     else
       mData = 0;
@@ -22246,11 +21668,8 @@ void QCPColorMapData::setValueRange( const QCPRange& valueRange )
 */
 void QCPColorMapData::setData( double key, double value, double z )
 {
-  int keyCell =
-      ( key - mKeyRange.lower ) / ( mKeyRange.upper - mKeyRange.lower ) * ( mKeySize - 1 ) + 0.5;
-  int valueCell = ( value - mValueRange.lower ) / ( mValueRange.upper - mValueRange.lower ) *
-                      ( mValueSize - 1 ) +
-                  0.5;
+  int keyCell = ( key - mKeyRange.lower ) / ( mKeyRange.upper - mKeyRange.lower ) * ( mKeySize - 1 ) + 0.5;
+  int valueCell = ( value - mValueRange.lower ) / ( mValueRange.upper - mValueRange.lower ) * ( mValueSize - 1 ) + 0.5;
   if( keyCell >= 0 && keyCell < mKeySize && valueCell >= 0 && valueCell < mValueSize )
   {
     mData[valueCell * mKeySize + keyCell] = z;
@@ -22369,12 +21788,9 @@ void QCPColorMapData::fill( double z )
 void QCPColorMapData::coordToCell( double key, double value, int* keyIndex, int* valueIndex ) const
 {
   if( keyIndex )
-    *keyIndex =
-        ( key - mKeyRange.lower ) / ( mKeyRange.upper - mKeyRange.lower ) * ( mKeySize - 1 ) + 0.5;
+    *keyIndex = ( key - mKeyRange.lower ) / ( mKeyRange.upper - mKeyRange.lower ) * ( mKeySize - 1 ) + 0.5;
   if( valueIndex )
-    *valueIndex = ( value - mValueRange.lower ) / ( mValueRange.upper - mValueRange.lower ) *
-                      ( mValueSize - 1 ) +
-                  0.5;
+    *valueIndex = ( value - mValueRange.lower ) / ( mValueRange.upper - mValueRange.lower ) * ( mValueSize - 1 ) + 0.5;
 }
 
 /*!
@@ -22393,11 +21809,9 @@ void QCPColorMapData::coordToCell( double key, double value, int* keyIndex, int*
 void QCPColorMapData::cellToCoord( int keyIndex, int valueIndex, double* key, double* value ) const
 {
   if( key )
-    *key = keyIndex / (double)( mKeySize - 1 ) * ( mKeyRange.upper - mKeyRange.lower ) +
-           mKeyRange.lower;
+    *key = keyIndex / (double)( mKeySize - 1 ) * ( mKeyRange.upper - mKeyRange.lower ) + mKeyRange.lower;
   if( value )
-    *value = valueIndex / (double)( mValueSize - 1 ) * ( mValueRange.upper - mValueRange.lower ) +
-             mValueRange.lower;
+    *value = valueIndex / (double)( mValueSize - 1 ) * ( mValueRange.upper - mValueRange.lower ) + mValueRange.lower;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -22711,18 +22125,12 @@ void QCPColorMap::setColorScale( QCPColorScale* colorScale )
 {
   if( mColorScale )  // unconnect signals from old color scale
   {
-    disconnect( this, SIGNAL( dataRangeChanged( QCPRange ) ), mColorScale.data(),
-                SLOT( setDataRange( QCPRange ) ) );
-    disconnect( this, SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), mColorScale.data(),
-                SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
-    disconnect( this, SIGNAL( gradientChanged( QCPColorGradient ) ), mColorScale.data(),
-                SLOT( setGradient( QCPColorGradient ) ) );
-    disconnect( mColorScale.data(), SIGNAL( dataRangeChanged( QCPRange ) ), this,
-                SLOT( setDataRange( QCPRange ) ) );
-    disconnect( mColorScale.data(), SIGNAL( gradientChanged( QCPColorGradient ) ), this,
-                SLOT( setGradient( QCPColorGradient ) ) );
-    disconnect( mColorScale.data(), SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), this,
-                SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
+    disconnect( this, SIGNAL( dataRangeChanged( QCPRange ) ), mColorScale.data(), SLOT( setDataRange( QCPRange ) ) );
+    disconnect( this, SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), mColorScale.data(), SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
+    disconnect( this, SIGNAL( gradientChanged( QCPColorGradient ) ), mColorScale.data(), SLOT( setGradient( QCPColorGradient ) ) );
+    disconnect( mColorScale.data(), SIGNAL( dataRangeChanged( QCPRange ) ), this, SLOT( setDataRange( QCPRange ) ) );
+    disconnect( mColorScale.data(), SIGNAL( gradientChanged( QCPColorGradient ) ), this, SLOT( setGradient( QCPColorGradient ) ) );
+    disconnect( mColorScale.data(), SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), this, SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
   }
   mColorScale = colorScale;
   if( mColorScale )  // connect signals to new color scale
@@ -22730,18 +22138,12 @@ void QCPColorMap::setColorScale( QCPColorScale* colorScale )
     setGradient( mColorScale.data()->gradient() );
     setDataRange( mColorScale.data()->dataRange() );
     setDataScaleType( mColorScale.data()->dataScaleType() );
-    connect( this, SIGNAL( dataRangeChanged( QCPRange ) ), mColorScale.data(),
-             SLOT( setDataRange( QCPRange ) ) );
-    connect( this, SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), mColorScale.data(),
-             SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
-    connect( this, SIGNAL( gradientChanged( QCPColorGradient ) ), mColorScale.data(),
-             SLOT( setGradient( QCPColorGradient ) ) );
-    connect( mColorScale.data(), SIGNAL( dataRangeChanged( QCPRange ) ), this,
-             SLOT( setDataRange( QCPRange ) ) );
-    connect( mColorScale.data(), SIGNAL( gradientChanged( QCPColorGradient ) ), this,
-             SLOT( setGradient( QCPColorGradient ) ) );
-    connect( mColorScale.data(), SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), this,
-             SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
+    connect( this, SIGNAL( dataRangeChanged( QCPRange ) ), mColorScale.data(), SLOT( setDataRange( QCPRange ) ) );
+    connect( this, SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), mColorScale.data(), SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
+    connect( this, SIGNAL( gradientChanged( QCPColorGradient ) ), mColorScale.data(), SLOT( setGradient( QCPColorGradient ) ) );
+    connect( mColorScale.data(), SIGNAL( dataRangeChanged( QCPRange ) ), this, SLOT( setDataRange( QCPRange ) ) );
+    connect( mColorScale.data(), SIGNAL( gradientChanged( QCPColorGradient ) ), this, SLOT( setGradient( QCPColorGradient ) ) );
+    connect( mColorScale.data(), SIGNAL( dataScaleTypeChanged( QCPAxis::ScaleType ) ), this, SLOT( setDataScaleType( QCPAxis::ScaleType ) ) );
   }
 }
 
@@ -22813,12 +22215,9 @@ void QCPColorMap::updateLegendIcon( Qt::TransformationMode transformMode, const
   if( !mMapImage.isNull() )  // might still be null, e.g. if data is empty, so
                              // check here again
   {
-    bool mirrorX =
-        ( keyAxis()->orientation() == Qt::Horizontal ? keyAxis() : valueAxis() )->rangeReversed();
-    bool mirrorY =
-        ( valueAxis()->orientation() == Qt::Vertical ? valueAxis() : keyAxis() )->rangeReversed();
-    mLegendIcon = QPixmap::fromImage( mMapImage.mirrored( mirrorX, mirrorY ) )
-                      .scaled( thumbSize, Qt::KeepAspectRatio, transformMode );
+    bool mirrorX = ( keyAxis()->orientation() == Qt::Horizontal ? keyAxis() : valueAxis() )->rangeReversed();
+    bool mirrorY = ( valueAxis()->orientation() == Qt::Vertical ? valueAxis() : keyAxis() )->rangeReversed();
+    mLegendIcon = QPixmap::fromImage( mMapImage.mirrored( mirrorX, mirrorY ) ).scaled( thumbSize, Qt::KeepAspectRatio, transformMode );
   }
 }
 
@@ -22876,12 +22275,10 @@ void QCPColorMap::updateMapImage()
   // resize mMapImage to correct dimensions, according to key/value axes
   // orientation:
   if( keyAxis->orientation() == Qt::Horizontal &&
-      ( mMapImage.size().width() != mMapData->keySize() ||
-        mMapImage.size().height() != mMapData->valueSize() ) )
+      ( mMapImage.size().width() != mMapData->keySize() || mMapImage.size().height() != mMapData->valueSize() ) )
     mMapImage = QImage( QSize( mMapData->keySize(), mMapData->valueSize() ), QImage::Format_RGB32 );
   else if( keyAxis->orientation() == Qt::Vertical &&
-           ( mMapImage.size().width() != mMapData->valueSize() ||
-             mMapImage.size().height() != mMapData->keySize() ) )
+           ( mMapImage.size().width() != mMapData->valueSize() || mMapImage.size().height() != mMapData->keySize() ) )
     mMapImage = QImage( QSize( mMapData->valueSize(), mMapData->keySize() ), QImage::Format_RGB32 );
 
   const int keySize = mMapData->keySize();
@@ -22894,12 +22291,11 @@ void QCPColorMap::updateMapImage()
     const int rowCount = keySize;
     for( int line = 0; line < lineCount; ++line )
     {
-      QRgb* pixels = reinterpret_cast<QRgb*>( mMapImage.scanLine(
-          lineCount - 1 - line ) );  // invert scanline index because QImage counts scanlines from
+      QRgb* pixels =
+          reinterpret_cast<QRgb*>( mMapImage.scanLine( lineCount - 1 - line ) );  // invert scanline index because QImage counts scanlines from
       // top, but our vertical index counts from bottom (mathematical
       // coordinate system)
-      mGradient.colorize( rawData + line * rowCount, mDataRange, pixels, rowCount, 1,
-                          mDataScaleType == QCPAxis::stLogarithmic );
+      mGradient.colorize( rawData + line * rowCount, mDataRange, pixels, rowCount, 1, mDataScaleType == QCPAxis::stLogarithmic );
     }
   }
   else  // keyAxis->orientation() == Qt::Vertical
@@ -22908,12 +22304,11 @@ void QCPColorMap::updateMapImage()
     const int rowCount = valueSize;
     for( int line = 0; line < lineCount; ++line )
     {
-      QRgb* pixels = reinterpret_cast<QRgb*>( mMapImage.scanLine(
-          lineCount - 1 - line ) );  // invert scanline index because QImage counts scanlines from
+      QRgb* pixels =
+          reinterpret_cast<QRgb*>( mMapImage.scanLine( lineCount - 1 - line ) );  // invert scanline index because QImage counts scanlines from
       // top, but our vertical index counts from bottom (mathematical
       // coordinate system)
-      mGradient.colorize( rawData + line, mDataRange, pixels, rowCount, lineCount,
-                          mDataScaleType == QCPAxis::stLogarithmic );
+      mGradient.colorize( rawData + line, mDataRange, pixels, rowCount, lineCount, mDataScaleType == QCPAxis::stLogarithmic );
     }
   }
 
@@ -22939,26 +22334,21 @@ void QCPColorMap::draw( QCPPainter* painter )
     halfSampleKey = 0.5 * mMapData->keyRange().size() / (double)( mMapData->keySize() - 1 );
   if( mMapData->valueSize() > 1 )
     halfSampleValue = 0.5 * mMapData->valueRange().size() / (double)( mMapData->valueSize() - 1 );
-  QRectF imageRect( coordsToPixels( mMapData->keyRange().lower - halfSampleKey,
-                                    mMapData->valueRange().lower - halfSampleValue ),
-                    coordsToPixels( mMapData->keyRange().upper + halfSampleKey,
-                                    mMapData->valueRange().upper + halfSampleValue ) );
+  QRectF imageRect( coordsToPixels( mMapData->keyRange().lower - halfSampleKey, mMapData->valueRange().lower - halfSampleValue ),
+                    coordsToPixels( mMapData->keyRange().upper + halfSampleKey, mMapData->valueRange().upper + halfSampleValue ) );
   imageRect = imageRect.normalized();
-  bool mirrorX =
-      ( keyAxis()->orientation() == Qt::Horizontal ? keyAxis() : valueAxis() )->rangeReversed();
-  bool mirrorY =
-      ( valueAxis()->orientation() == Qt::Vertical ? valueAxis() : keyAxis() )->rangeReversed();
+  bool mirrorX = ( keyAxis()->orientation() == Qt::Horizontal ? keyAxis() : valueAxis() )->rangeReversed();
+  bool mirrorY = ( valueAxis()->orientation() == Qt::Vertical ? valueAxis() : keyAxis() )->rangeReversed();
   bool smoothBackup = painter->renderHints().testFlag( QPainter::SmoothPixmapTransform );
   painter->setRenderHint( QPainter::SmoothPixmapTransform, mInterpolate );
   QRegion clipBackup;
   if( mTightBoundary )
   {
     clipBackup = painter->clipRegion();
-    painter->setClipRect(
-        QRectF( coordsToPixels( mMapData->keyRange().lower, mMapData->valueRange().lower ),
-                coordsToPixels( mMapData->keyRange().upper, mMapData->valueRange().upper ) )
-            .normalized(),
-        Qt::IntersectClip );
+    painter->setClipRect( QRectF( coordsToPixels( mMapData->keyRange().lower, mMapData->valueRange().lower ),
+                                  coordsToPixels( mMapData->keyRange().upper, mMapData->valueRange().upper ) )
+                              .normalized(),
+                          Qt::IntersectClip );
   }
   painter->drawImage( imageRect, mMapImage.mirrored( mirrorX, mirrorY ) );
   if( mTightBoundary )
@@ -22973,8 +22363,7 @@ void QCPColorMap::drawLegendIcon( QCPPainter* painter, const QRectF& rect ) cons
   // draw map thumbnail:
   if( !mLegendIcon.isNull() )
   {
-    QPixmap scaledIcon =
-        mLegendIcon.scaled( rect.size().toSize(), Qt::KeepAspectRatio, Qt::FastTransformation );
+    QPixmap scaledIcon = mLegendIcon.scaled( rect.size().toSize(), Qt::KeepAspectRatio, Qt::FastTransformation );
     QRectF iconRect = QRectF( 0, 0, scaledIcon.width(), scaledIcon.height() );
     iconRect.moveCenter( rect.center() );
     painter->drawPixmap( iconRect.topLeft(), scaledIcon );
@@ -23053,9 +22442,7 @@ QCPRange QCPColorMap::getValueRange( bool& foundRange, SignDomain inSignDomain )
   The constructed item can be added to the plot with QCustomPlot::addItem.
 */
 QCPItemStraightLine::QCPItemStraightLine( QCustomPlot* parentPlot )
-    : QCPAbstractItem( parentPlot )
-    , point1( createPosition( "point1" ) )
-    , point2( createPosition( "point2" ) )
+    : QCPAbstractItem( parentPlot ), point1( createPosition( "point1" ) ), point2( createPosition( "point2" ) )
 {
   point1->setCoords( 0, 0 );
   point2->setCoords( 1, 1 );
@@ -23087,17 +22474,13 @@ void QCPItemStraightLine::setSelectedPen( const QPen& pen )
 }
 
 /* inherits documentation from base class */
-double QCPItemStraightLine::selectTest( const QPointF& pos,
-                                        bool onlySelectable,
-                                        QVariant* details ) const
+double QCPItemStraightLine::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
   if( onlySelectable && !mSelectable )
     return -1;
 
-  return distToStraightLine( QVector2D( point1->pixelPoint() ),
-                             QVector2D( point2->pixelPoint() - point1->pixelPoint() ),
-                             QVector2D( pos ) );
+  return distToStraightLine( QVector2D( point1->pixelPoint() ), QVector2D( point2->pixelPoint() - point1->pixelPoint() ), QVector2D( pos ) );
 }
 
 /* inherits documentation from base class */
@@ -23107,8 +22490,7 @@ void QCPItemStraightLine::draw( QCPPainter* painter )
   QVector2D end( point2->pixelPoint() );
   // get visible segment of straight line inside clipRect:
   double clipPad = mainPen().widthF();
-  QLineF line = getRectClippedStraightLine(
-      start, end - start, clipRect().adjusted( -clipPad, -clipPad, clipPad, clipPad ) );
+  QLineF line = getRectClippedStraightLine( start, end - start, clipRect().adjusted( -clipPad, -clipPad, clipPad, clipPad ) );
   // paint visible segment, if existent:
   if( !line.isNull() )
   {
@@ -23125,12 +22507,9 @@ void QCPItemStraightLine::draw( QCPPainter* painter )
 
   This is a helper function for \ref selectTest.
 */
-double QCPItemStraightLine::distToStraightLine( const QVector2D& base,
-                                                const QVector2D& vec,
-                                                const QVector2D& point ) const
+double QCPItemStraightLine::distToStraightLine( const QVector2D& base, const QVector2D& vec, const QVector2D& point ) const
 {
-  return qAbs( ( base.y() - point.y() ) * vec.x() - ( base.x() - point.x() ) * vec.y() ) /
-         vec.length();
+  return qAbs( ( base.y() - point.y() ) * vec.x() - ( base.x() - point.x() ) * vec.y() ) / vec.length();
 }
 
 /*! \internal
@@ -23141,9 +22520,7 @@ double QCPItemStraightLine::distToStraightLine( const QVector2D& base,
 
   This is a helper function for \ref draw.
 */
-QLineF QCPItemStraightLine::getRectClippedStraightLine( const QVector2D& base,
-                                                        const QVector2D& vec,
-                                                        const QRect& rect ) const
+QLineF QCPItemStraightLine::getRectClippedStraightLine( const QVector2D& base, const QVector2D& vec, const QRect& rect ) const
 {
   double bx, by;
   double gamma;
@@ -23264,9 +22641,7 @@ QPen QCPItemStraightLine::mainPen() const
   The constructed item can be added to the plot with QCustomPlot::addItem.
 */
 QCPItemLine::QCPItemLine( QCustomPlot* parentPlot )
-    : QCPAbstractItem( parentPlot )
-    , start( createPosition( "start" ) )
-    , end( createPosition( "end" ) )
+    : QCPAbstractItem( parentPlot ), start( createPosition( "start" ) ), end( createPosition( "end" ) )
 {
   start->setCoords( 0, 0 );
   end->setCoords( 1, 1 );
@@ -23349,8 +22724,7 @@ void QCPItemLine::draw( QCPPainter* painter )
   // get visible segment of straight line inside clipRect:
   double clipPad = qMax( mHead.boundingDistance(), mTail.boundingDistance() );
   clipPad = qMax( clipPad, (double)mainPen().widthF() );
-  QLineF line = getRectClippedLine( startVec, endVec,
-                                    clipRect().adjusted( -clipPad, -clipPad, clipPad, clipPad ) );
+  QLineF line = getRectClippedLine( startVec, endVec, clipRect().adjusted( -clipPad, -clipPad, clipPad, clipPad ) );
   // paint visible segment, if existent:
   if( !line.isNull() )
   {
@@ -23372,9 +22746,7 @@ void QCPItemLine::draw( QCPPainter* painter )
 
   This is a helper function for \ref draw.
 */
-QLineF QCPItemLine::getRectClippedLine( const QVector2D& start,
-                                        const QVector2D& end,
-                                        const QRect& rect ) const
+QLineF QCPItemLine::getRectClippedLine( const QVector2D& start, const QVector2D& end, const QRect& rect ) const
 {
   bool containsStart = rect.contains( start.x(), start.y() );
   bool containsEnd = rect.contains( end.x(), end.y() );
@@ -23623,8 +22995,7 @@ void QCPItemCurve::draw( QCPPainter* painter )
   cubicPath.cubicTo( startDirVec, endDirVec, endVec );
 
   // paint visible segment, if existent:
-  QRect clip = clipRect().adjusted( -mainPen().widthF(), -mainPen().widthF(), mainPen().widthF(),
-                                    mainPen().widthF() );
+  QRect clip = clipRect().adjusted( -mainPen().widthF(), -mainPen().widthF(), mainPen().widthF(), mainPen().widthF() );
   QRect cubicRect = cubicPath.controlPointRect().toRect();
   if( cubicRect.isEmpty() )  // may happen when start and end exactly on same x or
                              // y position
@@ -23635,8 +23006,7 @@ void QCPItemCurve::draw( QCPPainter* painter )
     painter->drawPath( cubicPath );
     painter->setBrush( Qt::SolidPattern );
     if( mTail.style() != QCPLineEnding::esNone )
-      mTail.draw( painter, QVector2D( startVec ),
-                  M_PI - cubicPath.angleAtPercent( 0 ) / 180.0 * M_PI );
+      mTail.draw( painter, QVector2D( startVec ), M_PI - cubicPath.angleAtPercent( 0 ) / 180.0 * M_PI );
     if( mHead.style() != QCPLineEnding::esNone )
       mHead.draw( painter, QVector2D( endVec ), -cubicPath.angleAtPercent( 1 ) / 180.0 * M_PI );
   }
@@ -24036,8 +23406,7 @@ double QCPItemText::selectTest( const QPointF& pos, bool onlySelectable, QVarian
   QPointF rotatedPos = inputTransform.map( pos );
   QFontMetrics fontMetrics( mFont );
   QRect textRect = fontMetrics.boundingRect( 0, 0, 0, 0, Qt::TextDontClip | mTextAlignment, mText );
-  QRect textBoxRect =
-      textRect.adjusted( -mPadding.left(), -mPadding.top(), mPadding.right(), mPadding.bottom() );
+  QRect textBoxRect = textRect.adjusted( -mPadding.left(), -mPadding.top(), mPadding.right(), mPadding.bottom() );
   QPointF textPos = getTextDrawPoint( positionPixels, textBoxRect, mPositionAlignment );
   textBoxRect.moveTopLeft( textPos.toPoint() );
 
@@ -24053,13 +23422,10 @@ void QCPItemText::draw( QCPPainter* painter )
   if( !qFuzzyIsNull( mRotation ) )
     transform.rotate( mRotation );
   painter->setFont( mainFont() );
-  QRect textRect =
-      painter->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::TextDontClip | mTextAlignment, mText );
-  QRect textBoxRect =
-      textRect.adjusted( -mPadding.left(), -mPadding.top(), mPadding.right(), mPadding.bottom() );
-  QPointF textPos =
-      getTextDrawPoint( QPointF( 0, 0 ), textBoxRect,
-                        mPositionAlignment );  // 0, 0 because the transform does the translation
+  QRect textRect = painter->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::TextDontClip | mTextAlignment, mText );
+  QRect textBoxRect = textRect.adjusted( -mPadding.left(), -mPadding.top(), mPadding.right(), mPadding.bottom() );
+  QPointF textPos = getTextDrawPoint( QPointF( 0, 0 ), textBoxRect,
+                                      mPositionAlignment );  // 0, 0 because the transform does the translation
   textRect.moveTopLeft( textPos.toPoint() + QPoint( mPadding.left(), mPadding.top() ) );
   textBoxRect.moveTopLeft( textPos.toPoint() );
   double clipPad = mainPen().widthF();
@@ -24091,11 +23457,9 @@ QPointF QCPItemText::anchorPixelPoint( int anchorId ) const
     transform.rotate( mRotation );
   QFontMetrics fontMetrics( mainFont() );
   QRect textRect = fontMetrics.boundingRect( 0, 0, 0, 0, Qt::TextDontClip | mTextAlignment, mText );
-  QRectF textBoxRect =
-      textRect.adjusted( -mPadding.left(), -mPadding.top(), mPadding.right(), mPadding.bottom() );
-  QPointF textPos =
-      getTextDrawPoint( QPointF( 0, 0 ), textBoxRect,
-                        mPositionAlignment );  // 0, 0 because the transform does the translation
+  QRectF textBoxRect = textRect.adjusted( -mPadding.left(), -mPadding.top(), mPadding.right(), mPadding.bottom() );
+  QPointF textPos = getTextDrawPoint( QPointF( 0, 0 ), textBoxRect,
+                                      mPositionAlignment );  // 0, 0 because the transform does the translation
   textBoxRect.moveTopLeft( textPos.toPoint() );
   QPolygonF rectPoly = transform.map( QPolygonF( textBoxRect ) );
 
@@ -24138,9 +23502,7 @@ QPointF QCPItemText::anchorPixelPoint( int anchorId ) const
   drawn at that point, the lower left corner of the resulting text rect is at \a
   pos.
 */
-QPointF QCPItemText::getTextDrawPoint( const QPointF& pos,
-                                       const QRectF& rect,
-                                       Qt::Alignment positionAlignment ) const
+QPointF QCPItemText::getTextDrawPoint( const QPointF& pos, const QRectF& rect, Qt::Alignment positionAlignment ) const
 {
   if( positionAlignment == 0 || positionAlignment == ( Qt::AlignLeft | Qt::AlignTop ) )
     return pos;
@@ -24290,9 +23652,7 @@ void QCPItemEllipse::setSelectedBrush( const QBrush& brush )
 }
 
 /* inherits documentation from base class */
-double QCPItemEllipse::selectTest( const QPointF& pos,
-                                   bool onlySelectable,
-                                   QVariant* details ) const
+double QCPItemEllipse::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
   if( onlySelectable && !mSelectable )
@@ -24311,8 +23671,7 @@ double QCPItemEllipse::selectTest( const QPointF& pos,
   double c = 1.0 / qSqrt( x * x / ( a * a ) + y * y / ( b * b ) );
   result = qAbs( c - 1 ) * qSqrt( x * x + y * y );
   // filled ellipse, allow click inside to count as hit:
-  if( result > mParentPlot->selectionTolerance() * 0.99 && mBrush.style() != Qt::NoBrush &&
-      mBrush.color().alpha() != 0 )
+  if( result > mParentPlot->selectionTolerance() * 0.99 && mBrush.style() != Qt::NoBrush && mBrush.color().alpha() != 0 )
   {
     if( x * x / ( a * a ) + y * y / ( b * b ) <= 1 )
       result = mParentPlot->selectionTolerance() * 0.99;
@@ -24328,10 +23687,8 @@ void QCPItemEllipse::draw( QCPPainter* painter )
   if( p1.toPoint() == p2.toPoint() )
     return;
   QRectF ellipseRect = QRectF( p1, p2 ).normalized();
-  QRect clip = clipRect().adjusted( -mainPen().widthF(), -mainPen().widthF(), mainPen().widthF(),
-                                    mainPen().widthF() );
-  if( ellipseRect.intersects(
-          clip ) )  // only draw if bounding rect of ellipse is visible in cliprect
+  QRect clip = clipRect().adjusted( -mainPen().widthF(), -mainPen().widthF(), mainPen().widthF(), mainPen().widthF() );
+  if( ellipseRect.intersects( clip ) )  // only draw if bounding rect of ellipse is visible in cliprect
   {
     painter->setPen( mainPen() );
     painter->setBrush( mainBrush() );
@@ -24590,11 +23947,9 @@ void QCPItemPixmap::updateScaledPixmap( QRect finalRect, bool flipHorz, bool fli
       finalRect = getFinalRect( &flipHorz, &flipVert );
     if( finalRect.size() != mScaledPixmap.size() )
     {
-      mScaledPixmap =
-          mPixmap.scaled( finalRect.size(), mAspectRatioMode, Qt::SmoothTransformation );
+      mScaledPixmap = mPixmap.scaled( finalRect.size(), mAspectRatioMode, Qt::SmoothTransformation );
       if( flipHorz || flipVert )
-        mScaledPixmap =
-            QPixmap::fromImage( mScaledPixmap.toImage().mirrored( flipHorz, flipVert ) );
+        mScaledPixmap = QPixmap::fromImage( mScaledPixmap.toImage().mirrored( flipHorz, flipVert ) );
     }
   }
   else if( !mScaledPixmap.isNull() )
@@ -24727,8 +24082,7 @@ QPen QCPItemPixmap::mainPen() const
 
   The constructed item can be added to the plot with QCustomPlot::addItem.
 */
-QCPItemTracer::QCPItemTracer( QCustomPlot* parentPlot )
-    : QCPAbstractItem( parentPlot ), position( createPosition( "position" ) ), mGraph( 0 )
+QCPItemTracer::QCPItemTracer( QCustomPlot* parentPlot ) : QCPAbstractItem( parentPlot ), position( createPosition( "position" ) ), mGraph( 0 )
 {
   position->setCoords( 0, 0 );
 
@@ -24895,19 +24249,15 @@ double QCPItemTracer::selectTest( const QPointF& pos, bool onlySelectable, QVari
     return -1;
   case tsPlus:
   {
-    if( clipRect().intersects(
-            QRectF( center - QPointF( w, w ), center + QPointF( w, w ) ).toRect() ) )
-      return qSqrt(
-          qMin( distSqrToLine( center + QPointF( -w, 0 ), center + QPointF( w, 0 ), pos ),
-                distSqrToLine( center + QPointF( 0, -w ), center + QPointF( 0, w ), pos ) ) );
+    if( clipRect().intersects( QRectF( center - QPointF( w, w ), center + QPointF( w, w ) ).toRect() ) )
+      return qSqrt( qMin( distSqrToLine( center + QPointF( -w, 0 ), center + QPointF( w, 0 ), pos ),
+                          distSqrToLine( center + QPointF( 0, -w ), center + QPointF( 0, w ), pos ) ) );
     break;
   }
   case tsCrosshair:
   {
-    return qSqrt( qMin( distSqrToLine( QPointF( clip.left(), center.y() ),
-                                       QPointF( clip.right(), center.y() ), pos ),
-                        distSqrToLine( QPointF( center.x(), clip.top() ),
-                                       QPointF( center.x(), clip.bottom() ), pos ) ) );
+    return qSqrt( qMin( distSqrToLine( QPointF( clip.left(), center.y() ), QPointF( clip.right(), center.y() ), pos ),
+                        distSqrToLine( QPointF( center.x(), clip.top() ), QPointF( center.x(), clip.bottom() ), pos ) ) );
   }
   case tsCircle:
   {
@@ -24918,8 +24268,7 @@ double QCPItemTracer::selectTest( const QPointF& pos, bool onlySelectable, QVari
       double circleLine = w;
       double result = qAbs( centerDist - circleLine );
       // filled ellipse, allow click inside to count as hit:
-      if( result > mParentPlot->selectionTolerance() * 0.99 && mBrush.style() != Qt::NoBrush &&
-          mBrush.color().alpha() != 0 )
+      if( result > mParentPlot->selectionTolerance() * 0.99 && mBrush.style() != Qt::NoBrush && mBrush.color().alpha() != 0 )
       {
         if( centerDist <= circleLine )
           result = mParentPlot->selectionTolerance() * 0.99;
@@ -25034,8 +24383,7 @@ void QCPItemTracer::updatePosition()
               double slope = 0;
               if( !qFuzzyCompare( (double)it.key(), (double)prevIt.key() ) )
                 slope = ( it.value().value - prevIt.value().value ) / ( it.key() - prevIt.key() );
-              position->setCoords( mGraphKey,
-                                   ( mGraphKey - prevIt.key() ) * slope + prevIt.value().value );
+              position->setCoords( mGraphKey, ( mGraphKey - prevIt.key() ) * slope + prevIt.value().value );
             }
             else
             {
@@ -25191,9 +24539,7 @@ void QCPItemBracket::setStyle( QCPItemBracket::BracketStyle style )
 }
 
 /* inherits documentation from base class */
-double QCPItemBracket::selectTest( const QPointF& pos,
-                                   bool onlySelectable,
-                                   QVariant* details ) const
+double QCPItemBracket::selectTest( const QPointF& pos, bool onlySelectable, QVariant* details ) const
 {
   Q_UNUSED( details )
   if( onlySelectable && !mSelectable )
@@ -25209,8 +24555,7 @@ double QCPItemBracket::selectTest( const QPointF& pos,
   lengthVec = lengthVec.normalized() * mLength;
   QVector2D centerVec = ( rightVec + leftVec ) * 0.5f - lengthVec;
 
-  return qSqrt( distSqrToLine( ( centerVec - widthVec ).toPointF(),
-                               ( centerVec + widthVec ).toPointF(), pos ) );
+  return qSqrt( distSqrToLine( ( centerVec - widthVec ).toPointF(), ( centerVec + widthVec ).toPointF(), pos ) );
 }
 
 /* inherits documentation from base class */
@@ -25227,10 +24572,8 @@ void QCPItemBracket::draw( QCPPainter* painter )
   QVector2D centerVec = ( rightVec + leftVec ) * 0.5f - lengthVec;
 
   QPolygon boundingPoly;
-  boundingPoly << leftVec.toPoint() << rightVec.toPoint() << ( rightVec - lengthVec ).toPoint()
-               << ( leftVec - lengthVec ).toPoint();
-  QRect clip = clipRect().adjusted( -mainPen().widthF(), -mainPen().widthF(), mainPen().widthF(),
-                                    mainPen().widthF() );
+  boundingPoly << leftVec.toPoint() << rightVec.toPoint() << ( rightVec - lengthVec ).toPoint() << ( leftVec - lengthVec ).toPoint();
+  QRect clip = clipRect().adjusted( -mainPen().widthF(), -mainPen().widthF(), mainPen().widthF(), mainPen().widthF() );
   if( clip.intersects( boundingPoly.boundingRect() ) )
   {
     painter->setPen( mainPen() );
@@ -25239,10 +24582,8 @@ void QCPItemBracket::draw( QCPPainter* painter )
     case bsSquare:
     {
       painter->drawLine( ( centerVec + widthVec ).toPointF(), ( centerVec - widthVec ).toPointF() );
-      painter->drawLine( ( centerVec + widthVec ).toPointF(),
-                         ( centerVec + widthVec + lengthVec ).toPointF() );
-      painter->drawLine( ( centerVec - widthVec ).toPointF(),
-                         ( centerVec - widthVec + lengthVec ).toPointF() );
+      painter->drawLine( ( centerVec + widthVec ).toPointF(), ( centerVec + widthVec + lengthVec ).toPointF() );
+      painter->drawLine( ( centerVec - widthVec ).toPointF(), ( centerVec - widthVec + lengthVec ).toPointF() );
       break;
     }
     case bsRound:
@@ -25250,10 +24591,8 @@ void QCPItemBracket::draw( QCPPainter* painter )
       painter->setBrush( Qt::NoBrush );
       QPainterPath path;
       path.moveTo( ( centerVec + widthVec + lengthVec ).toPointF() );
-      path.cubicTo( ( centerVec + widthVec ).toPointF(), ( centerVec + widthVec ).toPointF(),
-                    centerVec.toPointF() );
-      path.cubicTo( ( centerVec - widthVec ).toPointF(), ( centerVec - widthVec ).toPointF(),
-                    ( centerVec - widthVec + lengthVec ).toPointF() );
+      path.cubicTo( ( centerVec + widthVec ).toPointF(), ( centerVec + widthVec ).toPointF(), centerVec.toPointF() );
+      path.cubicTo( ( centerVec - widthVec ).toPointF(), ( centerVec - widthVec ).toPointF(), ( centerVec - widthVec + lengthVec ).toPointF() );
       painter->drawPath( path );
       break;
     }
@@ -25262,10 +24601,9 @@ void QCPItemBracket::draw( QCPPainter* painter )
       painter->setBrush( Qt::NoBrush );
       QPainterPath path;
       path.moveTo( ( centerVec + widthVec + lengthVec ).toPointF() );
-      path.cubicTo( ( centerVec + widthVec - lengthVec * 0.8f ).toPointF(),
-                    ( centerVec + 0.4f * widthVec + lengthVec ).toPointF(), centerVec.toPointF() );
-      path.cubicTo( ( centerVec - 0.4f * widthVec + lengthVec ).toPointF(),
-                    ( centerVec - widthVec - lengthVec * 0.8f ).toPointF(),
+      path.cubicTo( ( centerVec + widthVec - lengthVec * 0.8f ).toPointF(), ( centerVec + 0.4f * widthVec + lengthVec ).toPointF(),
+                    centerVec.toPointF() );
+      path.cubicTo( ( centerVec - 0.4f * widthVec + lengthVec ).toPointF(), ( centerVec - widthVec - lengthVec * 0.8f ).toPointF(),
                     ( centerVec - widthVec + lengthVec ).toPointF() );
       painter->drawPath( path );
       break;
@@ -25277,18 +24615,14 @@ void QCPItemBracket::draw( QCPPainter* painter )
       QPainterPath path;
       path.moveTo( ( centerVec + widthVec + lengthVec ).toPointF() );
 
-      path.cubicTo( ( centerVec + widthVec - lengthVec * 0.8f ).toPointF(),
-                    ( centerVec + 0.4f * widthVec + 0.8f * lengthVec ).toPointF(),
+      path.cubicTo( ( centerVec + widthVec - lengthVec * 0.8f ).toPointF(), ( centerVec + 0.4f * widthVec + 0.8f * lengthVec ).toPointF(),
                     centerVec.toPointF() );
-      path.cubicTo( ( centerVec - 0.4f * widthVec + 0.8f * lengthVec ).toPointF(),
-                    ( centerVec - widthVec - lengthVec * 0.8f ).toPointF(),
+      path.cubicTo( ( centerVec - 0.4f * widthVec + 0.8f * lengthVec ).toPointF(), ( centerVec - widthVec - lengthVec * 0.8f ).toPointF(),
                     ( centerVec - widthVec + lengthVec ).toPointF() );
 
-      path.cubicTo( ( centerVec - widthVec - lengthVec * 0.5f ).toPointF(),
-                    ( centerVec - 0.2f * widthVec + 1.2f * lengthVec ).toPointF(),
+      path.cubicTo( ( centerVec - widthVec - lengthVec * 0.5f ).toPointF(), ( centerVec - 0.2f * widthVec + 1.2f * lengthVec ).toPointF(),
                     ( centerVec + lengthVec * 0.2f ).toPointF() );
-      path.cubicTo( ( centerVec + 0.2f * widthVec + 1.2f * lengthVec ).toPointF(),
-                    ( centerVec + widthVec - lengthVec * 0.5f ).toPointF(),
+      path.cubicTo( ( centerVec + 0.2f * widthVec + 1.2f * lengthVec ).toPointF(), ( centerVec + widthVec - lengthVec * 0.5f ).toPointF(),
                     ( centerVec + widthVec + lengthVec ).toPointF() );
 
       painter->drawPath( path );
diff --git a/app/external/qcustomplot.h b/app/external/qcustomplot.h
index ad89ffd..816426d 100644
--- a/app/external/qcustomplot.h
+++ b/app/external/qcustomplot.h
@@ -380,10 +380,7 @@ public:
   QCPScatterStyle( ScatterShape shape, const QColor& color, const QColor& fill, double size );
   QCPScatterStyle( ScatterShape shape, const QPen& pen, const QBrush& brush, double size );
   QCPScatterStyle( const QPixmap& pixmap );
-  QCPScatterStyle( const QPainterPath& customPath,
-                   const QPen& pen,
-                   const QBrush& brush = Qt::NoBrush,
-                   double size = 6 );
+  QCPScatterStyle( const QPainterPath& customPath, const QPen& pen, const QBrush& brush = Qt::NoBrush, double size = 6 );
 
   // getters:
   double size() const { return mSize; }
@@ -578,19 +575,14 @@ protected:
   virtual void applyDefaultAntialiasingHint( QCPPainter* painter ) const = 0;
   virtual void draw( QCPPainter* painter ) = 0;
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
   // non-property methods:
   void initializeParentPlot( QCustomPlot* parentPlot );
   void setParentLayerable( QCPLayerable* parentLayerable );
   bool moveToLayer( QCPLayer* layer, bool prepend );
-  void applyAntialiasingHint( QCPPainter* painter,
-                              bool localAntialiased,
-                              QCP::AntialiasedElement overrideElement ) const;
+  void applyAntialiasingHint( QCPPainter* painter, bool localAntialiased, QCP::AntialiasedElement overrideElement ) const;
 
 private:
   Q_DISABLE_COPY( QCPLayerable )
@@ -748,10 +740,7 @@ public:
   ~QCPMarginGroup();
 
   // non-virtual methods:
-  QList<QCPLayoutElement*> elements( QCP::MarginSide side ) const
-  {
-    return mChildren.value( side );
-  }
+  QList<QCPLayoutElement*> elements( QCP::MarginSide side ) const { return mChildren.value( side ); }
   bool isEmpty() const;
   void clear();
 
@@ -814,10 +803,7 @@ public:
   QCP::MarginSides autoMargins() const { return mAutoMargins; }
   QSize minimumSize() const { return mMinimumSize; }
   QSize maximumSize() const { return mMaximumSize; }
-  QCPMarginGroup* marginGroup( QCP::MarginSide side ) const
-  {
-    return mMarginGroups.value( side, (QCPMarginGroup*)0 );
-  }
+  QCPMarginGroup* marginGroup( QCP::MarginSide side ) const { return mMarginGroups.value( side, (QCPMarginGroup*)0 ); }
   QHash<QCP::MarginSide, QCPMarginGroup*> marginGroups() const { return mMarginGroups; }
   // setters:
   void setOuterRect( const QRect& rect );
@@ -899,10 +885,7 @@ protected:
   void sizeConstraintsChanged() const;
   void adoptElement( QCPLayoutElement* el );
   void releaseElement( QCPLayoutElement* el );
-  QVector<int> getSectionSizes( QVector<int> maxSizes,
-                                QVector<int> minSizes,
-                                QVector<double> stretchFactors,
-                                int totalSize ) const;
+  QVector<int> getSectionSizes( QVector<int> maxSizes, QVector<int> minSizes, QVector<double> stretchFactors, int totalSize ) const;
 
 private:
   Q_DISABLE_COPY( QCPLayout )
@@ -915,8 +898,7 @@ class QCP_LIB_DECL QCPLayoutGrid : public QCPLayout
   /// \cond INCLUDE_QPROPERTIES
   Q_PROPERTY( int rowCount READ rowCount )
   Q_PROPERTY( int columnCount READ columnCount )
-  Q_PROPERTY(
-      QList<double> columnStretchFactors READ columnStretchFactors WRITE setColumnStretchFactors )
+  Q_PROPERTY( QList<double> columnStretchFactors READ columnStretchFactors WRITE setColumnStretchFactors )
   Q_PROPERTY( QList<double> rowStretchFactors READ rowStretchFactors WRITE setRowStretchFactors )
   Q_PROPERTY( int columnSpacing READ columnSpacing WRITE setColumnSpacing )
   Q_PROPERTY( int rowSpacing READ rowSpacing WRITE setRowSpacing )
@@ -1192,15 +1174,11 @@ class QCP_LIB_DECL QCPAxis : public QCPLayerable
   Q_PROPERTY( int labelPadding READ labelPadding WRITE setLabelPadding )
   Q_PROPERTY( int padding READ padding WRITE setPadding )
   Q_PROPERTY( int offset READ offset WRITE setOffset )
-  Q_PROPERTY( SelectableParts selectedParts READ selectedParts WRITE setSelectedParts NOTIFY
-                  selectionChanged )
-  Q_PROPERTY( SelectableParts selectableParts READ selectableParts WRITE setSelectableParts NOTIFY
-                  selectableChanged )
-  Q_PROPERTY(
-      QFont selectedTickLabelFont READ selectedTickLabelFont WRITE setSelectedTickLabelFont )
+  Q_PROPERTY( SelectableParts selectedParts READ selectedParts WRITE setSelectedParts NOTIFY selectionChanged )
+  Q_PROPERTY( SelectableParts selectableParts READ selectableParts WRITE setSelectableParts NOTIFY selectableChanged )
+  Q_PROPERTY( QFont selectedTickLabelFont READ selectedTickLabelFont WRITE setSelectedTickLabelFont )
   Q_PROPERTY( QFont selectedLabelFont READ selectedLabelFont WRITE setSelectedLabelFont )
-  Q_PROPERTY(
-      QColor selectedTickLabelColor READ selectedTickLabelColor WRITE setSelectedTickLabelColor )
+  Q_PROPERTY( QColor selectedTickLabelColor READ selectedTickLabelColor WRITE setSelectedTickLabelColor )
   Q_PROPERTY( QColor selectedLabelColor READ selectedLabelColor WRITE setSelectedLabelColor )
   Q_PROPERTY( QPen selectedBasePen READ selectedBasePen WRITE setSelectedBasePen )
   Q_PROPERTY( QPen selectedTickPen READ selectedTickPen WRITE setSelectedTickPen )
@@ -1409,10 +1387,7 @@ public:
   QList<QCPAbstractItem*> items() const;
 
   static AxisType marginSideToAxisType( QCP::MarginSide side );
-  static Qt::Orientation orientation( AxisType type )
-  {
-    return type == atBottom || type == atTop ? Qt::Horizontal : Qt::Vertical;
-  }
+  static Qt::Orientation orientation( AxisType type ) { return type == atBottom || type == atTop ? Qt::Horizontal : Qt::Vertical; }
   static AxisType opposite( AxisType type );
 
 signals:
@@ -1488,10 +1463,7 @@ protected:
   virtual void draw( QCPPainter* painter );
   virtual QCP::Interaction selectionCategory() const;
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
   // non-virtual methods:
@@ -1576,20 +1548,11 @@ protected:
 
   virtual QByteArray generateLabelParameterHash() const;
 
-  virtual void placeTickLabel( QCPPainter* painter,
-                               double position,
-                               int distanceToAxis,
-                               const QString& text,
-                               QSize* tickLabelsSize );
-  virtual void drawTickLabel( QCPPainter* painter,
-                              double x,
-                              double y,
-                              const TickLabelData& labelData ) const;
+  virtual void placeTickLabel( QCPPainter* painter, double position, int distanceToAxis, const QString& text, QSize* tickLabelsSize );
+  virtual void drawTickLabel( QCPPainter* painter, double x, double y, const TickLabelData& labelData ) const;
   virtual TickLabelData getTickLabelData( const QFont& font, const QString& text ) const;
   virtual QPointF getTickLabelDrawOffset( const TickLabelData& labelData ) const;
-  virtual void getMaxTickLabelSize( const QFont& font,
-                                    const QString& text,
-                                    QSize* tickLabelsSize ) const;
+  virtual void getMaxTickLabelSize( const QFont& font, const QString& text, QSize* tickLabelsSize ) const;
 };
 
 class QCP_LIB_DECL QCPAbstractPlottable : public QCPLayerable
@@ -1641,9 +1604,7 @@ public:
 
   // introduced virtual methods:
   virtual void clearData() = 0;
-  virtual double selectTest( const QPointF& pos,
-                             bool onlySelectable,
-                             QVariant* details = 0 ) const = 0;
+  virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const = 0;
   virtual bool addToLegend();
   virtual bool removeFromLegend() const;
 
@@ -1684,10 +1645,7 @@ protected:
   virtual QCP::Interaction selectionCategory() const;
   void applyDefaultAntialiasingHint( QCPPainter* painter ) const;
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
   // introduced virtual methods:
@@ -1718,10 +1676,7 @@ private:
 class QCP_LIB_DECL QCPItemAnchor
 {
 public:
-  QCPItemAnchor( QCustomPlot* parentPlot,
-                 QCPAbstractItem* parentItem,
-                 const QString name,
-                 int anchorId = -1 );
+  QCPItemAnchor( QCustomPlot* parentPlot, QCPAbstractItem* parentItem, const QString name, int anchorId = -1 );
   virtual ~QCPItemAnchor();
 
   // getters:
@@ -1851,9 +1806,7 @@ public:
   Q_SLOT void setSelected( bool selected );
 
   // reimplemented virtual methods:
-  virtual double selectTest( const QPointF& pos,
-                             bool onlySelectable,
-                             QVariant* details = 0 ) const = 0;
+  virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const = 0;
 
   // non-virtual methods:
   QList<QCPItemPosition*> positions() const { return mPositions; }
@@ -1880,10 +1833,7 @@ protected:
   virtual void applyDefaultAntialiasingHint( QCPPainter* painter ) const;
   virtual void draw( QCPPainter* painter ) = 0;
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
   // introduced virtual methods:
@@ -1909,15 +1859,12 @@ class QCP_LIB_DECL QCustomPlot : public QWidget
   Q_PROPERTY( QRect viewport READ viewport WRITE setViewport )
   Q_PROPERTY( QPixmap background READ background WRITE setBackground )
   Q_PROPERTY( bool backgroundScaled READ backgroundScaled WRITE setBackgroundScaled )
-  Q_PROPERTY( Qt::AspectRatioMode backgroundScaledMode READ backgroundScaledMode WRITE
-                  setBackgroundScaledMode )
+  Q_PROPERTY( Qt::AspectRatioMode backgroundScaledMode READ backgroundScaledMode WRITE setBackgroundScaledMode )
   Q_PROPERTY( QCPLayoutGrid* plotLayout READ plotLayout )
-  Q_PROPERTY( bool autoAddPlottableToLegend READ autoAddPlottableToLegend WRITE
-                  setAutoAddPlottableToLegend )
+  Q_PROPERTY( bool autoAddPlottableToLegend READ autoAddPlottableToLegend WRITE setAutoAddPlottableToLegend )
   Q_PROPERTY( int selectionTolerance READ selectionTolerance WRITE setSelectionTolerance )
   Q_PROPERTY( bool noAntialiasingOnDrag READ noAntialiasingOnDrag WRITE setNoAntialiasingOnDrag )
-  Q_PROPERTY( Qt::KeyboardModifier multiSelectModifier READ multiSelectModifier WRITE
-                  setMultiSelectModifier )
+  Q_PROPERTY( Qt::KeyboardModifier multiSelectModifier READ multiSelectModifier WRITE setMultiSelectModifier )
   /// \endcond
 public:
   /*!
@@ -1973,17 +1920,14 @@ public:
   // setters:
   void setViewport( const QRect& rect );
   void setBackground( const QPixmap& pm );
-  void setBackground( const QPixmap& pm,
-                      bool scaled,
-                      Qt::AspectRatioMode mode = Qt::KeepAspectRatioByExpanding );
+  void setBackground( const QPixmap& pm, bool scaled, Qt::AspectRatioMode mode = Qt::KeepAspectRatioByExpanding );
   void setBackground( const QBrush& brush );
   void setBackgroundScaled( bool scaled );
   void setBackgroundScaledMode( Qt::AspectRatioMode mode );
   void setAntialiasedElements( const QCP::AntialiasedElements& antialiasedElements );
   void setAntialiasedElement( QCP::AntialiasedElement antialiasedElement, bool enabled = true );
   void setNotAntialiasedElements( const QCP::AntialiasedElements& notAntialiasedElements );
-  void setNotAntialiasedElement( QCP::AntialiasedElement notAntialiasedElement,
-                                 bool enabled = true );
+  void setNotAntialiasedElement( QCP::AntialiasedElement notAntialiasedElement, bool enabled = true );
   void setAutoAddPlottableToLegend( bool on );
   void setInteractions( const QCP::Interactions& interactions );
   void setInteraction( const QCP::Interaction& interaction, bool enabled = true );
@@ -2035,9 +1979,7 @@ public:
   bool setCurrentLayer( const QString& name );
   bool setCurrentLayer( QCPLayer* layer );
   int layerCount() const;
-  bool addLayer( const QString& name,
-                 QCPLayer* otherLayer = 0,
-                 LayerInsertMode insertMode = limAbove );
+  bool addLayer( const QString& name, QCPLayer* otherLayer = 0, LayerInsertMode insertMode = limAbove );
   bool removeLayer( QCPLayer* layer );
   bool moveLayer( QCPLayer* layer, QCPLayer* otherLayer, LayerInsertMode insertMode = limAbove );
 
@@ -2058,23 +2000,10 @@ public:
                 int height = 0,
                 const QString& pdfCreator = "",
                 const QString& pdfTitle = "" );
-  bool savePng( const QString& fileName,
-                int width = 0,
-                int height = 0,
-                double scale = 1.0,
-                int quality = -1 );
-  bool saveJpg( const QString& fileName,
-                int width = 0,
-                int height = 0,
-                double scale = 1.0,
-                int quality = -1 );
+  bool savePng( const QString& fileName, int width = 0, int height = 0, double scale = 1.0, int quality = -1 );
+  bool saveJpg( const QString& fileName, int width = 0, int height = 0, double scale = 1.0, int quality = -1 );
   bool saveBmp( const QString& fileName, int width = 0, int height = 0, double scale = 1.0 );
-  bool saveRastered( const QString& fileName,
-                     int width,
-                     int height,
-                     double scale,
-                     const char* format,
-                     int quality = -1 );
+  bool saveRastered( const QString& fileName, int width, int height, double scale, const char* format, int quality = -1 );
   QPixmap toPixmap( int width = 0, int height = 0, double scale = 1.0 );
   void toPainter( QCPPainter* painter, int width = 0, int height = 0 );
   Q_SLOT void replot( QCustomPlot::RefreshPriority refreshPriority = QCustomPlot::rpHint );
@@ -2151,9 +2080,7 @@ protected:
 
   // non-virtual methods:
   void updateLayerIndices() const;
-  QCPLayerable* layerableAt( const QPointF& pos,
-                             bool onlySelectable,
-                             QVariant* selectionDetails = 0 ) const;
+  QCPLayerable* layerableAt( const QPointF& pos, bool onlySelectable, QVariant* selectionDetails = 0 ) const;
   void drawBackground( QCPPainter* painter );
 
   friend class QCPLegend;
@@ -2248,12 +2175,7 @@ public:
   void setPeriodic( bool enabled );
 
   // non-property methods:
-  void colorize( const double* data,
-                 const QCPRange& range,
-                 QRgb* scanLine,
-                 int n,
-                 int dataIndexFactor = 1,
-                 bool logarithmic = false );
+  void colorize( const double* data, const QCPRange& range, QRgb* scanLine, int n, int dataIndexFactor = 1, bool logarithmic = false );
   QRgb color( double position, const QCPRange& range, bool logarithmic = false );
   void loadPreset( GradientPreset preset );
   void clearColorStops();
@@ -2279,8 +2201,7 @@ class QCP_LIB_DECL QCPAxisRect : public QCPLayoutElement
   /// \cond INCLUDE_QPROPERTIES
   Q_PROPERTY( QPixmap background READ background WRITE setBackground )
   Q_PROPERTY( bool backgroundScaled READ backgroundScaled WRITE setBackgroundScaled )
-  Q_PROPERTY( Qt::AspectRatioMode backgroundScaledMode READ backgroundScaledMode WRITE
-                  setBackgroundScaledMode )
+  Q_PROPERTY( Qt::AspectRatioMode backgroundScaledMode READ backgroundScaledMode WRITE setBackgroundScaledMode )
   Q_PROPERTY( Qt::Orientations rangeDrag READ rangeDrag WRITE setRangeDrag )
   Q_PROPERTY( Qt::Orientations rangeZoom READ rangeZoom WRITE setRangeZoom )
   /// \endcond
@@ -2300,9 +2221,7 @@ public:
 
   // setters:
   void setBackground( const QPixmap& pm );
-  void setBackground( const QPixmap& pm,
-                      bool scaled,
-                      Qt::AspectRatioMode mode = Qt::KeepAspectRatioByExpanding );
+  void setBackground( const QPixmap& pm, bool scaled, Qt::AspectRatioMode mode = Qt::KeepAspectRatioByExpanding );
   void setBackground( const QBrush& brush );
   void setBackgroundScaled( bool scaled );
   void setBackgroundScaledMode( Qt::AspectRatioMode mode );
@@ -2435,10 +2354,7 @@ protected:
   virtual QRect clipRect() const;
   virtual void draw( QCPPainter* painter ) = 0;
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
 private:
@@ -2481,10 +2397,8 @@ class QCP_LIB_DECL QCPLegend : public QCPLayoutGrid
   Q_PROPERTY( QSize iconSize READ iconSize WRITE setIconSize )
   Q_PROPERTY( int iconTextPadding READ iconTextPadding WRITE setIconTextPadding )
   Q_PROPERTY( QPen iconBorderPen READ iconBorderPen WRITE setIconBorderPen )
-  Q_PROPERTY( SelectableParts selectableParts READ selectableParts WRITE setSelectableParts NOTIFY
-                  selectionChanged )
-  Q_PROPERTY( SelectableParts selectedParts READ selectedParts WRITE setSelectedParts NOTIFY
-                  selectableChanged )
+  Q_PROPERTY( SelectableParts selectableParts READ selectableParts WRITE setSelectableParts NOTIFY selectionChanged )
+  Q_PROPERTY( SelectableParts selectedParts READ selectedParts WRITE setSelectedParts NOTIFY selectableChanged )
   Q_PROPERTY( QPen selectedBorderPen READ selectedBorderPen WRITE setSelectedBorderPen )
   Q_PROPERTY( QPen selectedIconBorderPen READ selectedIconBorderPen WRITE setSelectedIconBorderPen )
   Q_PROPERTY( QBrush selectedBrush READ selectedBrush WRITE setSelectedBrush )
@@ -2583,10 +2497,7 @@ protected:
   virtual void applyDefaultAntialiasingHint( QCPPainter* painter ) const;
   virtual void draw( QCPPainter* painter );
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
   // non-virtual methods:
@@ -2658,10 +2569,7 @@ protected:
   virtual QSize minimumSizeHint() const;
   virtual QSize maximumSizeHint() const;
   // events:
-  virtual void selectEvent( QMouseEvent* event,
-                            bool additive,
-                            const QVariant& details,
-                            bool* selectionStateChanged );
+  virtual void selectEvent( QMouseEvent* event, bool additive, const QVariant& details, bool* selectionStateChanged );
   virtual void deselectEvent( bool* selectionStateChanged );
 
   // non-virtual methods:
@@ -2703,8 +2611,7 @@ class QCP_LIB_DECL QCPColorScale : public QCPLayoutElement
   /// \cond INCLUDE_QPROPERTIES
   Q_PROPERTY( QCPAxis::AxisType type READ type WRITE setType )
   Q_PROPERTY( QCPRange dataRange READ dataRange WRITE setDataRange NOTIFY dataRangeChanged )
-  Q_PROPERTY( QCPAxis::ScaleType dataScaleType READ dataScaleType WRITE setDataScaleType NOTIFY
-                  dataScaleTypeChanged )
+  Q_PROPERTY( QCPAxis::ScaleType dataScaleType READ dataScaleType WRITE setDataScaleType NOTIFY dataScaleTypeChanged )
   Q_PROPERTY( QCPColorGradient gradient READ gradient WRITE setGradient NOTIFY gradientChanged )
   Q_PROPERTY( QString label READ label WRITE setLabel )
   Q_PROPERTY( int barWidth READ barWidth WRITE setBarWidth )
@@ -2872,16 +2779,12 @@ public:
   // setters:
   void setData( QCPDataMap* data, bool copy = false );
   void setData( const QVector<double>& key, const QVector<double>& value );
-  void setDataKeyError( const QVector<double>& key,
-                        const QVector<double>& value,
-                        const QVector<double>& keyError );
+  void setDataKeyError( const QVector<double>& key, const QVector<double>& value, const QVector<double>& keyError );
   void setDataKeyError( const QVector<double>& key,
                         const QVector<double>& value,
                         const QVector<double>& keyErrorMinus,
                         const QVector<double>& keyErrorPlus );
-  void setDataValueError( const QVector<double>& key,
-                          const QVector<double>& value,
-                          const QVector<double>& valueError );
+  void setDataValueError( const QVector<double>& key, const QVector<double>& value, const QVector<double>& valueError );
   void setDataValueError( const QVector<double>& key,
                           const QVector<double>& value,
                           const QVector<double>& valueErrorMinus,
@@ -2945,11 +2848,9 @@ protected:
   virtual void drawLegendIcon( QCPPainter* painter, const QRectF& rect ) const;
   virtual QCPRange getKeyRange( bool& foundRange, SignDomain inSignDomain = sdBoth ) const;
   virtual QCPRange getValueRange( bool& foundRange, SignDomain inSignDomain = sdBoth ) const;
-  virtual QCPRange getKeyRange( bool& foundRange,
-                                SignDomain inSignDomain,
+  virtual QCPRange getKeyRange( bool& foundRange, SignDomain inSignDomain,
                                 bool includeErrors ) const;  // overloads base class interface
-  virtual QCPRange getValueRange( bool& foundRange,
-                                  SignDomain inSignDomain,
+  virtual QCPRange getValueRange( bool& foundRange, SignDomain inSignDomain,
                                   bool includeErrors ) const;  // overloads base class interface
 
   // introduced virtual methods:
@@ -2965,15 +2866,11 @@ protected:
   void getLinePlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const;
   void getStepLeftPlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const;
   void getStepRightPlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const;
-  void getStepCenterPlotData( QVector<QPointF>* linePixelData,
-                              QVector<QCPData>* scatterData ) const;
+  void getStepCenterPlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const;
   void getImpulsePlotData( QVector<QPointF>* linePixelData, QVector<QCPData>* scatterData ) const;
   void drawError( QCPPainter* painter, double x, double y, const QCPData& data ) const;
-  void getVisibleDataBounds( QCPDataMap::const_iterator& lower,
-                             QCPDataMap::const_iterator& upper ) const;
-  int countDataInBounds( const QCPDataMap::const_iterator& lower,
-                         const QCPDataMap::const_iterator& upper,
-                         int maxCount ) const;
+  void getVisibleDataBounds( QCPDataMap::const_iterator& lower, QCPDataMap::const_iterator& upper ) const;
+  int countDataInBounds( const QCPDataMap::const_iterator& lower, const QCPDataMap::const_iterator& upper, int maxCount ) const;
   void addFillBasePoints( QVector<QPointF>* lineData ) const;
   void removeFillBasePoints( QVector<QPointF>* lineData ) const;
   QPointF lowerFillBasePoint( double lowerKey ) const;
@@ -3042,9 +2939,7 @@ public:
   LineStyle lineStyle() const { return mLineStyle; }
   // setters:
   void setData( QCPCurveDataMap* data, bool copy = false );
-  void setData( const QVector<double>& t,
-                const QVector<double>& key,
-                const QVector<double>& value );
+  void setData( const QVector<double>& t, const QVector<double>& key, const QVector<double>& value );
   void setData( const QVector<double>& key, const QVector<double>& value );
   void setScatterStyle( const QCPScatterStyle& style );
   void setLineStyle( LineStyle style );
@@ -3054,9 +2949,7 @@ public:
   void addData( const QCPCurveData& data );
   void addData( double t, double key, double value );
   void addData( double key, double value );
-  void addData( const QVector<double>& ts,
-                const QVector<double>& keys,
-                const QVector<double>& values );
+  void addData( const QVector<double>& ts, const QVector<double>& keys, const QVector<double>& values );
   void removeDataBefore( double t );
   void removeDataAfter( double t );
   void removeData( double fromt, double tot );
@@ -3216,12 +3109,7 @@ public:
   void setUpperQuartile( double value );
   void setMaximum( double value );
   void setOutliers( const QVector<double>& values );
-  void setData( double key,
-                double minimum,
-                double lowerQuartile,
-                double median,
-                double upperQuartile,
-                double maximum );
+  void setData( double key, double minimum, double lowerQuartile, double median, double upperQuartile, double maximum );
   void setWidth( double width );
   void setWhiskerWidth( double width );
   void setWhiskerPen( const QPen& pen );
@@ -3261,10 +3149,7 @@ protected:
 class QCP_LIB_DECL QCPColorMapData
 {
 public:
-  QCPColorMapData( int keySize,
-                   int valueSize,
-                   const QCPRange& keyRange,
-                   const QCPRange& valueRange );
+  QCPColorMapData( int keySize, int valueSize, const QCPRange& keyRange, const QCPRange& valueRange );
   ~QCPColorMapData();
   QCPColorMapData( const QCPColorMapData& other );
   QCPColorMapData& operator=( const QCPColorMapData& other );
@@ -3314,8 +3199,7 @@ class QCP_LIB_DECL QCPColorMap : public QCPAbstractPlottable
   Q_OBJECT
   /// \cond INCLUDE_QPROPERTIES
   Q_PROPERTY( QCPRange dataRange READ dataRange WRITE setDataRange NOTIFY dataRangeChanged )
-  Q_PROPERTY( QCPAxis::ScaleType dataScaleType READ dataScaleType WRITE setDataScaleType NOTIFY
-                  dataScaleTypeChanged )
+  Q_PROPERTY( QCPAxis::ScaleType dataScaleType READ dataScaleType WRITE setDataScaleType NOTIFY dataScaleTypeChanged )
   Q_PROPERTY( QCPColorGradient gradient READ gradient WRITE setGradient NOTIFY gradientChanged )
   Q_PROPERTY( bool interpolate READ interpolate WRITE setInterpolate )
   Q_PROPERTY( bool tightBoundary READ tightBoundary WRITE setTightBoundary )
@@ -3344,8 +3228,7 @@ public:
 
   // non-property methods:
   void rescaleDataRange( bool recalculateDataBounds = false );
-  Q_SLOT void updateLegendIcon( Qt::TransformationMode transformMode = Qt::SmoothTransformation,
-                                const QSize& thumbSize = QSize( 32, 18 ) );
+  Q_SLOT void updateLegendIcon( Qt::TransformationMode transformMode = Qt::SmoothTransformation, const QSize& thumbSize = QSize( 32, 18 ) );
 
   // reimplemented virtual methods:
   virtual void clearData();
@@ -3415,12 +3298,8 @@ protected:
   virtual void draw( QCPPainter* painter );
 
   // non-virtual methods:
-  double distToStraightLine( const QVector2D& point1,
-                             const QVector2D& vec,
-                             const QVector2D& point ) const;
-  QLineF getRectClippedStraightLine( const QVector2D& point1,
-                                     const QVector2D& vec,
-                                     const QRect& rect ) const;
+  double distToStraightLine( const QVector2D& point1, const QVector2D& vec, const QVector2D& point ) const;
+  QLineF getRectClippedStraightLine( const QVector2D& point1, const QVector2D& vec, const QRect& rect ) const;
   QPen mainPen() const;
 };
 
@@ -3463,9 +3342,7 @@ protected:
   virtual void draw( QCPPainter* painter );
 
   // non-virtual methods:
-  QLineF getRectClippedLine( const QVector2D& start,
-                             const QVector2D& end,
-                             const QRect& rect ) const;
+  QLineF getRectClippedLine( const QVector2D& start, const QVector2D& end, const QRect& rect ) const;
   QPen mainPen() const;
 };
 
@@ -3666,9 +3543,7 @@ protected:
   virtual QPointF anchorPixelPoint( int anchorId ) const;
 
   // non-virtual methods:
-  QPointF getTextDrawPoint( const QPointF& pos,
-                            const QRectF& rect,
-                            Qt::Alignment positionAlignment ) const;
+  QPointF getTextDrawPoint( const QPointF& pos, const QRectF& rect, Qt::Alignment positionAlignment ) const;
   QFont mainFont() const;
   QColor mainColor() const;
   QPen mainPen() const;
@@ -3802,9 +3677,7 @@ protected:
   virtual QPointF anchorPixelPoint( int anchorId ) const;
 
   // non-virtual methods:
-  void updateScaledPixmap( QRect finalRect = QRect(),
-                           bool flipHorz = false,
-                           bool flipVert = false );
+  void updateScaledPixmap( QRect finalRect = QRect(), bool flipHorz = false, bool flipVert = false );
   QRect getFinalRect( bool* flippedHorz = 0, bool* flippedVert = 0 ) const;
   QPen mainPen() const;
 };
diff --git a/app/main.cpp b/app/main.cpp
index 95c506c..5ebea89 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -41,112 +41,108 @@
 
 int main( int argc, char* argv[] )
 {
-	qRegisterMetaType<PlaYUVerStreamInfoVector>();
-	qRegisterMetaTypeStreamOperators<PlaYUVerStreamInfoVector>();
-	qRegisterMetaType<PlaYUVerStdResolutionVector>();
-	qRegisterMetaTypeStreamOperators<PlaYUVerStdResolutionVector>();
+  qRegisterMetaType<PlaYUVerStreamInfoVector>();
+  qRegisterMetaTypeStreamOperators<PlaYUVerStreamInfoVector>();
+  qRegisterMetaType<PlaYUVerStdResolutionVector>();
+  qRegisterMetaTypeStreamOperators<PlaYUVerStdResolutionVector>();
 
-	QApplication application( argc, argv );
-	QApplication::setApplicationName( "PlaYUVer" );
-	QApplication::setApplicationVersion( PLAYUVER_VERSION_STRING );
-	QApplication::setOrganizationName( "PixLRA" );
+  QApplication application( argc, argv );
+  QApplication::setApplicationName( "PlaYUVer" );
+  QApplication::setApplicationVersion( PLAYUVER_VERSION_STRING );
+  QApplication::setOrganizationName( "PixLRA" );
 
 #ifdef USE_QTDBUS
-	/**
-	 * use dbus, if available
-	 * allows for resuse of running Kate instances
-	 */
-	if( QDBusConnectionInterface* const sessionBusInterface =
-			QDBusConnection::sessionBus().interface() )
-	{
-		Bool force_new = false;
-		QStringList filenameList;
-		for( Int i = 1; i < argc; i++ )
-		{
-			filenameList.append( QFileInfo( QString( argv[i] ) ).absoluteFilePath() );
-		}
-		if( filenameList.isEmpty() )
-		{
-			force_new = true;
-		}
+  /**
+   * use dbus, if available
+   * allows for resuse of running Kate instances
+   */
+  if( QDBusConnectionInterface* const sessionBusInterface = QDBusConnection::sessionBus().interface() )
+  {
+    Bool force_new = false;
+    QStringList filenameList;
+    for( Int i = 1; i < argc; i++ )
+    {
+      filenameList.append( QFileInfo( QString( argv[i] ) ).absoluteFilePath() );
+    }
+    if( filenameList.isEmpty() )
+    {
+      force_new = true;
+    }
 
-		// check again if service is still running
-		bool foundRunningService = false;
-		if( !force_new )
-		{
-			QDBusReply<bool> there =
-					sessionBusInterface->isServiceRegistered( PLAYUVER_DBUS_SESSION_NAME );
-			foundRunningService = there.isValid() && there.value();
+    // check again if service is still running
+    bool foundRunningService = false;
+    if( !force_new )
+    {
+      QDBusReply<bool> there = sessionBusInterface->isServiceRegistered( PLAYUVER_DBUS_SESSION_NAME );
+      foundRunningService = there.isValid() && there.value();
 
-			if( foundRunningService )
-			{
-				qInfo() << "Found running instance... Re-using";
+      if( foundRunningService )
+      {
+        qInfo() << "Found running instance... Re-using";
 
-				// open given session
-				QDBusMessage m = QDBusMessage::createMethodCall(
-							PLAYUVER_DBUS_SESSION_NAME, QStringLiteral( PLAYUVER_DBUS_PATH ),
-							QStringLiteral( PLAYUVER_DBUS_SESSION_NAME ), QStringLiteral( "activate" ) );
+        // open given session
+        QDBusMessage m = QDBusMessage::createMethodCall( PLAYUVER_DBUS_SESSION_NAME, QStringLiteral( PLAYUVER_DBUS_PATH ),
+                                                         QStringLiteral( PLAYUVER_DBUS_SESSION_NAME ), QStringLiteral( "activate" ) );
 
-				QDBusConnection::sessionBus().call( m );
+        QDBusConnection::sessionBus().call( m );
 
-				// only block, if files to open there....
-				bool needToBlock = false;
+        // only block, if files to open there....
+        bool needToBlock = false;
 
-				QStringList tokens;
+        QStringList tokens;
 
-				// open given files...
-				foreach( const QString& file, filenameList )
-				{
-					QDBusMessage m = QDBusMessage::createMethodCall(
-								PLAYUVER_DBUS_SESSION_NAME, QStringLiteral( PLAYUVER_DBUS_PATH ),
-								QStringLiteral( PLAYUVER_DBUS_SESSION_NAME ), QStringLiteral( "loadFile" ) );
+        // open given files...
+        foreach( const QString& file, filenameList )
+        {
+          QDBusMessage m = QDBusMessage::createMethodCall( PLAYUVER_DBUS_SESSION_NAME, QStringLiteral( PLAYUVER_DBUS_PATH ),
+                                                           QStringLiteral( PLAYUVER_DBUS_SESSION_NAME ), QStringLiteral( "loadFile" ) );
 
-					QList<QVariant> dbusargs;
-					dbusargs.append( file );
-					m.setArguments( dbusargs );
+          QList<QVariant> dbusargs;
+          dbusargs.append( file );
+          m.setArguments( dbusargs );
 
-					QDBusMessage res = QDBusConnection::sessionBus().call( m );
-					if( res.type() == QDBusMessage::ReplyMessage )
-					{
-						if( res.arguments().count() == 1 )
-						{
-							QVariant v = res.arguments()[0];
-							if( v.isValid() )
-							{
-								QString s = v.toString();
-								if( ( !s.isEmpty() ) && ( s != QStringLiteral( "ERROR" ) ) )
-								{
-									tokens << s;
-								}
-							}
-						}
-					}
-				}
-				// this will wait until exiting is emitted by the used instance, if
-				// wanted...
-				return needToBlock ? application.exec() : 0;
-			}
-		}
-	}
+          QDBusMessage res = QDBusConnection::sessionBus().call( m );
+          if( res.type() == QDBusMessage::ReplyMessage )
+          {
+            if( res.arguments().count() == 1 )
+            {
+              QVariant v = res.arguments()[0];
+              if( v.isValid() )
+              {
+                QString s = v.toString();
+                if( ( !s.isEmpty() ) && ( s != QStringLiteral( "ERROR" ) ) )
+                {
+                  tokens << s;
+                }
+              }
+            }
+          }
+        }
+        // this will wait until exiting is emitted by the used instance, if
+        // wanted...
+        return needToBlock ? application.exec() : 0;
+      }
+    }
+  }
 
-	/**
-	 * if we arrive here, we need to start a new playuver instance!
-	 */
-	QDBusConnection::sessionBus().registerService( PLAYUVER_DBUS_SESSION_NAME );
+  /**
+   * if we arrive here, we need to start a new playuver instance!
+   */
+  QDBusConnection::sessionBus().registerService( PLAYUVER_DBUS_SESSION_NAME );
 #endif
-	PlaYUVerApp mainwindow;
-	mainwindow.show();
-	if( mainwindow.parseArgs( argc, argv ) )
-	{
-		return 0;
-	}
+  PlaYUVerApp mainwindow;
+  mainwindow.show();
+  if( mainwindow.parseArgs( argc, argv ) )
+  {
+    return 0;
+  }
 
 #ifdef USE_FERVOR
-	FvUpdater::sharedUpdater()->SetFeedURL(
-				"http://192.168.96.201/share/PlaYUVerProject/"
-				"PlaYUVerUpdate-" UPDATE_CHANNEL ".xml" );
-	FvUpdater::sharedUpdater()->SetDependencies( "ALL" );
+  FvUpdater::sharedUpdater()->SetFeedURL(
+      "http://192.168.96.201/share/PlaYUVerProject/"
+      "PlaYUVerUpdate-" UPDATE_CHANNEL ".xml" );
+  FvUpdater::sharedUpdater()->SetDependencies( "ALL" );
 #endif
 
-	return application.exec();
+  return application.exec();
 }
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 613297a..ccd8c98 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,6 +12,7 @@ set(PlaYUVer_Lib_SRCS
     PlaYUVerFrame.cpp
     PlaYUVerFramePixelFormats.cpp
     # Stream
+    PlaYUVerStreamHandlerIf.h
     PlaYUVerStream.cpp
     StreamHandlerRaw.cpp
     StreamHandlerPortableMap.cpp
diff --git a/lib/PlaYUVerDefs.h b/lib/PlaYUVerDefs.h
index f3bbaeb..7234ee4 100644
--- a/lib/PlaYUVerDefs.h
+++ b/lib/PlaYUVerDefs.h
@@ -143,10 +143,7 @@ struct PlaYUVerFailure : public std::exception
   String m_class_name;
   String m_error_msg;
   PlaYUVerFailure( String error_msg ) throw() : m_error_msg( error_msg ) {}
-  PlaYUVerFailure( String class_name, String error_msg ) throw()
-      : m_class_name( class_name ), m_error_msg( error_msg )
-  {
-  }
+  PlaYUVerFailure( String class_name, String error_msg ) throw() : m_class_name( class_name ), m_error_msg( error_msg ) {}
   ~PlaYUVerFailure() throw() {}
   const Char* what() const throw()
   {
diff --git a/lib/PlaYUVerFrame.cpp b/lib/PlaYUVerFrame.cpp
index 8f1c808..5ceb620 100644
--- a/lib/PlaYUVerFrame.cpp
+++ b/lib/PlaYUVerFrame.cpp
@@ -77,17 +77,12 @@ Int PlaYUVerFrame::findPixelFormat( const String& name )
   return -1;
 }
 
-static Int getImgMemory( Pel**** array3D,
-                         Int dim1,
-                         Int dim2,
-                         Int log2ChromaHeight,
-                         Int log2ChromaWidth )
+static Int getImgMemory( Pel**** array3D, Int dim1, Int dim2, Int log2ChromaHeight, Int log2ChromaWidth )
 {
   Int dim0 = 3;
   Int i;
   UInt64 total_mem_size = 0;
-  UInt64 mem_size = ( dim1 * dim2 + CHROMASHIFT( dim1, log2ChromaHeight ) *
-                                        CHROMASHIFT( dim2, log2ChromaWidth ) * 2 );
+  UInt64 mem_size = ( dim1 * dim2 + CHROMASHIFT( dim1, log2ChromaHeight ) * CHROMASHIFT( dim2, log2ChromaWidth ) * 2 );
 
   total_mem_size += getMem2D<Pel*>( array3D, dim0, dim1 );
 
@@ -194,8 +189,7 @@ struct PlaYUVerFramePrivate
     }
     else
     {
-      getImgMemory( &m_pppcInputPel, m_uiHeight, m_uiWidth, m_pcPelFormat->log2ChromaHeight,
-                    m_pcPelFormat->log2ChromaWidth );
+      getImgMemory( &m_pppcInputPel, m_uiHeight, m_uiWidth, m_pcPelFormat->log2ChromaHeight, m_pcPelFormat->log2ChromaWidth );
     }
     getMem1D( &m_pcARGB32, m_uiHeight * m_uiWidth * 4 );
 
@@ -204,8 +198,7 @@ struct PlaYUVerFramePrivate
 
     m_uiHistoSegments = 1 << m_uiBitsPel;
 
-    if( m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_RGB ||
-        m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_ARGB )
+    if( m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_RGB || m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_ARGB )
       m_uiHistoChannels = m_pcPelFormat->numberChannels + 1;
     else
       m_uiHistoChannels = m_pcPelFormat->numberChannels;
@@ -238,8 +231,7 @@ struct PlaYUVerFramePrivate
  * \brief Constructors
  */
 
-PlaYUVerFrame::PlaYUVerFrame( UInt width, UInt height, Int pelFormat, Int bitsPixel )
-    : d( new PlaYUVerFramePrivate )
+PlaYUVerFrame::PlaYUVerFrame( UInt width, UInt height, Int pelFormat, Int bitsPixel ) : d( new PlaYUVerFramePrivate )
 {
   d->init( width, height, pelFormat, bitsPixel );
 }
@@ -259,11 +251,9 @@ PlaYUVerFrame::PlaYUVerFrame( const PlaYUVerFrame* other ) : d( new PlaYUVerFram
   }
 }
 
-PlaYUVerFrame::PlaYUVerFrame( const PlaYUVerFrame& other, UInt x, UInt y, UInt width, UInt height )
-    : d( new PlaYUVerFramePrivate )
+PlaYUVerFrame::PlaYUVerFrame( const PlaYUVerFrame& other, UInt x, UInt y, UInt width, UInt height ) : d( new PlaYUVerFramePrivate )
 {
-  const PlaYUVerPixFmtDescriptor* pcPelFormat =
-      &( g_PlaYUVerPixFmtDescriptorsList[other.getPelFormat()] );
+  const PlaYUVerPixFmtDescriptor* pcPelFormat = &( g_PlaYUVerPixFmtDescriptorsList[other.getPelFormat()] );
   if( pcPelFormat->log2ChromaWidth )
   {
     if( x % ( 1 << pcPelFormat->log2ChromaWidth ) )
@@ -285,18 +275,12 @@ PlaYUVerFrame::PlaYUVerFrame( const PlaYUVerFrame& other, UInt x, UInt y, UInt w
   copyFrom( other, x, y );
 }
 
-PlaYUVerFrame::PlaYUVerFrame( const PlaYUVerFrame* other,
-                              UInt posX,
-                              UInt posY,
-                              UInt areaWidth,
-                              UInt areaHeight )
-    : d( new PlaYUVerFramePrivate )
+PlaYUVerFrame::PlaYUVerFrame( const PlaYUVerFrame* other, UInt posX, UInt posY, UInt areaWidth, UInt areaHeight ) : d( new PlaYUVerFramePrivate )
 {
   if( !other )
     return;
 
-  const PlaYUVerPixFmtDescriptor* pcPelFormat =
-      &( g_PlaYUVerPixFmtDescriptorsList[other->getPelFormat()] );
+  const PlaYUVerPixFmtDescriptor* pcPelFormat = &( g_PlaYUVerPixFmtDescriptorsList[other->getPelFormat()] );
   if( pcPelFormat->log2ChromaWidth )
   {
     if( posX % ( 1 << pcPelFormat->log2ChromaWidth ) )
@@ -335,8 +319,7 @@ Bool PlaYUVerFrame::haveSameFmt( const PlaYUVerFrame& other, UInt match ) const
   if( match & MATCH_BITS )
     bRet &= ( getBitsPel() == other.getBitsPel() );
   if( match & MATCH_COLOR_SPACE_IGNORE_GRAY )
-    bRet &= ( getColorSpace() == PlaYUVerPixel::COLOR_GRAY ||
-              getColorSpace() == other.getColorSpace() );
+    bRet &= ( getColorSpace() == PlaYUVerPixel::COLOR_GRAY || getColorSpace() == other.getColorSpace() );
   return bRet;
 }
 
@@ -423,18 +406,14 @@ UInt64 PlaYUVerFrame::getBytesPerFrame()
   return getBytesPerFrame( d->m_uiWidth, d->m_uiHeight, d->m_iPixelFormat, d->m_uiBitsPel );
 }
 
-UInt64 PlaYUVerFrame::getBytesPerFrame( UInt uiWidth,
-                                        UInt uiHeight,
-                                        Int iPixelFormat,
-                                        UInt bitsPixel )
+UInt64 PlaYUVerFrame::getBytesPerFrame( UInt uiWidth, UInt uiHeight, Int iPixelFormat, UInt bitsPixel )
 {
   const PlaYUVerPixFmtDescriptor* pcPelFormat = &( g_PlaYUVerPixFmtDescriptorsList[iPixelFormat] );
   UInt bytesPerPixel = ( bitsPixel - 1 ) / 8 + 1;
   UInt64 numberBytes = uiWidth * uiHeight;
   if( pcPelFormat->numberChannels > 1 )
   {
-    UInt64 numberBytesChroma = CHROMASHIFT( uiWidth, pcPelFormat->log2ChromaWidth ) *
-                               CHROMASHIFT( uiHeight, pcPelFormat->log2ChromaHeight );
+    UInt64 numberBytesChroma = CHROMASHIFT( uiWidth, pcPelFormat->log2ChromaWidth ) * CHROMASHIFT( uiHeight, pcPelFormat->log2ChromaHeight );
     numberBytes += ( pcPelFormat->numberChannels - 1 ) * numberBytesChroma;
   }
   return numberBytes * bytesPerPixel;
@@ -451,8 +430,7 @@ Void PlaYUVerFrame::clear()
     ratioW = ch > 0 ? d->m_pcPelFormat->log2ChromaWidth : 0;
     ratioH = ch > 0 ? d->m_pcPelFormat->log2ChromaHeight : 0;
     pPel = d->m_pppcInputPel[ch][0];
-    for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW );
-         i++ )
+    for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ); i++ )
     {
       *pPel++ = uiValue;
     }
@@ -489,8 +467,7 @@ UChar* PlaYUVerFrame::getRGBBuffer()
 
 PlaYUVerPixel PlaYUVerFrame::getPixelValue( Int xPos, Int yPos )
 {
-  PlaYUVerPixel PixelValue( d->m_pcPelFormat->colorSpace, d->m_uiHalfPelValue, d->m_uiHalfPelValue,
-                            d->m_uiHalfPelValue );
+  PlaYUVerPixel PixelValue( d->m_pcPelFormat->colorSpace, d->m_uiHalfPelValue, d->m_uiHalfPelValue, d->m_uiHalfPelValue );
   for( UInt ch = 0; ch < d->m_pcPelFormat->numberChannels; ch++ )
   {
     Int ratioH = ch > 0 ? d->m_pcPelFormat->log2ChromaWidth : 0;
@@ -500,9 +477,7 @@ PlaYUVerPixel PlaYUVerFrame::getPixelValue( Int xPos, Int yPos )
   return PixelValue;
 }
 
-PlaYUVerPixel PlaYUVerFrame::getPixelValue( Int xPos,
-                                            Int yPos,
-                                            PlaYUVerPixel::ColorSpace eColorSpace )
+PlaYUVerPixel PlaYUVerFrame::getPixelValue( Int xPos, Int yPos, PlaYUVerPixel::ColorSpace eColorSpace )
 {
   PlaYUVerPixel PixelValue( d->m_pcPelFormat->colorSpace );
   for( UInt ch = 0; ch < d->m_pcPelFormat->numberChannels; ch++ )
@@ -533,8 +508,7 @@ Void PlaYUVerFrame::copyFrom( const PlaYUVerFrame& other )
     return;
   d->m_bHasRGBPel = false;
   d->m_bHasHistogram = false;
-  memcpy( *d->m_pppcInputPel[LUMA], other.getPelBufferYUV()[LUMA][0],
-          getBytesPerFrame() * sizeof( Pel ) );
+  memcpy( *d->m_pppcInputPel[LUMA], other.getPelBufferYUV()[LUMA][0], getBytesPerFrame() * sizeof( Pel ) );
 }
 
 Void PlaYUVerFrame::copyFrom( const PlaYUVerFrame* other )
@@ -554,8 +528,7 @@ Void PlaYUVerFrame::copyFrom( const PlaYUVerFrame& other, UInt xPos, UInt yPos )
     Int ratioW = ch > 0 ? d->m_pcPelFormat->log2ChromaHeight : 0;
     for( UInt i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ); i++ )
     {
-      memcpy( d->m_pppcInputPel[ch][i], &( pInput[ch][( yPos >> ratioH ) + i][( xPos >> ratioW )] ),
-              ( d->m_uiWidth >> ratioW ) * sizeof( Pel ) );
+      memcpy( d->m_pppcInputPel[ch][i], &( pInput[ch][( yPos >> ratioH ) + i][( xPos >> ratioW )] ), ( d->m_uiWidth >> ratioW ) * sizeof( Pel ) );
     }
   }
   d->m_bHasRGBPel = false;
@@ -602,8 +575,7 @@ Void PlaYUVerFrame::frameFromBuffer( Byte* Buff, Int iEndianness )
   {
     ratioW = i > 1 ? d->m_pcPelFormat->log2ChromaWidth : 0;
     ratioH = i > 1 ? d->m_pcPelFormat->log2ChromaHeight : 0;
-    ppBuff[i] = ppBuff[i - 1] + CHROMASHIFT( d->m_uiHeight, ratioH ) *
-                                    CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
+    ppBuff[i] = ppBuff[i - 1] + CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
   }
 
   for( ch = 0; ch < d->m_pcPelFormat->numberChannels; ch++ )
@@ -613,11 +585,9 @@ Void PlaYUVerFrame::frameFromBuffer( Byte* Buff, Int iEndianness )
     step = d->m_pcPelFormat->comp[ch].step_minus1;
 
     pPel = d->m_pppcInputPel[ch][0];
-    pTmpBuff =
-        ppBuff[d->m_pcPelFormat->comp[ch].plane] + ( d->m_pcPelFormat->comp[ch].offset_plus1 - 1 );
+    pTmpBuff = ppBuff[d->m_pcPelFormat->comp[ch].plane] + ( d->m_pcPelFormat->comp[ch].offset_plus1 - 1 );
 
-    for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW );
-         i++ )
+    for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ); i++ )
     {
       *pPel = 0;
       for( b = startByte; b != endByte; b += incByte )
@@ -663,8 +633,7 @@ Void PlaYUVerFrame::frameToBuffer( Byte* output_buffer, Int iEndianness )
   {
     ratioW = i > 1 ? d->m_pcPelFormat->log2ChromaWidth : 0;
     ratioH = i > 1 ? d->m_pcPelFormat->log2ChromaHeight : 0;
-    ppBuff[i] = ppBuff[i - 1] + CHROMASHIFT( d->m_uiHeight, ratioH ) *
-                                    CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
+    ppBuff[i] = ppBuff[i - 1] + CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
   }
 
   for( ch = 0; ch < d->m_pcPelFormat->numberChannels; ch++ )
@@ -676,8 +645,7 @@ Void PlaYUVerFrame::frameToBuffer( Byte* output_buffer, Int iEndianness )
     pTmpPel = d->m_pppcInputPel[ch][0];
     pTmpBuff = ppBuff[d->m_pcPelFormat->comp[ch].plane];
 
-    for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW );
-         i++ )
+    for( i = 0; i < CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ); i++ )
     {
       for( b = startByte; b != endByte; b += incByte )
       {
@@ -838,8 +806,7 @@ Void PlaYUVerFrame::calcHistogram()
       }
       if( ( colorSpace == PlaYUVerPixel::COLOR_RGB || colorSpace == PlaYUVerPixel::COLOR_ARGB ) )
       {
-        PlaYUVerPixel currPixel( colorSpace, *( data[COLOR_R] ), *( data[COLOR_G] ),
-                                 *( data[COLOR_B] ) );
+        PlaYUVerPixel currPixel( colorSpace, *( data[COLOR_R] ), *( data[COLOR_G] ), *( data[COLOR_B] ) );
         luma = currPixel.ConvertPixel( PlaYUVerPixel::COLOR_YUV ).Y();
         d->m_puiHistogram[luma + j * d->m_uiHistoSegments]++;
       }
@@ -886,8 +853,7 @@ Int getRealHistoChannel( Int colorSpace, Int channel )
     }
     break;
   case PlaYUVerPixel::COLOR_ARGB:
-    if( channel != COLOR_R && channel != COLOR_G && channel != COLOR_B && channel != COLOR_A &&
-        channel != LUMA )
+    if( channel != COLOR_R && channel != COLOR_G && channel != COLOR_B && channel != COLOR_A && channel != LUMA )
     {
       return -1;
     }
@@ -1185,16 +1151,14 @@ Bool PlaYUVerFrame::toMat( cv::Mat& cvMat, Bool convertToGray )
 {
   Bool bRet = false;
 #ifdef USE_OPENCV
-  if( convertToGray && !( d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_YUV ||
-                          d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_GRAY ) )
+  if( convertToGray && !( d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_YUV || d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_GRAY ) )
   {
     return bRet;
   }
   Int cvType = CV_MAKETYPE( CV_8U, convertToGray ? 1 : d->m_pcPelFormat->numberChannels );
   cvMat.create( d->m_uiHeight, d->m_uiWidth, cvType );
   UChar* pCvPel = cvMat.data;
-  if( !convertToGray && ( d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_YUV ||
-                          d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_RGB ) )
+  if( !convertToGray && ( d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_YUV || d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_RGB ) )
   {
     fillRGBBuffer();
     UChar* pARGB = d->m_pcARGB32;
@@ -1355,14 +1319,7 @@ Double PlaYUVerFrame::getPSNR( PlaYUVerFrame* Org, Int component )
   return dPSNR;
 }
 
-float compute_ssim( Pel** refImg,
-                    Pel** encImg,
-                    Int width,
-                    Int height,
-                    Int win_width,
-                    Int win_height,
-                    Int max_pel_value_comp,
-                    Int overlapSize )
+float compute_ssim( Pel** refImg, Pel** encImg, Int width, Int height, Int win_width, Int win_height, Int max_pel_value_comp, Int overlapSize )
 {
   static const float K1 = 0.01f, K2 = 0.03f;
   float max_pix_value_sqd;
@@ -1422,8 +1379,7 @@ float compute_ssim( Pel** refImg,
 
   cur_distortion /= (float)win_cnt;
 
-  if( cur_distortion >= 1.0 &&
-      cur_distortion < 1.01 )  // avoid float accuracy problem at very low QP(e.g.2)
+  if( cur_distortion >= 1.0 && cur_distortion < 1.01 )  // avoid float accuracy problem at very low QP(e.g.2)
     cur_distortion = 1.0;
 
   return cur_distortion;
@@ -1434,13 +1390,11 @@ Double PlaYUVerFrame::getSSIM( PlaYUVerFrame* Org, Int component )
   Double dSSIM = 1;
   if( component == LUMA )
   {
-    dSSIM = compute_ssim( d->m_pppcInputPel[component], Org->getPelBufferYUV()[component],
-                          d->m_uiWidth, d->m_uiHeight, 8, 8, 255, 8 );
+    dSSIM = compute_ssim( d->m_pppcInputPel[component], Org->getPelBufferYUV()[component], d->m_uiWidth, d->m_uiHeight, 8, 8, 255, 8 );
   }
   else
   {
-    dSSIM = compute_ssim( d->m_pppcInputPel[component], Org->getPelBufferYUV()[component],
-													getChromaWidth(), getChromaHeight(), 4, 4, 255, 4 );
+    dSSIM = compute_ssim( d->m_pppcInputPel[component], Org->getPelBufferYUV()[component], getChromaWidth(), getChromaHeight(), 4, 4, 255, 4 );
   }
   return dSSIM;
 }
diff --git a/lib/PlaYUVerFramePixelFormats.cpp b/lib/PlaYUVerFramePixelFormats.cpp
index 6e652f6..03d7a49 100644
--- a/lib/PlaYUVerFramePixelFormats.cpp
+++ b/lib/PlaYUVerFramePixelFormats.cpp
@@ -199,112 +199,111 @@ Void fillARGB32bufferYUV420p( Pel*** in, UChar* out, UInt width, UInt height, UI
 }
 #endif
 
-const PlaYUVerPixFmtDescriptor g_PlaYUVerPixFmtDescriptorsList[PlaYUVerFrame::NUMBER_PEL_FORMATS] =
-    {{
-         "YUV420p",
-         PlaYUVerPixel::COLOR_YUV,
-         3,
-         3,
-         1,
-         1,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUV420P ),
-         {
-             {0, 0, 1}, /* Y */
-             {1, 0, 1}, /* U */
-             {2, 0, 1}, /* V */
-         },
-     },
-     {
-         "YUV422p",
-         PlaYUVerPixel::COLOR_YUV,
-         3,
-         3,
-         1,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUV422P ),
-         {
-             {0, 0, 1}, /* Y */
-             {1, 0, 1}, /* U */
-             {2, 0, 1}, /* V */
-         },
-     },
-     {
-         "YUV444p",
-         PlaYUVerPixel::COLOR_YUV,
-         3,
-         3,
-         0,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUV444P ),
-         {
-             {0, 0, 1}, /* Y */
-             {1, 0, 1}, /* U */
-             {2, 0, 1}, /* V */
-         },
-     },
-     {
-         "YUYV422",
-         PlaYUVerPixel::COLOR_YUV,
-         3,
-         1,
-         1,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUYV422 ),
-         {
-             {0, 1, 1}, /* Y */
-             {0, 3, 2}, /* U */
-             {0, 3, 4}, /* V */
-         },
-     },
-     {
-         "GRAY",
-         PlaYUVerPixel::COLOR_GRAY,
-         1,
-         1,
-         0,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_GRAY8 ),
-         {{0, 0, 1}}, /* Y */
-     },
-     {
-         "RGBp",
-         PlaYUVerPixel::COLOR_RGB,
-         3,
-         3,
-         0,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_RGB24 ),
-         {
-             {0, 0, 1}, /* R */
-             {1, 0, 1}, /* G */
-             {2, 0, 1}, /* B */
-         },
-     },
-     {
-         "RGB",
-         PlaYUVerPixel::COLOR_RGB,
-         3,
-         1,
-         0,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_RGB24 ),
-         {
-             {0, 2, 1}, /* R */
-             {0, 2, 2}, /* G */
-             {0, 2, 3}, /* B */
-         },
-     },
-     {
-         "BGR",
-         PlaYUVerPixel::COLOR_RGB,
-         3,
-         1,
-         0,
-         0,
-         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_BGR24 ),
-         {
-             {0, 2, 3}, /* B */
-             {0, 2, 2}, /* R */
-             {0, 2, 1}, /* G */
-         },
-     }};
+const PlaYUVerPixFmtDescriptor g_PlaYUVerPixFmtDescriptorsList[PlaYUVerFrame::NUMBER_PEL_FORMATS] = {{
+                                                                                                         "YUV420p",
+                                                                                                         PlaYUVerPixel::COLOR_YUV,
+                                                                                                         3,
+                                                                                                         3,
+                                                                                                         1,
+                                                                                                         1,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUV420P ),
+                                                                                                         {
+                                                                                                             {0, 0, 1}, /* Y */
+                                                                                                             {1, 0, 1}, /* U */
+                                                                                                             {2, 0, 1}, /* V */
+                                                                                                         },
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "YUV422p",
+                                                                                                         PlaYUVerPixel::COLOR_YUV,
+                                                                                                         3,
+                                                                                                         3,
+                                                                                                         1,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUV422P ),
+                                                                                                         {
+                                                                                                             {0, 0, 1}, /* Y */
+                                                                                                             {1, 0, 1}, /* U */
+                                                                                                             {2, 0, 1}, /* V */
+                                                                                                         },
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "YUV444p",
+                                                                                                         PlaYUVerPixel::COLOR_YUV,
+                                                                                                         3,
+                                                                                                         3,
+                                                                                                         0,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUV444P ),
+                                                                                                         {
+                                                                                                             {0, 0, 1}, /* Y */
+                                                                                                             {1, 0, 1}, /* U */
+                                                                                                             {2, 0, 1}, /* V */
+                                                                                                         },
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "YUYV422",
+                                                                                                         PlaYUVerPixel::COLOR_YUV,
+                                                                                                         3,
+                                                                                                         1,
+                                                                                                         1,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_YUYV422 ),
+                                                                                                         {
+                                                                                                             {0, 1, 1}, /* Y */
+                                                                                                             {0, 3, 2}, /* U */
+                                                                                                             {0, 3, 4}, /* V */
+                                                                                                         },
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "GRAY",
+                                                                                                         PlaYUVerPixel::COLOR_GRAY,
+                                                                                                         1,
+                                                                                                         1,
+                                                                                                         0,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_GRAY8 ),
+                                                                                                         {{0, 0, 1}}, /* Y */
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "RGBp",
+                                                                                                         PlaYUVerPixel::COLOR_RGB,
+                                                                                                         3,
+                                                                                                         3,
+                                                                                                         0,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_RGB24 ),
+                                                                                                         {
+                                                                                                             {0, 0, 1}, /* R */
+                                                                                                             {1, 0, 1}, /* G */
+                                                                                                             {2, 0, 1}, /* B */
+                                                                                                         },
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "RGB",
+                                                                                                         PlaYUVerPixel::COLOR_RGB,
+                                                                                                         3,
+                                                                                                         1,
+                                                                                                         0,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_RGB24 ),
+                                                                                                         {
+                                                                                                             {0, 2, 1}, /* R */
+                                                                                                             {0, 2, 2}, /* G */
+                                                                                                             {0, 2, 3}, /* B */
+                                                                                                         },
+                                                                                                     },
+                                                                                                     {
+                                                                                                         "BGR",
+                                                                                                         PlaYUVerPixel::COLOR_RGB,
+                                                                                                         3,
+                                                                                                         1,
+                                                                                                         0,
+                                                                                                         0,
+                                                                                                         ADD_FFMPEG_PEL_FMT( AV_PIX_FMT_BGR24 ),
+                                                                                                         {
+                                                                                                             {0, 2, 3}, /* B */
+                                                                                                             {0, 2, 2}, /* R */
+                                                                                                             {0, 2, 1}, /* G */
+                                                                                                         },
+                                                                                                     }};
diff --git a/lib/PlaYUVerFramePixelFormats.h b/lib/PlaYUVerFramePixelFormats.h
index 1a57ffa..47464cb 100644
--- a/lib/PlaYUVerFramePixelFormats.h
+++ b/lib/PlaYUVerFramePixelFormats.h
@@ -33,8 +33,7 @@
 
 #define CHROMARATIO( SIZE, RATIO ) ( RATIO > 1 ? ( ( SIZE + 1 ) / RATIO ) : SIZE )
 
-#define PEL_RGB( r, g, b ) \
-  ( 0xffu << 24 ) | ( ( r & 0xff ) << 16 ) | ( ( g & 0xff ) << 8 ) | ( b & 0xff )
+#define PEL_RGB( r, g, b ) ( 0xffu << 24 ) | ( ( r & 0xff ) << 16 ) | ( ( g & 0xff ) << 8 ) | ( b & 0xff )
 
 typedef struct PlaYUVerComponentDescriptor
 {
diff --git a/lib/PlaYUVerOptions.cpp b/lib/PlaYUVerOptions.cpp
index 762a345..cae4a9b 100644
--- a/lib/PlaYUVerOptions.cpp
+++ b/lib/PlaYUVerOptions.cpp
@@ -60,10 +60,7 @@ struct ParseFailure : public std::exception
 class BoolOption : public OptionBase
 {
 public:
-  BoolOption( const String& name, const String& desc ) : OptionBase( name, desc )
-  {
-    is_binary = true;
-  }
+  BoolOption( const String& name, const String& desc ) : OptionBase( name, desc ) { is_binary = true; }
   void parse( const String& arg ) { arg_count++; }
 };
 
@@ -72,11 +69,7 @@ template <typename T>
 class StandardOption : public OptionBase
 {
 public:
-  StandardOption( const String& name, T& storage, const String& desc )
-      : OptionBase( name, desc ), opt_storage( storage )
-  {
-    is_binary = false;
-  }
+  StandardOption( const String& name, T& storage, const String& desc ) : OptionBase( name, desc ), opt_storage( storage ) { is_binary = false; }
 
   void parse( const String& arg );
   T& opt_storage;
@@ -204,30 +197,14 @@ PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, T& storage, co
   return *this;
 }
 
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       Bool& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       UInt& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       Int& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       Int64& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       String& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       std::vector<UInt>& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       std::vector<Int>& storage,
-                                                       const String& desc );
-template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name,
-                                                       std::vector<String>& storage,
-                                                       const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, Bool& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, UInt& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, Int& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, Int64& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, String& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, std::vector<UInt>& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, std::vector<Int>& storage, const String& desc );
+template PlaYUVerOptions& PlaYUVerOptions::operator()( const String& name, std::vector<String>& storage, const String& desc );
 
 /**
  * Add option described by name to the parent Options list,
@@ -349,10 +326,7 @@ static void setOptions( PlaYUVerOptions::OptionsList& opt_list, const string& va
   }
 }
 
-Bool PlaYUVerOptions::storePair( Bool allow_long,
-                                 Bool allow_short,
-                                 const string& name,
-                                 const string& value )
+Bool PlaYUVerOptions::storePair( Bool allow_long, Bool allow_short, const string& name, const string& value )
 {
   bool found = false;
   PlaYUVerOptions::OptionMap::iterator opt_it;
diff --git a/lib/PlaYUVerOptions.h b/lib/PlaYUVerOptions.h
index 40e1c7a..43c398a 100644
--- a/lib/PlaYUVerOptions.h
+++ b/lib/PlaYUVerOptions.h
@@ -51,10 +51,7 @@
 class OptionBase
 {
 public:
-  OptionBase( const String& name, const String& desc )
-      : arg_count( 0 ), opt_string( name ), opt_desc( desc )
-  {
-  }
+  OptionBase( const String& name, const String& desc ) : arg_count( 0 ), opt_string( name ), opt_desc( desc ) {}
   virtual ~OptionBase() {}
   /* parse argument arg, to obtain a value for the option */
   virtual void parse( const String& arg ) = 0;
diff --git a/lib/PlaYUVerPixel.h b/lib/PlaYUVerPixel.h
index 9b8b07b..a280ea2 100644
--- a/lib/PlaYUVerPixel.h
+++ b/lib/PlaYUVerPixel.h
@@ -31,12 +31,7 @@
 #include <iostream>
 #include <vector>
 
-static inline Void YuvToRgb( const Int& iY,
-                             const Int& iU,
-                             const Int& iV,
-                             Int& iR,
-                             Int& iG,
-                             Int& iB )
+static inline Void YuvToRgb( const Int& iY, const Int& iU, const Int& iV, Int& iR, Int& iG, Int& iB )
 {
   iR = iY + ( ( 1436 * ( iV - 128 ) ) >> 10 );
   iG = iY - ( ( 352 * ( iU - 128 ) + 731 * ( iV - 128 ) ) >> 10 );
@@ -46,12 +41,7 @@ static inline Void YuvToRgb( const Int& iY,
   iB = iB < 0 ? 0 : iB > 255 ? 255 : iB;
 }
 
-static inline Void rgbToYuv( const Int& iR,
-                             const Int& iG,
-                             const Int& iB,
-                             Int& iY,
-                             Int& iU,
-                             Int& iV )
+static inline Void rgbToYuv( const Int& iR, const Int& iG, const Int& iB, Int& iY, Int& iU, Int& iV )
 {
   iY = ( 299 * iR + 587 * iG + 114 * iB + 500 ) / 1000;
   iU = ( 1000 * ( iB - iY ) + 226816 ) / 1772;
diff --git a/lib/PlaYUVerStream.cpp b/lib/PlaYUVerStream.cpp
index b368929..99da94a 100644
--- a/lib/PlaYUVerStream.cpp
+++ b/lib/PlaYUVerStream.cpp
@@ -91,12 +91,8 @@ private:
 std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedReadFormats()
 {
   INI_REGIST_PLAYUVER_SUPPORTED_FMT;
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw YUV Video", "yuv" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Gray Video", "gray" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw RGB Video", "rgb" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable BitMap ", "pbm" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable GrayMap ", "pgm" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable PixMap ", "ppm" );
+  APPEND_PLAYUVER_SUPPORTED_FMT( StreamHandlerRaw, Read );
+  APPEND_PLAYUVER_SUPPORTED_FMT( StreamHandlerPortableMap, Read );
 #ifdef USE_FFMPEG
   APPEND_PLAYUVER_SUPPORTED_FMT( StreamHandlerLibav, Read );
 #endif
@@ -109,9 +105,8 @@ std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedReadFormats()
 std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedWriteFormats()
 {
   INI_REGIST_PLAYUVER_SUPPORTED_FMT;
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Video", "yuv" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable BitMap ", "pbm" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable GrayMap ", "pgm" );
+  APPEND_PLAYUVER_SUPPORTED_FMT( StreamHandlerRaw, Write );
+  APPEND_PLAYUVER_SUPPORTED_FMT( StreamHandlerPortableMap, Write );
 #ifdef USE_FFMPEG
   APPEND_PLAYUVER_SUPPORTED_FMT( StreamHandlerLibav, Write );
 #endif
@@ -121,6 +116,20 @@ std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedWriteFormats()
   END_REGIST_PLAYUVER_SUPPORTED_FMT;
 }
 
+std::vector<String> PlaYUVerSupportedFormat::getExts()
+{
+  std::vector<String> arrayExt;
+  String::size_type prev_pos = 0, pos = 0;
+  while( ( pos = formatExt.find( ',', pos ) ) != String::npos )
+  {
+    String substring( formatExt.substr( prev_pos, pos - prev_pos ) );
+    arrayExt.push_back( substring );
+    prev_pos = ++pos;
+  }
+  arrayExt.push_back( formatExt.substr( prev_pos, pos - prev_pos ) );  // Last word
+  return arrayExt;
+}
+
 std::vector<PlaYUVerStdResolution> PlaYUVerStream::stdResolutionSizes()
 {
 #define REGIST_PLAYUVER_STANDARD_RESOLUTION( name, width, height ) \
@@ -162,13 +171,17 @@ CreateStreamHandlerFn PlaYUVerStream::findStreamHandler( String strFilename, boo
   }
   for( UInt i = 0; i < supportedFmts.size(); i++ )
   {
-    if( currExt != "" && supportedFmts[i].formatExt == currExt )
+    std::vector<String> arrayExt = supportedFmts[i].getExts();
+    for( std::vector<String>::iterator e = arrayExt.begin(); e != arrayExt.end(); ++e )
     {
-      return supportedFmts[i].formatFct;
-    }
-    else if( strFilename.find( supportedFmts[i].formatExt ) != String::npos )
-    {
-      return supportedFmts[i].formatFct;
+      if( currExt != "" && currExt == *e )
+      {
+        return supportedFmts[i].formatFct;
+      }
+      else if( strFilename.find( *e ) != String::npos )
+      {
+        return supportedFmts[i].formatFct;
+      }
     }
   }
   return &StreamHandlerRaw::Create;
@@ -200,13 +213,7 @@ String PlaYUVerStream::getCodecName()
   return !m_pcHandler ? "" : m_pcHandler->getCodecName();
 }
 
-Bool PlaYUVerStream::open( String filename,
-                           String resolution,
-                           String input_format_name,
-                           UInt bitsPel,
-                           Int endianness,
-                           UInt frame_rate,
-                           Bool bInput )
+Bool PlaYUVerStream::open( String filename, String resolution, String input_format_name, UInt bitsPel, Int endianness, UInt frame_rate, Bool bInput )
 {
   UInt width = 0;
   UInt height = 0;
@@ -222,8 +229,7 @@ Bool PlaYUVerStream::open( String filename,
   }
   for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames().size(); i++ )
   {
-    if( lowercase( PlaYUVerFrame::supportedPixelFormatListNames()[i] ) ==
-        lowercase( input_format_name ) )
+    if( lowercase( PlaYUVerFrame::supportedPixelFormatListNames()[i] ) == lowercase( input_format_name ) )
     {
       input_format = i;
       break;
@@ -232,14 +238,7 @@ Bool PlaYUVerStream::open( String filename,
   return open( filename, width, height, input_format, bitsPel, endianness, frame_rate, bInput );
 }
 
-Bool PlaYUVerStream::open( String filename,
-                           UInt width,
-                           UInt height,
-                           Int input_format,
-                           UInt bitsPel,
-                           Int endianness,
-                           UInt frame_rate,
-                           Bool bInput )
+Bool PlaYUVerStream::open( String filename, UInt width, UInt height, Int input_format, UInt bitsPel, Int endianness, UInt frame_rate, Bool bInput )
 {
   if( m_bInit )
   {
@@ -278,8 +277,7 @@ Bool PlaYUVerStream::open( String filename,
     return m_bInit;
   }
 
-  if( m_pcHandler->m_uiWidth <= 0 || m_pcHandler->m_uiHeight <= 0 ||
-      m_pcHandler->m_iPixelFormat < 0 )
+  if( m_pcHandler->m_uiWidth <= 0 || m_pcHandler->m_uiHeight <= 0 || m_pcHandler->m_iPixelFormat < 0 )
   {
     close();
     throw PlaYUVerFailure( "PlaYUVerStream", "Incorrect configuration" );
@@ -289,9 +287,8 @@ Bool PlaYUVerStream::open( String filename,
   // Keep past, current and future frames
   try
   {
-    m_frameBuffer = new PlaYUVerStreamBufferPrivate(
-        m_bIsInput ? 3 : 1, m_pcHandler->m_uiWidth, m_pcHandler->m_uiHeight,
-        m_pcHandler->m_iPixelFormat, m_pcHandler->m_uiBitsPerPixel );
+    m_frameBuffer = new PlaYUVerStreamBufferPrivate( m_bIsInput ? 3 : 1, m_pcHandler->m_uiWidth, m_pcHandler->m_uiHeight, m_pcHandler->m_iPixelFormat,
+                                                     m_pcHandler->m_uiBitsPerPixel );
   }
   catch( PlaYUVerFailure& e )
   {
@@ -340,8 +337,7 @@ Bool PlaYUVerStream::reload()
   m_pcHandler->setBytesPerFrame( m_frameBuffer->current()->getBytesPerFrame() );
   m_uiTotalFrameNum = m_pcHandler->calculateFrameNumber();
 
-  if( m_pcHandler->m_uiWidth <= 0 || m_pcHandler->m_uiHeight <= 0 ||
-      m_pcHandler->m_iPixelFormat < 0 || m_pcHandler->m_uiBitsPerPixel == 0 ||
+  if( m_pcHandler->m_uiWidth <= 0 || m_pcHandler->m_uiHeight <= 0 || m_pcHandler->m_iPixelFormat < 0 || m_pcHandler->m_uiBitsPerPixel == 0 ||
       m_uiTotalFrameNum < 1 )
   {
     return false;
@@ -401,12 +397,7 @@ Int PlaYUVerStream::getCurrFrameNum()
   return m_iCurrFrameNum;
 }
 
-Void PlaYUVerStream::getFormat( UInt& rWidth,
-                                UInt& rHeight,
-                                Int& rInputFormat,
-                                UInt& rBitsPerPel,
-                                Int& rEndianness,
-                                UInt& rFrameRate )
+Void PlaYUVerStream::getFormat( UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rBitsPerPel, Int& rEndianness, UInt& rFrameRate )
 {
   if( m_bInit )
   {
@@ -513,8 +504,7 @@ Bool PlaYUVerStream::saveFrame( const String& filename )
 Bool PlaYUVerStream::saveFrame( const String& filename, PlaYUVerFrame* saveFrame )
 {
   PlaYUVerStream auxSaveStream;
-  if( !auxSaveStream.open( filename, saveFrame->getWidth(), saveFrame->getHeight(),
-                           saveFrame->getPelFormat(), saveFrame->getBitsPel(),
+  if( !auxSaveStream.open( filename, saveFrame->getWidth(), saveFrame->getHeight(), saveFrame->getPelFormat(), saveFrame->getBitsPel(),
                            PLAYUVER_LITTLE_ENDIAN, 1, false ) )
   {
     return false;
diff --git a/lib/PlaYUVerStream.h b/lib/PlaYUVerStream.h
index f412482..8937ee7 100644
--- a/lib/PlaYUVerStream.h
+++ b/lib/PlaYUVerStream.h
@@ -44,32 +44,12 @@ typedef struct
 {
   String formatName;
   String formatExt;
+  std::vector<String> getExts();
   String formatPattern;
   CreateStreamHandlerFn formatFct;
+
 } PlaYUVerSupportedFormat;
 
-#define INI_REGIST_PLAYUVER_SUPPORTED_FMT           \
-  std::vector<PlaYUVerSupportedFormat> formatsList; \
-  PlaYUVerSupportedFormat formatElem;
-
-#define END_REGIST_PLAYUVER_SUPPORTED_FMT return formatsList;
-
-#define REGIST_PLAYUVER_SUPPORTED_FMT( handler, name, ext ) \
-  formatElem.formatName = name;                             \
-  formatElem.formatExt = lowercase( ext );                  \
-  formatElem.formatFct = handler;                           \
-  formatsList.push_back( formatElem );
-
-#define REGIST_PLAYUVER_SUPPORTED_ABSTRACT_FMT( handler, name, pattern ) \
-  formatElem.formatPattern = pattern;                                    \
-  REGIST_PLAYUVER_SUPPORTED_FMT( handler, name, "" )
-
-#define APPEND_PLAYUVER_SUPPORTED_FMT( class_name, fct )                                   \
-  {                                                                                        \
-    std::vector<PlaYUVerSupportedFormat> new_fmts = class_name::supported##fct##Formats(); \
-    formatsList.insert( formatsList.end(), new_fmts.begin(), new_fmts.end() );             \
-  }
-
 /**
  * \class PlaYUVerStream
  * \ingroup  PlaYUVerLib PlaYUVerLib_Stream
@@ -100,21 +80,8 @@ public:
   String getFormatName();
   String getCodecName();
 
-  Bool open( String filename,
-             String resolution,
-             String input_format,
-             UInt bitsPel,
-             Int endianness,
-             UInt frame_rate,
-             Bool bInput );
-  Bool open( String filename,
-             UInt width,
-             UInt height,
-             Int input_format,
-             UInt bitsPel,
-             Int endianness,
-             UInt frame_rate,
-             Bool bInput );
+  Bool open( String filename, String resolution, String input_format, UInt bitsPel, Int endianness, UInt frame_rate, Bool bInput );
+  Bool open( String filename, UInt width, UInt height, Int input_format, UInt bitsPel, Int endianness, UInt frame_rate, Bool bInput );
   Bool reload();
   Void close();
 
@@ -125,12 +92,7 @@ public:
   Int getEndianess() const;
   Int getCurrFrameNum();
   Double getFrameRate();
-  Void getFormat( UInt& rWidth,
-                  UInt& rHeight,
-                  Int& rInputFormat,
-                  UInt& rBitsPerPel,
-                  Int& rEndianness,
-                  UInt& rFrameRate );
+  Void getFormat( UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rBitsPerPel, Int& rEndianness, UInt& rFrameRate );
 
   Void loadAll();
 
diff --git a/lib/PlaYUVerStreamHandlerIf.h b/lib/PlaYUVerStreamHandlerIf.h
index 26d8d6e..7b06e94 100644
--- a/lib/PlaYUVerStreamHandlerIf.h
+++ b/lib/PlaYUVerStreamHandlerIf.h
@@ -30,10 +30,36 @@
 
 class PlaYUVerFrame;
 
-#define REGISTER_STREAM_HANDLER( X )                           \
-public:                                                        \
-  static PlaYUVerStreamHandlerIf* Create() { return new X(); } \
-  void Delete() { delete this; }
+#define INI_REGIST_PLAYUVER_SUPPORTED_FMT           \
+  std::vector<PlaYUVerSupportedFormat> formatsList; \
+  PlaYUVerSupportedFormat formatElem;
+
+#define END_REGIST_PLAYUVER_SUPPORTED_FMT return formatsList;
+
+#define REGIST_PLAYUVER_SUPPORTED_FMT( handler, name, ext ) \
+  formatElem.formatName = name;                             \
+  formatElem.formatExt = lowercase( ext );                  \
+  formatElem.formatFct = handler;                           \
+  formatsList.push_back( formatElem );
+
+#define REGIST_PLAYUVER_SUPPORTED_ABSTRACT_FMT( handler, name, pattern ) \
+  formatElem.formatPattern = pattern;                                    \
+  REGIST_PLAYUVER_SUPPORTED_FMT( handler, name, "" )
+
+#define APPEND_PLAYUVER_SUPPORTED_FMT( class_name, fct )                                   \
+  {                                                                                        \
+    std::vector<PlaYUVerSupportedFormat> new_fmts = class_name::supported##fct##Formats(); \
+    formatsList.insert( formatsList.end(), new_fmts.begin(), new_fmts.end() );             \
+  }
+
+#define REGISTER_STREAM_HANDLER( X )                                   \
+public:                                                                \
+  static PlaYUVerStreamHandlerIf* Create() { return new X(); }         \
+  void Delete() { delete this; }                                       \
+  static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();  \
+  static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats(); \
+  // static Int checkforSupportedFile( String, Bool );
+
 /**
  * \class PlaYUVerStreamHandlerIf
  * \ingroup  PlaYUVerLib_Stream
diff --git a/lib/StreamHandlerLibav.cpp b/lib/StreamHandlerLibav.cpp
index c6892b0..44df585 100644
--- a/lib/StreamHandlerLibav.cpp
+++ b/lib/StreamHandlerLibav.cpp
@@ -40,17 +40,15 @@ std::vector<PlaYUVerSupportedFormat> StreamHandlerLibav::supportedReadFormats()
 {
   INI_REGIST_PLAYUVER_SUPPORTED_FMT;
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Portable Network Graphics", "png" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Joint Photographic Experts Group",
-                                 "jpg" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Joint Photographic Experts Group", "jpg,jpeg" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Windows Bitmap", "bmp" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Tagged Image File Format", "tiff" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Audio video interleaved", "avi" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Windows media video", "wmv" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "MPEG4", "mp4" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Matroska Multimedia Container",
-                                 "mkv" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "H.264 streams", "h264" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "HEVC streams", "hevc" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "Matroska Multimedia Container", "mkv" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "H.264 streams", "264,h264" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerLibav::Create, "HEVC streams", "265,hevc" );
   END_REGIST_PLAYUVER_SUPPORTED_FMT;
 }
 
@@ -60,6 +58,38 @@ std::vector<PlaYUVerSupportedFormat> StreamHandlerLibav::supportedWriteFormats()
   END_REGIST_PLAYUVER_SUPPORTED_FMT;
 }
 
+StreamHandlerLibav::StreamHandlerLibav()
+{
+  /* register all formats and codecs */
+  av_register_all();
+}
+
+// Int StreamHandlerLibav::checkforSupportedFile( String strFilename, Bool bRead )
+//{
+//  Int iRet;
+
+//  /* register all formats and codecs */
+//  av_register_all();
+
+//  AVDictionary* fmtOpts = NULL;
+//  AVFormatContext* fmtCtx;
+
+//  /* register all formats and codecs */
+//  av_register_all();
+
+//  /* open input file, and allocate format context */
+//  if( ( iRet = avformat_open_input( &fmtCtx, strFilename.c_str(), NULL, &fmtOpts ) ) < 0 )
+//  {
+//    return iRet;
+//  }
+//  /* retrieve stream information */
+//  iRet = avformat_find_stream_info( fmtCtx, NULL );
+
+//  /* close format context */
+//  avformat_close_input( &fmtCtx );
+//  return iRet < 0 ? 0 : 1;
+//}
+
 Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
 {
   const char* filename = strFilename.c_str();
@@ -77,9 +107,6 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
 
   AVDictionary* format_opts = NULL;
 
-  /* register all formats and codecs */
-  av_register_all();
-
   //   if( width > 0 && height > 0 )
   //   {
   //     Char aux_string[10];
@@ -143,15 +170,13 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
   }
 
 #ifdef FF_USER_CODEC_PARAM
-  m_uiFrameBufferSize = av_image_get_buffer_size( AVPixelFormat( codec_param->format ),
-                                                  codec_param->width, codec_param->height, 1 );
+  m_uiFrameBufferSize = av_image_get_buffer_size( AVPixelFormat( codec_param->format ), codec_param->width, codec_param->height, 1 );
 
   Int pix_fmt = codec_param->format;
   m_uiWidth = codec_param->width;
   m_uiHeight = codec_param->height;
 #else
-  m_uiFrameBufferSize = av_image_get_buffer_size(
-      m_cStream->codec->pix_fmt, m_cStream->codec->width, m_cStream->codec->height, 1 );
+  m_uiFrameBufferSize = av_image_get_buffer_size( m_cStream->codec->pix_fmt, m_cStream->codec->width, m_cStream->codec->height, 1 );
 
   Int pix_fmt = m_cStream->codec->pix_fmt;
   m_uiWidth = m_cStream->codec->width;
@@ -373,12 +398,10 @@ Bool StreamHandlerLibav::read( PlaYUVerFrame* pcFrame )
   {
 #ifdef FF_USER_CODEC_PARAM
     AVCodecParameters* codec_param = m_cStream->codecpar;
-    av_image_copy_to_buffer( m_pStreamBuffer, m_uiFrameBufferSize, m_cFrame->data,
-                             m_cFrame->linesize, AVPixelFormat( codec_param->format ),
+    av_image_copy_to_buffer( m_pStreamBuffer, m_uiFrameBufferSize, m_cFrame->data, m_cFrame->linesize, AVPixelFormat( codec_param->format ),
                              codec_param->width, codec_param->height, 1 );
 #else
-    av_image_copy_to_buffer( m_pStreamBuffer, m_uiFrameBufferSize, m_cFrame->data,
-                             m_cFrame->linesize, m_cCodedCtx->pix_fmt, m_cCodedCtx->width,
+    av_image_copy_to_buffer( m_pStreamBuffer, m_uiFrameBufferSize, m_cFrame->data, m_cFrame->linesize, m_cCodedCtx->pix_fmt, m_cCodedCtx->width,
                              m_cCodedCtx->height, 1 );
 
 #endif
diff --git a/lib/StreamHandlerLibav.h b/lib/StreamHandlerLibav.h
index 514d1c4..06753be 100644
--- a/lib/StreamHandlerLibav.h
+++ b/lib/StreamHandlerLibav.h
@@ -59,10 +59,7 @@ class StreamHandlerLibav : public PlaYUVerStreamHandlerIf
   REGISTER_STREAM_HANDLER( StreamHandlerLibav )
 
 public:
-  static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
-  static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
-
-  StreamHandlerLibav() {}
+  StreamHandlerLibav();
   ~StreamHandlerLibav() {}
   Bool openHandler( String strFilename, Bool bInput );
   Void closeHandler();
diff --git a/lib/StreamHandlerOpenCV.cpp b/lib/StreamHandlerOpenCV.cpp
index a40d925..01317f4 100644
--- a/lib/StreamHandlerOpenCV.cpp
+++ b/lib/StreamHandlerOpenCV.cpp
@@ -51,8 +51,7 @@ std::vector<PlaYUVerSupportedFormat> StreamHandlerOpenCV::supportedWriteFormats(
   INI_REGIST_PLAYUVER_SUPPORTED_FMT;
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerOpenCV::Create, "Portable PixMap ", "ppm" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerOpenCV::Create, "Portable Network Graphics", "png" );
-  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerOpenCV::Create, "Joint Photographic Experts Group",
-                                 "jpg" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerOpenCV::Create, "Joint Photographic Experts Group", "jpg" );
   REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerOpenCV::Create, "Windows Bitmap", "bmp" );
   END_REGIST_PLAYUVER_SUPPORTED_FMT;
 }
@@ -89,8 +88,7 @@ Bool StreamHandlerOpenCV::openHandler( String strFilename, Bool bInput )
     else
 #endif
     {
-      m_strCodecName = m_strFormatName =
-          uppercase( strFilename.substr( strFilename.find_last_of( "." ) + 1 ) );
+      m_strCodecName = m_strFormatName = uppercase( strFilename.substr( strFilename.find_last_of( "." ) + 1 ) );
       Mat cvMat = cv::imread( m_cFilename );
       m_uiWidth = cvMat.cols;
       m_uiHeight = cvMat.rows;
diff --git a/lib/StreamHandlerOpenCV.h b/lib/StreamHandlerOpenCV.h
index 26ccf04..a5f229f 100644
--- a/lib/StreamHandlerOpenCV.h
+++ b/lib/StreamHandlerOpenCV.h
@@ -40,9 +40,6 @@ class StreamHandlerOpenCV : public PlaYUVerStreamHandlerIf
   REGISTER_STREAM_HANDLER( StreamHandlerOpenCV )
 
 public:
-  static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
-  static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
-
   StreamHandlerOpenCV();
   ~StreamHandlerOpenCV() {}
   Bool openHandler( String strFilename, Bool bInput );
diff --git a/lib/StreamHandlerPortableMap.cpp b/lib/StreamHandlerPortableMap.cpp
index af27be3..568cee8 100644
--- a/lib/StreamHandlerPortableMap.cpp
+++ b/lib/StreamHandlerPortableMap.cpp
@@ -29,6 +29,23 @@
 #include <cmath>
 #include <cstdio>
 
+std::vector<PlaYUVerSupportedFormat> StreamHandlerPortableMap::supportedReadFormats()
+{
+  INI_REGIST_PLAYUVER_SUPPORTED_FMT;
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable BitMap ", "pbm" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable GrayMap ", "pgm" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable PixMap ", "ppm" );
+  END_REGIST_PLAYUVER_SUPPORTED_FMT;
+}
+
+std::vector<PlaYUVerSupportedFormat> StreamHandlerPortableMap::supportedWriteFormats()
+{
+  INI_REGIST_PLAYUVER_SUPPORTED_FMT;
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable BitMap ", "pbm" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable GrayMap ", "pgm" );
+  END_REGIST_PLAYUVER_SUPPORTED_FMT;
+}
+
 Bool StreamHandlerPortableMap::openHandler( String strFilename, Bool bInput )
 {
   m_bIsInput = bInput;
@@ -62,8 +79,7 @@ Bool StreamHandlerPortableMap::openHandler( String strFilename, Bool bInput )
         ;
       sscanf( line, "%d", &m_iMaxValue );
       m_uiBitsPerPixel = log( m_iMaxValue + 1 ) / log( 2 );
-      m_iPixelFormat =
-          m_iMagicNumber == 2 || m_iMagicNumber == 5 ? PlaYUVerFrame::GRAY : PlaYUVerFrame::RGB24;
+      m_iPixelFormat = m_iMagicNumber == 2 || m_iMagicNumber == 5 ? PlaYUVerFrame::GRAY : PlaYUVerFrame::RGB24;
     }
   }
   else
diff --git a/lib/StreamHandlerRaw.cpp b/lib/StreamHandlerRaw.cpp
index 08b7d1c..8575061 100644
--- a/lib/StreamHandlerRaw.cpp
+++ b/lib/StreamHandlerRaw.cpp
@@ -30,6 +30,22 @@
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerFramePixelFormats.h"
 
+std::vector<PlaYUVerSupportedFormat> StreamHandlerRaw::supportedReadFormats()
+{
+  INI_REGIST_PLAYUVER_SUPPORTED_FMT;
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw YUV Video", "yuv" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Gray Video", "gray" );
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw RGB Video", "rgb" );
+  END_REGIST_PLAYUVER_SUPPORTED_FMT;
+}
+
+std::vector<PlaYUVerSupportedFormat> StreamHandlerRaw::supportedWriteFormats()
+{
+  INI_REGIST_PLAYUVER_SUPPORTED_FMT;
+  REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Video", "yuv" );
+  END_REGIST_PLAYUVER_SUPPORTED_FMT;
+}
+
 Bool StreamHandlerRaw::openHandler( String strFilename, Bool bInput )
 {
   m_bIsInput = bInput;
diff --git a/modules/AbsoluteFrameDifference.cpp b/modules/AbsoluteFrameDifference.cpp
index 30d642d..c5ae77f 100644
--- a/modules/AbsoluteFrameDifference.cpp
+++ b/modules/AbsoluteFrameDifference.cpp
@@ -51,13 +51,11 @@ Bool AbsoluteFrameDifference::create( std::vector<PlaYUVerFrame*> apcFrameList )
   _BASIC_MODULE_API_2_CHECK_
 
   for( UInt i = 1; i < apcFrameList.size(); i++ )
-    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE |
-                                                            PlaYUVerFrame::MATCH_RESOLUTION |
-                                                            PlaYUVerFrame::MATCH_BITS ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0],
+                                       PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_RESOLUTION | PlaYUVerFrame::MATCH_BITS ) )
       return false;
 
-  m_pcFrameDifference = new PlaYUVerFrame( apcFrameList[0]->getWidth(),
-                                           apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
+  m_pcFrameDifference = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
   return true;
 }
 
diff --git a/modules/DisparityStereoBM.cpp b/modules/DisparityStereoBM.cpp
index e12d49a..e3838ba 100644
--- a/modules/DisparityStereoBM.cpp
+++ b/modules/DisparityStereoBM.cpp
@@ -36,8 +36,7 @@ DisparityStereoBM::DisparityStereoBM()
       "Measure the disparity between two images using the "
       "Stereo BM method (OpenCV)";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
-  m_uiModuleRequirements =
-      MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
+  m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
 
   m_cModuleOptions.addOptions() /**/
       ( "block_size", m_uiBlockSize, "Block Size (positive odd number) [9]" );
@@ -49,8 +48,7 @@ DisparityStereoBM::DisparityStereoBM()
 Bool DisparityStereoBM::create( std::vector<PlaYUVerFrame*> apcFrameList )
 {
   _BASIC_MODULE_API_2_CHECK_
-  m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                          PlaYUVerFrame::GRAY );
+  m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
   if( ( m_uiBlockSize % 2 ) == 0 )
   {
     m_uiBlockSize++;
diff --git a/modules/DisparityStereoSGBM.cpp b/modules/DisparityStereoSGBM.cpp
index 6e98757..ffb61d9 100644
--- a/modules/DisparityStereoSGBM.cpp
+++ b/modules/DisparityStereoSGBM.cpp
@@ -36,12 +36,10 @@ DisparityStereoSGBM::DisparityStereoSGBM()
       "Measure the disparity between two images using the "
       "Stereo SGBM method (OpenCV)";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
-  m_uiModuleRequirements =
-      MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
+  m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
 
   m_cModuleOptions.addOptions() /**/
-      ( "block_size", m_uiBlockSize, "Block Size (positive odd number) [3]" )(
-          "HHAlgorithm", m_bUseHH, "Use HH algorithm [false]" );
+      ( "block_size", m_uiBlockSize, "Block Size (positive odd number) [3]" )( "HHAlgorithm", m_bUseHH, "Use HH algorithm [false]" );
 
   m_pcDisparityFrame = NULL;
   m_uiBlockSize = 3;
@@ -51,8 +49,7 @@ DisparityStereoSGBM::DisparityStereoSGBM()
 Bool DisparityStereoSGBM::create( std::vector<PlaYUVerFrame*> apcFrameList )
 {
   _BASIC_MODULE_API_2_CHECK_
-  m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                          PlaYUVerFrame::GRAY );
+  m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
   if( ( m_uiBlockSize % 2 ) == 0 )
   {
     m_uiBlockSize++;
diff --git a/modules/DisparityStereoVar.cpp b/modules/DisparityStereoVar.cpp
index fc018f2..5e5c79e 100644
--- a/modules/DisparityStereoVar.cpp
+++ b/modules/DisparityStereoVar.cpp
@@ -50,15 +50,14 @@ DisparityStereoVar::DisparityStereoVar()
   m_cStereoVar.lambda = 0.03f;
   m_cStereoVar.penalization = m_cStereoVar.PENALIZATION_TICHONOV;  // ignored with USE_AUTO_PARAMS
   m_cStereoVar.cycle = m_cStereoVar.CYCLE_V;                       // ignored with USE_AUTO_PARAMS
-  m_cStereoVar.flags = m_cStereoVar.USE_SMART_ID | m_cStereoVar.USE_AUTO_PARAMS |
-                       m_cStereoVar.USE_INITIAL_DISPARITY | m_cStereoVar.USE_MEDIAN_FILTERING;
+  m_cStereoVar.flags =
+      m_cStereoVar.USE_SMART_ID | m_cStereoVar.USE_AUTO_PARAMS | m_cStereoVar.USE_INITIAL_DISPARITY | m_cStereoVar.USE_MEDIAN_FILTERING;
 }
 
 Bool DisparityStereoVar::create( std::vector<PlaYUVerFrame*> apcFrameList )
 {
   _BASIC_MODULE_API_2_CHECK_
-  m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                          PlaYUVerFrame::GRAY );
+  m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
   m_cStereoVar.minDisp = -( ( ( apcFrameList[0]->getWidth() / 8 ) + 15 ) & -16 );
   return true;
 }
diff --git a/modules/EightBitsSampling.cpp b/modules/EightBitsSampling.cpp
index c59f995..1e64273 100644
--- a/modules/EightBitsSampling.cpp
+++ b/modules/EightBitsSampling.cpp
@@ -43,9 +43,7 @@ Bool EightBitsSampling::create( std::vector<PlaYUVerFrame*> apcFrameList )
   if( apcFrameList[0]->getBitsPel() > 8 )
   {
     m_pcSubSampledFrame = NULL;
-    m_pcSubSampledFrame =
-        new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                           apcFrameList[0]->getPelFormat(), 8 );
+    m_pcSubSampledFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), apcFrameList[0]->getPelFormat(), 8 );
     return true;
   }
   return false;
diff --git a/modules/FilterComponent.cpp b/modules/FilterComponent.cpp
index 5048195..5526820 100644
--- a/modules/FilterComponent.cpp
+++ b/modules/FilterComponent.cpp
@@ -42,8 +42,7 @@ PlaYUVerFrame* FilterComponentModule::filterComponent( PlaYUVerFrame* InputFrame
 {
   Pel*** pppOutputPelYUV = m_pcFilteredFrame->getPelBufferYUV();
   Pel*** pppInputPelYUV = InputFrame->getPelBufferYUV();
-  memcpy( pppOutputPelYUV[LUMA][0], pppInputPelYUV[Component][0],
-          m_pcFilteredFrame->getWidth() * m_pcFilteredFrame->getHeight() * sizeof( Pel ) );
+  memcpy( pppOutputPelYUV[LUMA][0], pppInputPelYUV[Component][0], m_pcFilteredFrame->getWidth() * m_pcFilteredFrame->getHeight() * sizeof( Pel ) );
   return m_pcFilteredFrame;
 }
 
@@ -75,8 +74,7 @@ FilterComponentLuma::FilterComponentLuma()
 
 Bool FilterComponentLuma::create( std::vector<PlaYUVerFrame*> apcFrameList )
 {
-  return createFilter( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                       apcFrameList[0]->getBitsPel() );
+  return createFilter( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), apcFrameList[0]->getBitsPel() );
 }
 
 PlaYUVerFrame* FilterComponentLuma::process( std::vector<PlaYUVerFrame*> apcFrameList )
@@ -100,8 +98,7 @@ Bool FilterComponentChromaU::create( std::vector<PlaYUVerFrame*> apcFrameList )
 {
   if( apcFrameList[0]->getNumberChannels() > 1 )
   {
-    return createFilter( apcFrameList[0]->getChromaWidth(), apcFrameList[0]->getChromaHeight(),
-                         apcFrameList[0]->getBitsPel() );
+    return createFilter( apcFrameList[0]->getChromaWidth(), apcFrameList[0]->getChromaHeight(), apcFrameList[0]->getBitsPel() );
   }
   return false;
 }
@@ -127,8 +124,7 @@ Bool FilterComponentChromaV::create( std::vector<PlaYUVerFrame*> apcFrameList )
 {
   if( apcFrameList[0]->getNumberChannels() > 1 )
   {
-    return createFilter( apcFrameList[0]->getChromaWidth(), apcFrameList[0]->getChromaHeight(),
-                         apcFrameList[0]->getBitsPel() );
+    return createFilter( apcFrameList[0]->getChromaWidth(), apcFrameList[0]->getChromaHeight(), apcFrameList[0]->getBitsPel() );
   }
   return false;
 }
diff --git a/modules/FrameCrop.cpp b/modules/FrameCrop.cpp
index 3d64d4e..a67b35d 100644
--- a/modules/FrameCrop.cpp
+++ b/modules/FrameCrop.cpp
@@ -34,12 +34,10 @@ FrameCrop::FrameCrop()
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
   m_uiModuleRequirements = MODULE_REQUIRES_OPTIONS;
 
-  m_cModuleOptions.addOptions() /**/
-      ( "xPosition", m_uiXPosition,
-        "X cordinate of the left-top corner of the crop region [0]" ) /**/
-      ( "yPosition", m_uiYPosition,
-        "Y cordinate of the left-top corner of the crop region [0]" ) /**/
-      ( "width", m_iXSize, "Width of the crop region [-1]" )          /**/
+  m_cModuleOptions.addOptions()                                                                   /**/
+      ( "xPosition", m_uiXPosition, "X cordinate of the left-top corner of the crop region [0]" ) /**/
+      ( "yPosition", m_uiYPosition, "Y cordinate of the left-top corner of the crop region [0]" ) /**/
+      ( "width", m_iXSize, "Width of the crop region [-1]" )                                      /**/
       ( "height", m_iYSize, "Height of the crop region [-1]" );
 
   m_pcCropedFrame = NULL;
@@ -60,8 +58,7 @@ Void FrameCrop::create( PlaYUVerFrame* frame )
   {
     m_iYSize = frame->getHeight() - m_uiYPosition;
   }
-  m_pcCropedFrame =
-      new PlaYUVerFrame( m_iXSize, m_iYSize, frame->getPelFormat(), frame->getBitsPel() );
+  m_pcCropedFrame = new PlaYUVerFrame( m_iXSize, m_iYSize, frame->getPelFormat(), frame->getBitsPel() );
 }
 
 PlaYUVerFrame* FrameCrop::process( PlaYUVerFrame* frame )
diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp
index c89546a..4c380b5 100644
--- a/modules/FrameDifference.cpp
+++ b/modules/FrameDifference.cpp
@@ -52,8 +52,7 @@ Bool FrameDifference::create( std::vector<PlaYUVerFrame*> apcFrameList )
   UInt uiMaxBitsPixel = 0;
   for( UInt i = 0; i < apcFrameList.size(); i++ )
   {
-    if( !apcFrameList[i]->haveSameFmt(
-            apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_RESOLUTION ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_RESOLUTION ) )
       return false;
     if( apcFrameList[i]->getBitsPel() > uiMaxBitsPixel )
     {
@@ -69,9 +68,7 @@ Bool FrameDifference::create( std::vector<PlaYUVerFrame*> apcFrameList )
   m_iDiffBitShift = ( uiMaxBitsPixel + 1 ) - m_uiBitsPixel;
   m_iMaxDiffValue = ( 1 << ( m_uiBitsPixel - 1 ) );
 
-  m_pcFrameDifference =
-      new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                         PlaYUVerFrame::GRAY, m_uiBitsPixel );
+  m_pcFrameDifference = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY, m_uiBitsPixel );
   return true;
 }
 
diff --git a/modules/FrameMask.cpp b/modules/FrameMask.cpp
index 8efb70e..ce6ec3f 100644
--- a/modules/FrameMask.cpp
+++ b/modules/FrameMask.cpp
@@ -49,9 +49,8 @@ Bool FrameMask::create( std::vector<PlaYUVerFrame*> apcFrameList )
 
   for( UInt i = 1; i < apcFrameList.size(); i++ )
   {
-    if( !apcFrameList[i]->haveSameFmt(
-            apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE_IGNORE_GRAY |
-                                 PlaYUVerFrame::MATCH_RESOLUTION | PlaYUVerFrame::MATCH_BITS ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0],
+                                       PlaYUVerFrame::MATCH_COLOR_SPACE_IGNORE_GRAY | PlaYUVerFrame::MATCH_RESOLUTION | PlaYUVerFrame::MATCH_BITS ) )
     {
       return false;
     }
@@ -79,8 +78,7 @@ Bool FrameMask::create( std::vector<PlaYUVerFrame*> apcFrameList )
     break;
   }
 
-  m_pcFrameProcessed = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                          iPelFmt, apcFrameList[0]->getBitsPel() );
+  m_pcFrameProcessed = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), iPelFmt, apcFrameList[0]->getBitsPel() );
   return true;
 }
 
diff --git a/modules/FrameShift.cpp b/modules/FrameShift.cpp
index d7bce39..71bd71f 100644
--- a/modules/FrameShift.cpp
+++ b/modules/FrameShift.cpp
@@ -58,13 +58,11 @@ PlaYUVerFrame* FrameShift::process( std::vector<PlaYUVerFrame*> apcFrameList )
 
   UInt xStartOut = m_iShiftHor >= 0 ? m_iShiftHor : 0;
   UInt xStartIn = m_iShiftHor >= 0 ? 0 : -m_iShiftHor;
-  UInt xEndOut = m_iShiftHor >= 0 ? m_pcProcessedFrame->getWidth()
-                                  : m_pcProcessedFrame->getWidth() + m_iShiftHor;
+  UInt xEndOut = m_iShiftHor >= 0 ? m_pcProcessedFrame->getWidth() : m_pcProcessedFrame->getWidth() + m_iShiftHor;
 
   UInt yStartOut = m_iShiftVer >= 0 ? m_iShiftVer : 0;
   UInt yStartIn = m_iShiftVer >= 0 ? 0 : -m_iShiftVer;
-  UInt yEndOut = m_iShiftVer >= 0 ? m_pcProcessedFrame->getHeight()
-                                  : m_pcProcessedFrame->getHeight() + m_iShiftVer;
+  UInt yEndOut = m_iShiftVer >= 0 ? m_pcProcessedFrame->getHeight() : m_pcProcessedFrame->getHeight() + m_iShiftVer;
 
   m_pcProcessedFrame->clear();
 
@@ -85,13 +83,11 @@ PlaYUVerFrame* FrameShift::process( std::vector<PlaYUVerFrame*> apcFrameList )
 
   xStartOut = iShiftHorChroma >= 0 ? iShiftHorChroma : 0;
   xStartIn = iShiftHorChroma >= 0 ? 0 : -iShiftHorChroma;
-  xEndOut = iShiftHorChroma >= 0 ? m_pcProcessedFrame->getChromaWidth()
-                                 : m_pcProcessedFrame->getChromaWidth() + iShiftHorChroma;
+  xEndOut = iShiftHorChroma >= 0 ? m_pcProcessedFrame->getChromaWidth() : m_pcProcessedFrame->getChromaWidth() + iShiftHorChroma;
 
   yStartOut = iShiftVerChroma >= 0 ? iShiftVerChroma : 0;
   yStartIn = iShiftVerChroma >= 0 ? 0 : -iShiftVerChroma;
-  yEndOut = iShiftVerChroma >= 0 ? m_pcProcessedFrame->getChromaHeight()
-                                 : m_pcProcessedFrame->getChromaHeight() + iShiftVerChroma;
+  yEndOut = iShiftVerChroma >= 0 ? m_pcProcessedFrame->getChromaHeight() : m_pcProcessedFrame->getChromaHeight() + iShiftVerChroma;
 
   for( UInt c = 1; c < m_pcProcessedFrame->getNumberChannels(); c++ )
   {
diff --git a/modules/InterFrameVariance.cpp b/modules/InterFrameVariance.cpp
index fb014aa..414f77d 100644
--- a/modules/InterFrameVariance.cpp
+++ b/modules/InterFrameVariance.cpp
@@ -51,13 +51,11 @@ Bool InterFrameVariance::create( std::vector<PlaYUVerFrame*> apcFrameList )
   _BASIC_MODULE_API_2_CHECK_
 
   for( UInt i = 1; i < apcFrameList.size(); i++ )
-    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE |
-                                                            PlaYUVerFrame::MATCH_RESOLUTION |
-                                                            PlaYUVerFrame::MATCH_BITS ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0],
+                                       PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_RESOLUTION | PlaYUVerFrame::MATCH_BITS ) )
       return false;
 
-  m_pcFrameVariance = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                         PlaYUVerFrame::GRAY, 8 );
+  m_pcFrameVariance = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY, 8 );
   getMem2D( &m_pVariance, apcFrameList[0]->getHeight(), apcFrameList[0]->getWidth() );
 
   return true;
diff --git a/modules/MeasureOpticalFlowDualTVL1.cpp b/modules/MeasureOpticalFlowDualTVL1.cpp
index d224981..bc60914 100644
--- a/modules/MeasureOpticalFlowDualTVL1.cpp
+++ b/modules/MeasureOpticalFlowDualTVL1.cpp
@@ -40,12 +40,10 @@ MeasureOpticalFlowDualTVL1::MeasureOpticalFlowDualTVL1()
   m_pchModuleName = "MeasureOpticalFlowDualTVL1";
   m_pchModuleTooltip = "Measure optical flow";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
-  m_uiModuleRequirements =
-      MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
+  m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
 
   m_cModuleOptions.addOptions() /**/
-      ( "Show reconstruction", m_bShowReconstruction,
-        "Show reconstructed frame instead of MVs [false]" );
+      ( "Show reconstruction", m_bShowReconstruction, "Show reconstructed frame instead of MVs [false]" );
 
   m_bShowReconstruction = false;
   m_pcOutputFrame = NULL;
@@ -56,15 +54,13 @@ Bool MeasureOpticalFlowDualTVL1::create( std::vector<PlaYUVerFrame*> apcFrameLis
   _BASIC_MODULE_API_2_CHECK_
 
   for( UInt i = 1; i < apcFrameList.size(); i++ )
-    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE |
-                                                            PlaYUVerFrame::MATCH_RESOLUTION |
-                                                            PlaYUVerFrame::MATCH_BITS ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0],
+                                       PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_RESOLUTION | PlaYUVerFrame::MATCH_BITS ) )
       return false;
 
   m_iStep = 16;
   m_cTvl1 = cv::createOptFlow_DualTVL1();
-  m_pcOutputFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                       PlaYUVerFrame::GRAY );
+  m_pcOutputFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
 
   return true;
 }
diff --git a/modules/OpticalFlow.cpp b/modules/OpticalFlow.cpp
index 5b965f7..17509d6 100644
--- a/modules/OpticalFlow.cpp
+++ b/modules/OpticalFlow.cpp
@@ -45,12 +45,10 @@ OpticalFlowModule::OpticalFlowModule()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "OpticalFlow";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
-  m_uiModuleRequirements =
-      MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
+  m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
 
   m_cModuleOptions.addOptions() /**/
-      ( "Show reconstruction", m_bShowReconstruction,
-        "Show reconstructed frame instead of MVs [false]" );
+      ( "Show reconstruction", m_bShowReconstruction, "Show reconstructed frame instead of MVs [false]" );
 
   m_bShowReconstruction = false;
   m_pcOutputFrame = NULL;
@@ -61,14 +59,12 @@ Bool OpticalFlowModule::commonCreate( std::vector<PlaYUVerFrame*> apcFrameList )
   _BASIC_MODULE_API_2_CHECK_
 
   for( UInt i = 1; i < apcFrameList.size(); i++ )
-    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE |
-                                                            PlaYUVerFrame::MATCH_RESOLUTION |
-                                                            PlaYUVerFrame::MATCH_BITS ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[0],
+                                       PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_RESOLUTION | PlaYUVerFrame::MATCH_BITS ) )
       return false;
 
   m_iStep = 16;
-  m_pcOutputFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
-                                       PlaYUVerFrame::GRAY );
+  m_pcOutputFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
 
   return true;
 }
diff --git a/modules/SetChromaHalfScale.cpp b/modules/SetChromaHalfScale.cpp
index 4c0e24d..64929a0 100644
--- a/modules/SetChromaHalfScale.cpp
+++ b/modules/SetChromaHalfScale.cpp
@@ -40,8 +40,7 @@ SetChromaHalfScale::SetChromaHalfScale()
 Void SetChromaHalfScale::create( PlaYUVerFrame* frame )
 {
   m_pcProcessedFrame = NULL;
-  m_pcProcessedFrame = new PlaYUVerFrame( frame->getWidth(), frame->getHeight(),
-                                          frame->getPelFormat(), frame->getBitsPel() );
+  m_pcProcessedFrame = new PlaYUVerFrame( frame->getWidth(), frame->getHeight(), frame->getPelFormat(), frame->getBitsPel() );
 }
 
 PlaYUVerFrame* SetChromaHalfScale::process( PlaYUVerFrame* frame )
diff --git a/modules/WeightedPSNR.cpp b/modules/WeightedPSNR.cpp
index 7a9bfa9..e8c358e 100644
--- a/modules/WeightedPSNR.cpp
+++ b/modules/WeightedPSNR.cpp
@@ -57,8 +57,7 @@ Bool WeightedPSNR::create( std::vector<PlaYUVerFrame*> apcFrameList )
   }
   for( UInt i = 1; i < apcFrameList.size(); i++ )
   {
-    if( !apcFrameList[i]->haveSameFmt(
-            apcFrameList[1], PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_BITS ) )
+    if( !apcFrameList[i]->haveSameFmt( apcFrameList[1], PlaYUVerFrame::MATCH_COLOR_SPACE | PlaYUVerFrame::MATCH_BITS ) )
       return false;
   }
   return true;
diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp
index 896ab4f..7db92b0 100644
--- a/tools/PlaYUVerTools.cpp
+++ b/tools/PlaYUVerTools.cpp
@@ -102,8 +102,7 @@ Int PlaYUVerTools::openInputs()
       pcStream = new PlaYUVerStream;
       try
       {
-        if( !pcStream->open( inputFileNames[i], resolutionString, fmtString, uiBitPerPixel,
-                             uiEndianness, 1, true ) )
+        if( !pcStream->open( inputFileNames[i], resolutionString, fmtString, uiBitPerPixel, uiEndianness, 1, true ) )
         {
           log( LOG_ERROR, "Cannot open input stream %s! ", inputFileNames[i].c_str() );
           return 2;
@@ -112,8 +111,7 @@ Int PlaYUVerTools::openInputs()
       }
       catch( const char* msg )
       {
-        log( LOG_ERROR, "Cannot open input stream %s with the following error: \n%s\n",
-             inputFileNames[i].c_str(), msg );
+        log( LOG_ERROR, "Cannot open input stream %s with the following error: \n%s\n", inputFileNames[i].c_str(), msg );
         return 2;
       }
     }
@@ -129,8 +127,7 @@ Int PlaYUVerTools::openInputs()
   for( UInt i = 0; i < m_apcInputStreams.size(); i++ )
   {
     m_uiNumberOfFrames = std::min( m_uiNumberOfFrames, m_apcInputStreams[i]->getFrameNum() );
-    m_uiNumberOfComponents = std::min( m_uiNumberOfComponents,
-                                       m_apcInputStreams[i]->getCurrFrame()->getNumberChannels() );
+    m_uiNumberOfComponents = std::min( m_uiNumberOfComponents, m_apcInputStreams[i]->getCurrFrame()->getNumberChannels() );
   }
 
   return 0;
@@ -214,14 +211,12 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
     PlaYUVerStream* pcOutputStream = new PlaYUVerStream;
     try
     {
-      pcOutputStream->open( m_pcOutputFileNames[0], pcInputFrame->getWidth(),
-                            pcInputFrame->getHeight(), pcInputFrame->getPelFormat(),
+      pcOutputStream->open( m_pcOutputFileNames[0], pcInputFrame->getWidth(), pcInputFrame->getHeight(), pcInputFrame->getPelFormat(),
                             pcInputFrame->getBitsPel(), PLAYUVER_LITTLE_ENDIAN, 1, false );
     }
     catch( const char* msg )
     {
-      log( LOG_ERROR, "Cannot open input stream %s with the following error %s!\n",
-           m_pcOutputFileNames[0].c_str(), msg );
+      log( LOG_ERROR, "Cannot open input stream %s with the following error %s!\n", m_pcOutputFileNames[0].c_str(), msg );
       delete pcOutputStream;
       pcOutputStream = NULL;
       return 2;
@@ -254,8 +249,7 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
     }
     for( UInt i = 0; i < PlaYUVerFrame::supportedQualityMetricsList().size(); i++ )
     {
-      if( lowercase( PlaYUVerFrame::supportedQualityMetricsList()[i] ) ==
-          lowercase( qualityMetric ) )
+      if( lowercase( PlaYUVerFrame::supportedQualityMetricsList()[i] ) == lowercase( qualityMetric ) )
       {
         m_uiQualityMetric = i;
       }
@@ -344,14 +338,12 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
         PlaYUVerStream* pcModStream = new PlaYUVerStream;
         try
         {
-          pcModStream->open( outputFileNames[0], pcModFrame->getWidth(), pcModFrame->getHeight(),
-                             pcModFrame->getPelFormat(), pcModFrame->getBitsPel(),
-                             PLAYUVER_LITTLE_ENDIAN, 1, false );
+          pcModStream->open( outputFileNames[0], pcModFrame->getWidth(), pcModFrame->getHeight(), pcModFrame->getPelFormat(),
+                             pcModFrame->getBitsPel(), PLAYUVER_LITTLE_ENDIAN, 1, false );
         }
         catch( const char* msg )
         {
-          log( LOG_ERROR, "Cannot open input stream %s with the following error %s!\n",
-               outputFileNames[0].c_str(), msg );
+          log( LOG_ERROR, "Cannot open input stream %s with the following error %s!\n", outputFileNames[0].c_str(), msg );
           delete pcModStream;
           pcModStream = NULL;
           return 2;
@@ -427,8 +419,7 @@ Int PlaYUVerTools::RateReductionOperation()
 
 Int PlaYUVerTools::QualityOperation()
 {
-  const char* pchQualityMetricName =
-      PlaYUVerFrame::supportedQualityMetricsList()[m_uiQualityMetric].c_str();
+  const char* pchQualityMetricName = PlaYUVerFrame::supportedQualityMetricsList()[m_uiQualityMetric].c_str();
   PlaYUVerFrame* apcCurrFrame[MAX_NUMBER_INPUTS];
   Bool abEOF[MAX_NUMBER_INPUTS];
   Double adAverageQuality[MAX_NUMBER_INPUTS - 1][PlaYUVerPixel::MAX_NUMBER_COMPONENTS];
@@ -488,8 +479,7 @@ Int PlaYUVerTools::QualityOperation()
       for( UInt c = 0; c < m_uiNumberOfComponents; c++ )
       {
         dQuality = apcCurrFrame[s]->getQuality( m_uiQualityMetric, apcCurrFrame[0], c );
-        adAverageQuality[s - 1][c] =
-            ( adAverageQuality[s - 1][c] * Double( frame ) + dQuality ) / Double( frame + 1 );
+        adAverageQuality[s - 1][c] = ( adAverageQuality[s - 1][c] * Double( frame ) + dQuality ) / Double( frame + 1 );
         log( LOG_RESULT, metric_fmt.c_str(), dQuality );
       }
       log( LOG_RESULT, " " );
@@ -530,8 +520,7 @@ PlaYUVerFrame* PlaYUVerTools::applyFrameModule()
 Int PlaYUVerTools::ModuleOperation()
 {
   std::vector<PlaYUVerFrame*> apcFrameList;
-  log( LOG_INFO, "  Applying Module %s/%s ...\n", m_pcCurrModuleIf->m_pchModuleCategory,
-       m_pcCurrModuleIf->m_pchModuleName );
+  log( LOG_INFO, "  Applying Module %s/%s ...\n", m_pcCurrModuleIf->m_pchModuleCategory, m_pcCurrModuleIf->m_pchModuleName );
 
   PlaYUVerFrame* pcProcessedFrame = NULL;
   Double dMeasurementResult = 0.0;
@@ -574,9 +563,7 @@ Int PlaYUVerTools::ModuleOperation()
       }
       log( LOG_INFO, "   %3d", frame );
       log( LOG_RESULT, "  %8.3f \n", dMeasurementResult );
-      dAveragedMeasurementResult =
-          ( dAveragedMeasurementResult * Double( frame ) + dMeasurementResult ) /
-          Double( frame + 1 );
+      dAveragedMeasurementResult = ( dAveragedMeasurementResult * Double( frame ) + dMeasurementResult ) / Double( frame + 1 );
     }
 
     for( UInt s = 0; s < m_apcInputStreams.size(); s++ )