Merge branch 'master' into devel

app/DialogSubWindowSelector.h

@@ -61,6 +61,7 @@ class DialogSubWindowSelector : public QDialog
 
   Void selectSubWindow( SubWindowAbstract* subWindow );
   QList<SubWindowAbstract*> getSelectedWindows() { return m_apcSelectedSubWindowList; }
+
  private:
   UInt m_uiCategory;
   Int m_iMinSelectedWindows;

app/HistogramWidget.cpp

@@ -896,10 +896,10 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
         guidePos = d->colorGuide.blue();
         break;
 
-      //     case HistogramWidget::LumaHistogram:
-      //       guidePos = qMax( qMax( d->colorGuide.red(), d->colorGuide.green()
-      //       ), d->colorGuide.blue() );
-      //       break;
+        //     case HistogramWidget::LumaHistogram:
+        //       guidePos = qMax( qMax( d->colorGuide.red(), d->colorGuide.green()
+        //       ), d->colorGuide.blue() );
+        //       break;
 
       default:  // Alpha.
         guidePos = -1;

app/ModuleHandleDock.cpp

@@ -53,9 +53,7 @@ ModuleHandleDock::ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* module
   setEnabled( true );
 }
 
-ModuleHandleDock::~ModuleHandleDock()
-{
-}
+ModuleHandleDock::~ModuleHandleDock() {}
 
 Void ModuleHandleDock::setModulueReturnValue( Double value )
 {

app/ModulesHandle.cpp

@@ -43,9 +43,7 @@ ModulesHandle::ModulesHandle( QWidget* parent,
   setParent( m_pcParent );
 }
 
-ModulesHandle::~ModulesHandle()
-{
-}
+ModulesHandle::~ModulesHandle() {}
 
 Void ModulesHandle::createActions()
 {

app/ModulesHandleOptDialog.cpp

@@ -68,6 +68,7 @@ class OpionConfiguration : public QWidget
     return m_pcValue->text();
   }
   const String& getName() { return m_cName; }
+
  private:
   QLineEdit* m_pcValue;
   QCheckBox* m_pcChecked;

app/PlaYUVerApp.cpp

@@ -392,7 +392,8 @@ Void PlaYUVerApp::reload()
 Void PlaYUVerApp::reloadAll()
 {
   UInt windowCategoryOrder[] = {
-      SubWindowAbstract::VIDEO_STREAM_SUBWINDOW, SubWindowAbstract::MODULE_SUBWINDOW,
+      SubWindowAbstract::VIDEO_STREAM_SUBWINDOW,
+      SubWindowAbstract::MODULE_SUBWINDOW,
       SubWindowAbstract::MODULE_SUBWINDOW,
   };
 
@@ -720,7 +721,7 @@ Void PlaYUVerApp::createActions()
   m_appModuleExtensions->createActions();
   m_pcWindowHandle->createActions();
 
-// ------------ About ------------
+  // ------------ About ------------
 
 #ifdef USE_FERVOR
   m_arrayActions[UPDATE_ACT] = new QAction( tr( "&Update" ), this );

app/PlaYUVerAppAdaptor.cpp

@@ -30,10 +30,10 @@ 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 );
+  Q_ASSERT( isRegistered == true );
 }
 
 PlaYUVerAppAdaptor::~PlaYUVerAppAdaptor()

app/PlaYUVerAppAdaptor.h

@@ -40,7 +40,7 @@ class PlaYUVerApp;
 class PlaYUVerAppAdaptor : public QDBusAbstractAdaptor
 {
   Q_OBJECT
-	Q_CLASSINFO( "D-Bus Interface", PLAYUVER_DBUS_SESSION_NAME )
+  Q_CLASSINFO( "D-Bus Interface", PLAYUVER_DBUS_SESSION_NAME )
   Q_PROPERTY( QString activeSession READ activeSession )
  public:
   PlaYUVerAppAdaptor( PlaYUVerApp* app );

app/PlaYUVerSubWindowHandle.cpp

@@ -177,8 +177,8 @@ 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;
@@ -215,8 +215,8 @@ Void PlaYUVerSubWindowHandle::updateActiveSubWindow( SubWindowAbstract* window )
     }
     if( m_pcActiveWindow )
     {
-      m_pcApp->setWindowTitle( QApplication::applicationName() + " :: " +
-                               m_pcActiveWindow->getWindowName() );
+      m_pcApp->setWindowTitle( QApplication::applicationName() +
+                               " :: " + m_pcActiveWindow->getWindowName() );
     }
   }
 }

app/PlotSubWindow.cpp

@@ -135,9 +135,7 @@ Void PlotSubWindow::zoomToFit()
   normalSize();
 }
 
-Void PlotSubWindow::zoomToFactor( Double factor, QPoint center )
-{
-}
+Void PlotSubWindow::zoomToFactor( Double factor, QPoint center ) {}
 
 Void PlotSubWindow::scaleView( Double scale, QPoint center )
 {

app/QualityHandle.cpp

@@ -39,9 +39,7 @@ QualityHandle::QualityHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowMa
 {
 }
 
-QualityHandle::~QualityHandle()
-{
-}
+QualityHandle::~QualityHandle() {}
 
 Void QualityHandle::createActions()
 {
@@ -190,7 +188,7 @@ Void QualityHandle::measureQuality( QVector<VideoSubWindow*> apcWindowList )
 
   ProgressBar* pcProgressBar = new ProgressBar( m_pcParet, numberOfFrames );
 
-  padQualityValues = new QVector<Double>[ numberOfWindows + 1 ];
+  padQualityValues = new QVector<Double>[numberOfWindows + 1];
 
   PlaYUVerFrame* pcReferenceFrame;
   PlaYUVerFrame* pcCurrFrame;

app/QualityMeasurementSidebar.cpp

@@ -103,9 +103,7 @@ QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent,
            SLOT( slotQualityMetricChanged( int ) ) );
 }
 
-QualityMeasurementSidebar::~QualityMeasurementSidebar()
-{
-}
+QualityMeasurementSidebar::~QualityMeasurementSidebar() {}
 
 QSize QualityMeasurementSidebar::sizeHint() const
 {

app/VideoHandle.cpp

@@ -54,9 +54,7 @@ VideoHandle::VideoHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManage
   m_acPlayingSubWindows.clear();
 }
 
-VideoHandle::~VideoHandle()
-{
-}
+VideoHandle::~VideoHandle() {}
 
 Void VideoHandle::createActions()
 {

app/VideoSubWindow.cpp

@@ -107,6 +107,7 @@ class VideoInformation : public QWidget
     }
   }
   Void setBusyWindow( Bool bFlag ) { m_bBusyWindow = bFlag; }
+
  protected:
   void paintEvent( QPaintEvent* event )
   {

app/ViewArea.cpp

@@ -514,9 +514,9 @@ 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" + "V: " +
-                                QString::number( sPixelValue.Cr() ) );
+                            "Y: " + QString::number( sPixelValue.Y() ) + "\n" +
+                                "U: " + QString::number( sPixelValue.Cb() ) + "\n" +
+                                "V: " + QString::number( sPixelValue.Cr() ) );
         }
         if( frFormat == PlaYUVerPixel::COLOR_GRAY )
         {
@@ -541,9 +541,9 @@ 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" + "B: " +
-                                QString::number( sPixelValue.B() ) );
+                            "R: " + QString::number( sPixelValue.R() ) + "\n" +
+                                "G: " + QString::number( sPixelValue.G() ) + "\n" +
+                                "B: " + QString::number( sPixelValue.B() ) );
         }
       }
     }

app/external/qcustomplot.cpp

@@ -79,9 +79,7 @@ QCPPainter::QCPPainter( QPaintDevice* device )
 #endif
 }
 
-QCPPainter::~QCPPainter()
-{
-}
+QCPPainter::~QCPPainter() {}
 
 /*!
   Sets the pen of the painter and applies certain fixes to it, depending on the
@@ -885,9 +883,10 @@ QCPLayer::~QCPLayer()
     mChildren.last()->setLayer( 0 );  // removes itself from mChildren via removeChild()
 
   if( mParentPlot->currentLayer() == this )
-    qDebug() << Q_FUNC_INFO << "The parent plot's mCurrentLayer will be a "
-                               "dangling pointer. Should have been set to a "
-                               "valid layer or 0 beforehand.";
+    qDebug() << Q_FUNC_INFO
+             << "The parent plot's mCurrentLayer will be a "
+                "dangling pointer. Should have been set to a "
+                "valid layer or 0 beforehand.";
 }
 
 /*!
@@ -1402,10 +1401,7 @@ void QCPLayerable::applyAntialiasingHint( QCPPainter* painter,
 
   \see initializeParentPlot
 */
-void QCPLayerable::parentPlotInitialized( QCustomPlot* parentPlot )
-{
-  Q_UNUSED( parentPlot )
-}
+void QCPLayerable::parentPlotInitialized( QCustomPlot* parentPlot ){Q_UNUSED( parentPlot )}
 
 /*! \internal
 
@@ -1560,9 +1556,7 @@ const double QCPRange::maxRange = 1e250;
 /*!
   Constructs a range with \a lower and \a upper set to zero.
 */
-QCPRange::QCPRange() : lower( 0 ), upper( 0 )
-{
-}
+QCPRange::QCPRange() : lower( 0 ), upper( 0 ) {}
 
 /*! \overload
   Constructs a range with the specified \a lower and \a upper values.
@@ -2467,10 +2461,11 @@ void QCPLayoutElement::update( UpdatePhase phase )
         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
@@ -2700,9 +2695,7 @@ int QCPLayoutElement::calculateAutoMargin( QCP::MarginSide side )
   QCPLayout
   is an abstract base class, it can't be instantiated directly.
 */
-QCPLayout::QCPLayout()
-{
-}
+QCPLayout::QCPLayout() {}
 
 /*!
   First calls the QCPLayoutElement::update base class implementation to update
@@ -2761,9 +2754,7 @@ QList<QCPLayoutElement*> QCPLayout::elements( bool recursive ) const
   explicit
   simplification while QCPLayoutGrid does.
 */
-void QCPLayout::simplify()
-{
-}
+void QCPLayout::simplify() {}
 
 /*!
   Removes and deletes the element at the provided \a index. Returns true on
@@ -2859,9 +2850,7 @@ void QCPLayout::sizeConstraintsChanged() const
 
   \see update
 */
-void QCPLayout::updateLayout()
-{
-}
+void QCPLayout::updateLayout() {}
 
 /*! \internal
 
@@ -3060,8 +3049,9 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
       }
     }
     if( innerIterations == sectionCount * 2 )
-      qDebug() << Q_FUNC_INFO << "Exceeded maximum expected inner iteration "
-                                 "count, layouting aborted. Input was:"
+      qDebug() << Q_FUNC_INFO
+               << "Exceeded maximum expected inner iteration "
+                  "count, layouting aborted. Input was:"
                << maxSizes << minSizes << stretchFactors << totalSize;
 
     // now check whether the resulting section sizes violate minimum
@@ -3099,8 +3089,9 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
     }
   }
   if( outerIterations == sectionCount * 2 )
-    qDebug() << Q_FUNC_INFO << "Exceeded maximum expected outer iteration "
-                               "count, layouting aborted. Input was:"
+    qDebug() << Q_FUNC_INFO
+             << "Exceeded maximum expected outer iteration "
+                "count, layouting aborted. Input was:"
              << maxSizes << minSizes << stretchFactors << totalSize;
 
   QVector<int> result( sectionCount );
@@ -3140,9 +3131,7 @@ QVector<int> QCPLayout::getSectionSizes( QVector<int> maxSizes,
 /*!
   Creates an instance of QCPLayoutGrid and sets default values.
 */
-QCPLayoutGrid::QCPLayoutGrid() : mColumnSpacing( 5 ), mRowSpacing( 5 )
-{
-}
+QCPLayoutGrid::QCPLayoutGrid() : mColumnSpacing( 5 ), mRowSpacing( 5 ) {}
 
 QCPLayoutGrid::~QCPLayoutGrid()
 {
@@ -3803,9 +3792,7 @@ void QCPLayoutGrid::getMaximumRowColSizes( QVector<int>* maxColWidths,
 /*!
   Creates an instance of QCPLayoutInset and sets default values.
 */
-QCPLayoutInset::QCPLayoutInset()
-{
-}
+QCPLayoutInset::QCPLayoutInset() {}
 
 QCPLayoutInset::~QCPLayoutInset()
 {
@@ -4165,9 +4152,7 @@ void QCPLayoutInset::addElement( QCPLayoutElement* element, const QRectF& rect )
 /*!
   Creates a QCPLineEnding instance with default values (style \ref esNone).
 */
-QCPLineEnding::QCPLineEnding() : mStyle( esNone ), mWidth( 8 ), mLength( 10 ), mInverted( false )
-{
-}
+QCPLineEnding::QCPLineEnding() : mStyle( esNone ), mWidth( 8 ), mLength( 10 ), mInverted( false ) {}
 
 /*!
   Creates a QCPLineEnding instance with the specified values.
@@ -5662,8 +5647,9 @@ void QCPAxis::setNumberFormat( const QString& formatCode )
   }
   else
   {
-    qDebug() << Q_FUNC_INFO << "Invalid number format code (second char not "
-                               "'b' or first char neither 'e' nor 'g'):"
+    qDebug() << Q_FUNC_INFO
+             << "Invalid number format code (second char not "
+                "'b' or first char neither 'e' nor 'g'):"
              << formatCode;
     return;
   }
@@ -6204,8 +6190,9 @@ void QCPAxis::scaleRange( double factor, double center )
         mRange = newRange.sanitizedForLogScale();
     }
     else
-      qDebug() << Q_FUNC_INFO << "Center of scaling operation doesn't lie in "
-                                 "same logarithmic sign domain as range:"
+      qDebug() << Q_FUNC_INFO
+               << "Center of scaling operation doesn't lie in "
+                  "same logarithmic sign domain as range:"
                << center;
   }
   mCachedMarginValid = false;
@@ -6425,13 +6412,13 @@ 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();
       }
     }
   }
@@ -7317,9 +7304,7 @@ QCPAxisPainterPrivate::QCPAxisPainterPrivate( QCustomPlot* parentPlot )
 {
 }
 
-QCPAxisPainterPrivate::~QCPAxisPainterPrivate()
-{
-}
+QCPAxisPainterPrivate::~QCPAxisPainterPrivate() {}
 
 /*! \internal
 
@@ -7440,14 +7425,16 @@ void QCPAxisPainterPrivate::draw( QCPPainter* painter )
   painter->setBrush( QBrush( basePen.color() ) );
   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 ),
+    lowerEnding.draw( painter,
+                      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 ),
+    upperEnding.draw( painter,
+                      QVector2D( baseLine.p2() ) + baseLineVector.normalized() *
+                                                       upperEnding.realLength() *
+                                                       ( upperEnding.inverted() ? -1 : 1 ),
                       baseLineVector );
   painter->setAntialiasing( antialiasingBackup );
 
@@ -9281,8 +9268,9 @@ bool QCPItemPosition::setParentAnchor( QCPItemAnchor* parentAnchor, bool keepPix
       // because they're both on the same item:
       if( currentParent->mParentItem == mParentItem )
       {
-        qDebug() << Q_FUNC_INFO << "can't set parent to be an anchor which "
-                                   "itself depends on this position"
+        qDebug() << Q_FUNC_INFO
+                 << "can't set parent to be an anchor which "
+                    "itself depends on this position"
                  << reinterpret_cast<quintptr>( parentAnchor );
         return false;
       }
@@ -10157,8 +10145,9 @@ double QCPAbstractItem::rectSelectTest( const QRectF& rect,
 */
 QPointF QCPAbstractItem::anchorPixelPoint( int anchorId ) const
 {
-  qDebug() << Q_FUNC_INFO << "called on item which shouldn't have any anchors "
-                             "(this method not reimplemented). anchorId"
+  qDebug() << Q_FUNC_INFO
+           << "called on item which shouldn't have any anchors "
+              "(this method not reimplemented). anchorId"
            << anchorId;
   return QPointF();
 }
@@ -11759,15 +11748,17 @@ QCPGraph* QCustomPlot::addGraph( QCPAxis* keyAxis, QCPAxis* valueAxis )
     valueAxis = yAxis;
   if( !keyAxis || !valueAxis )
   {
-    qDebug() << Q_FUNC_INFO << "can't use default QCustomPlot xAxis or yAxis, "
-                               "because at least one is invalid (has been "
-                               "deleted)";
+    qDebug() << Q_FUNC_INFO
+             << "can't use default QCustomPlot xAxis or yAxis, "
+                "because at least one is invalid (has been "
+                "deleted)";
     return 0;
   }
   if( keyAxis->parentPlot() != this || valueAxis->parentPlot() != this )
   {
-    qDebug() << Q_FUNC_INFO << "passed keyAxis or valueAxis doesn't have this "
-                               "QCustomPlot as parent";
+    qDebug() << Q_FUNC_INFO
+             << "passed keyAxis or valueAxis doesn't have this "
+                "QCustomPlot as parent";
     return 0;
   }
 
@@ -11917,8 +11908,9 @@ bool QCustomPlot::addItem( QCPAbstractItem* item )
   }
   else
   {
-    qDebug() << Q_FUNC_INFO << "item either already in list or not created "
-                               "with this QCustomPlot as parent:"
+    qDebug() << Q_FUNC_INFO
+             << "item either already in list or not created "
+                "with this QCustomPlot as parent:"
              << reinterpret_cast<quintptr>( item );
     return false;
   }
@@ -12411,7 +12403,7 @@ QCPLayoutElement* QCustomPlot::layoutElementAt( const QPointF& pos ) const
 */
 QList<QCPAxis*> QCustomPlot::selectedAxes() const
 {
-  QList<QCPAxis *> result, allAxes;
+  QList<QCPAxis*> result, allAxes;
   foreach( QCPAxisRect* rect, axisRects() )
     allAxes << rect->axes();
 
@@ -12625,8 +12617,9 @@ bool QCustomPlot::savePdf( const QString& fileName,
   Q_UNUSED( noCosmeticPen )
   Q_UNUSED( width )
   Q_UNUSED( height )
-  qDebug() << Q_FUNC_INFO << "Qt was built without printer support "
-                             "(QT_NO_PRINTER). PDF not created.";
+  qDebug() << Q_FUNC_INFO
+           << "Qt was built without printer support "
+              "(QT_NO_PRINTER). PDF not created.";
 #else
   int newWidth, newHeight;
   if( width == 0 || height == 0 )
@@ -15632,7 +15625,7 @@ void QCPLegend::setIconSize( const QSize& size )
 }
 
 /*! \overload
-*/
+ */
 void QCPLegend::setIconSize( int width, int height )
 {
   mIconSize.setWidth( width );
@@ -15727,8 +15720,9 @@ void QCPLegend::setSelectedParts( const SelectableParts& selected )
     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";
+      qDebug() << Q_FUNC_INFO
+               << "spItems flag can not be set, it can only be "
+                  "unset with this function";
       newSelected &= ~spItems;
     }
     if( mSelectedParts.testFlag( spItems ) &&
@@ -16085,10 +16079,7 @@ QCP::Interaction QCPAbstractLegendItem::selectionCategory() const
 }
 
 /* inherits documentation from base class */
-void QCPLegend::parentPlotInitialized( QCustomPlot* parentPlot )
-{
-  Q_UNUSED( parentPlot )
-}
+void QCPLegend::parentPlotInitialized( QCustomPlot* parentPlot ){Q_UNUSED( parentPlot )}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////// QCPPlotTitle
@@ -16961,9 +16952,9 @@ QCPColorScaleAxisRectPrivate::QCPColorScaleAxisRectPrivate( QCPColorScale* paren
 {
   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 );
@@ -16996,9 +16987,9 @@ QCPColorScaleAxisRectPrivate::QCPColorScaleAxisRectPrivate( QCPColorScale* paren
   // 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 )
+  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* ) ) );
 }
@@ -17086,9 +17077,9 @@ 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 )
@@ -17113,9 +17104,9 @@ 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 )
@@ -20023,9 +20014,7 @@ QCPRange QCPGraph::getValueRange( bool& foundRange,
 /*!
   Constructs a curve data point with t, key and value set to zero.
 */
-QCPCurveData::QCPCurveData() : t( 0 ), key( 0 ), value( 0 )
-{
-}
+QCPCurveData::QCPCurveData() : t( 0 ), key( 0 ), value( 0 ) {}
 
 /*!
   Constructs a curve data point with the specified \a t, \a key and \a value.
@@ -20630,7 +20619,7 @@ void QCPCurve::getCurveData( QVector<QPointF>* lineData ) const
             ( 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:
         if( !addedLastAlready )
@@ -20850,16 +20839,12 @@ QCPRange QCPCurve::getValueRange( bool& foundRange, SignDomain inSignDomain ) co
 /*!
   Constructs a bar data point with key and value set to zero.
 */
-QCPBarData::QCPBarData() : key( 0 ), value( 0 )
-{
-}
+QCPBarData::QCPBarData() : key( 0 ), value( 0 ) {}
 
 /*!
   Constructs a bar data point with the specified \a key and \a value.
 */
-QCPBarData::QCPBarData( double key, double value ) : key( key ), value( value )
-{
-}
+QCPBarData::QCPBarData( double key, double value ) : key( key ), value( value ) {}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////// QCPBars
@@ -21029,8 +21014,9 @@ void QCPBars::moveBelow( QCPBars* bars )
     return;
   if( bars && ( bars->keyAxis() != mKeyAxis.data() || bars->valueAxis() != mValueAxis.data() ) )
   {
-    qDebug() << Q_FUNC_INFO << "passed QCPBars* doesn't have same key and "
-                               "value axis as this QCPBars";
+    qDebug() << Q_FUNC_INFO
+             << "passed QCPBars* doesn't have same key and "
+                "value axis as this QCPBars";
     return;
   }
   // remove from stacking:
@@ -21070,8 +21056,9 @@ void QCPBars::moveAbove( QCPBars* bars )
     return;
   if( bars && ( bars->keyAxis() != mKeyAxis.data() || bars->valueAxis() != mValueAxis.data() ) )
   {
-    qDebug() << Q_FUNC_INFO << "passed QCPBars* doesn't have same key and "
-                               "value axis as this QCPBars";
+    qDebug() << Q_FUNC_INFO
+             << "passed QCPBars* doesn't have same key and "
+                "value axis as this QCPBars";
     return;
   }
   // remove from stacking:
@@ -23079,9 +23066,7 @@ QCPItemStraightLine::QCPItemStraightLine( QCustomPlot* parentPlot )
   setSelectedPen( QPen( Qt::blue, 2 ) );
 }
 
-QCPItemStraightLine::~QCPItemStraightLine()
-{
-}
+QCPItemStraightLine::~QCPItemStraightLine() {}
 
 /*!
   Sets the pen that will be used to draw the line
@@ -23292,9 +23277,7 @@ QCPItemLine::QCPItemLine( QCustomPlot* parentPlot )
   setSelectedPen( QPen( Qt::blue, 2 ) );
 }
 
-QCPItemLine::~QCPItemLine()
-{
-}
+QCPItemLine::~QCPItemLine() {}
 
 /*!
   Sets the pen that will be used to draw the line
@@ -23548,9 +23531,7 @@ QCPItemCurve::QCPItemCurve( QCustomPlot* parentPlot )
   setSelectedPen( QPen( Qt::blue, 2 ) );
 }
 
-QCPItemCurve::~QCPItemCurve()
-{
-}
+QCPItemCurve::~QCPItemCurve() {}
 
 /*!
   Sets the pen that will be used to draw the line
@@ -23712,9 +23693,7 @@ QCPItemRect::QCPItemRect( QCustomPlot* parentPlot )
   setSelectedBrush( Qt::NoBrush );
 }
 
-QCPItemRect::~QCPItemRect()
-{
-}
+QCPItemRect::~QCPItemRect() {}
 
 /*!
   Sets the pen that will be used to draw the line of the rectangle
@@ -23891,9 +23870,7 @@ QCPItemText::QCPItemText( QCustomPlot* parentPlot )
   setSelectedColor( Qt::blue );
 }
 
-QCPItemText::~QCPItemText()
-{
-}
+QCPItemText::~QCPItemText() {}
 
 /*!
   Sets the color of the text.
@@ -24268,9 +24245,7 @@ QCPItemEllipse::QCPItemEllipse( QCustomPlot* parentPlot )
   setSelectedBrush( Qt::NoBrush );
 }
 
-QCPItemEllipse::~QCPItemEllipse()
-{
-}
+QCPItemEllipse::~QCPItemEllipse() {}
 
 /*!
   Sets the pen that will be used to draw the line of the ellipse
@@ -24477,9 +24452,7 @@ QCPItemPixmap::QCPItemPixmap( QCustomPlot* parentPlot )
   setScaled( false, Qt::KeepAspectRatio );
 }
 
-QCPItemPixmap::~QCPItemPixmap()
-{
-}
+QCPItemPixmap::~QCPItemPixmap() {}
 
 /*!
   Sets the pixmap that will be displayed.
@@ -24771,9 +24744,7 @@ QCPItemTracer::QCPItemTracer( QCustomPlot* parentPlot )
   setGraphKey( 0 );
 }
 
-QCPItemTracer::~QCPItemTracer()
-{
-}
+QCPItemTracer::~QCPItemTracer() {}
 
 /*!
   Sets the pen that will be used to draw the line of the tracer
@@ -25166,9 +25137,7 @@ QCPItemBracket::QCPItemBracket( QCustomPlot* parentPlot )
   setStyle( bsCalligraphic );
 }
 
-QCPItemBracket::~QCPItemBracket()
-{
-}
+QCPItemBracket::~QCPItemBracket() {}
 
 /*!
   Sets the pen that will be used to draw the bracket.

app/external/qcustomplot.h

@@ -1821,6 +1821,7 @@ class QCP_LIB_DECL QCPItemPosition : public QCPItemAnchor
 
   // reimplemented virtual methods:
   virtual QCPItemPosition* toQCPItemPosition() { return this; }
+
  private:
   Q_DISABLE_COPY( QCPItemPosition )
 };
@@ -2454,6 +2455,7 @@ class QCP_LIB_DECL QCPPlottableLegendItem : public QCPAbstractLegendItem
 
   // getters:
   QCPAbstractPlottable* plottable() { return mPlottable; }
+
  protected:
   // property members:
   QCPAbstractPlottable* mPlottable;
@@ -2683,11 +2685,11 @@ class QCPColorScaleAxisRectPrivate : public QCPAxisRect
   // re-using some methods of QCPAxisRect to make them available to friend class
   // QCPColorScale
   using QCPAxisRect::calculateAutoMargin;
-  using QCPAxisRect::mousePressEvent;
   using QCPAxisRect::mouseMoveEvent;
+  using QCPAxisRect::mousePressEvent;
   using QCPAxisRect::mouseReleaseEvent;
-  using QCPAxisRect::wheelEvent;
   using QCPAxisRect::update;
+  using QCPAxisRect::wheelEvent;
   virtual void draw( QCPPainter* painter );
   void updateGradientImage();
   Q_SLOT void axisSelectionChanged( QCPAxis::SelectableParts selectedParts );

app/main.cpp

@@ -56,7 +56,8 @@ int main( int argc, char* argv[] )
    * use dbus, if available
    * allows for resuse of running Kate instances
    */
-	if (QDBusConnectionInterface * const sessionBusInterface = QDBusConnection::sessionBus().interface())
+  if( QDBusConnectionInterface* const sessionBusInterface =
+          QDBusConnection::sessionBus().interface() )
   {
     Bool force_new = false;
     QStringList filenameList;

lib/LibMemory.h

@@ -104,7 +104,7 @@ Int getMem2D( T*** array2D, Int dim0, Int dim1 )
 template <typename T>
 Int getMem3D( T**** array3D, Int dim0, Int dim1, Int dim2 )
 {
-  Int i, mem_size = dim0 * sizeof( T ** );
+  Int i, mem_size = dim0 * sizeof( T** );
 
   if( ( ( *array3D ) = (T***)xMallocMem( dim0 * sizeof( T** ) ) ) == NULL )
     printf( "get_mem3Dint: array3D" );
@@ -120,7 +120,7 @@ Int getMem3D( T**** array3D, Int dim0, Int dim1, Int dim2 )
 template <typename T>
 Int getMem4D( T***** array4D, Int dim0, Int dim1, Int dim2, Int dim3 )
 {
-  int i, mem_size = dim0 * sizeof( int *** );
+  int i, mem_size = dim0 * sizeof( int*** );
 
   if( ( ( *array4D ) = (T****)xMallocMem( dim0 * sizeof( T*** ) ) ) == NULL )
     printf( "get_mem4Dint: array4D" );
@@ -136,7 +136,7 @@ Int getMem4D( T***** array4D, Int dim0, Int dim1, Int dim2, Int dim3 )
 template <typename T>
 Int getMem5D( T****** array5D, Int dim0, Int dim1, Int dim2, Int dim3, Int dim4 )
 {
-  int i, mem_size = dim0 * sizeof( T **** );
+  int i, mem_size = dim0 * sizeof( T**** );
 
   if( ( ( *array5D ) = (T*****)xMallocMem( dim0 * sizeof( T**** ) ) ) == NULL )
     printf( "get_mem5Dint: array5D" );

lib/PlaYUVerFrame.cpp

@@ -40,7 +40,9 @@
 std::vector<String> PlaYUVerFrame::supportedColorSpacesListNames()
 {
   return std::vector<String>{
-      "YUV", "RGB", "GRAY",
+      "YUV",
+      "RGB",
+      "GRAY",
   };
 }
 
@@ -84,9 +86,8 @@ static Int getImgMemory( Pel**** array3D,
   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 );
 
@@ -598,9 +599,8 @@ 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++ )
@@ -660,9 +660,8 @@ 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++ )
@@ -1183,9 +1182,8 @@ 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;
   }
@@ -1285,7 +1283,9 @@ Bool PlaYUVerFrame::fromMat( cv::Mat& cvMat )
 std::vector<String> PlaYUVerFrame::supportedQualityMetricsList()
 {
   return std::vector<String>{
-      "PSNR", "MSE", "SSIM",
+      "PSNR",
+      "MSE",
+      "SSIM",
   };
 }
 

lib/PlaYUVerPixel.cpp

@@ -54,9 +54,7 @@ PlaYUVerPixel::PlaYUVerPixel( const Int& ColorSpace, const Pel& c0, const Pel& c
   PixelComponents[3] = 0;
 }
 
-PlaYUVerPixel::~PlaYUVerPixel()
-{
-}
+PlaYUVerPixel::~PlaYUVerPixel() {}
 
 Int PlaYUVerPixel::ColorSpaceType()
 {

lib/PlaYUVerStreamHandlerIf.h

@@ -68,6 +68,7 @@ class PlaYUVerStreamHandlerIf
   Void setBytesPerFrame( UInt64 uiNBytes ) { m_uiNBytesPerFrame = uiNBytes; }
   String getFormatName() { return m_strFormatName; }
   String getCodecName() { return m_strCodecName; }
+
  protected:
   Bool m_bIsInput;
   String m_cFilename;

lib/StreamHandlerLibav.cpp

@@ -119,7 +119,7 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
 
   m_cStream = m_cFmtCtx->streams[m_iStreamIdx];
 
-/* find decoder for the stream */
+  /* find decoder for the stream */
 
 #ifdef FF_USER_CODEC_PARAM
   AVCodecParameters* codec_param = m_cStream->codecpar;
@@ -234,9 +234,9 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
   }
 
 #if( ( LIBAVCODEC_VERSION_MAJOR >= 56 ) && ( LIBAVCODEC_VERSION_MINOR >= 0 ) )
-	m_cFrame = av_frame_alloc();
+  m_cFrame = av_frame_alloc();
 #else
-	m_cFrame = avcodec_alloc_frame();
+  m_cFrame = avcodec_alloc_frame();
 #endif
   if( !m_cFrame )
   {

modules/LumaAverage.cpp

@@ -42,9 +42,7 @@ LumaAverage::LumaAverage()
   // Several requirements should be "or" between each others.
 }
 
-Void LumaAverage::create( PlaYUVerFrame* frame )
-{
-}
+Void LumaAverage::create( PlaYUVerFrame* frame ) {}
 
 Double LumaAverage::measure( PlaYUVerFrame* frame )
 {
@@ -59,6 +57,4 @@ Double LumaAverage::measure( PlaYUVerFrame* frame )
   return average / Double( frame->getHeight() * frame->getWidth() );
 }
 
-Void LumaAverage::destroy()
-{
-}
+Void LumaAverage::destroy() {}

modules/MeasureOpticalFlowDualTVL1.cpp

@@ -24,12 +24,12 @@
 
 #include "MeasureOpticalFlowDualTVL1.h"
 
-using cv::Scalar;
 using cv::Mat;
 using cv::Mat_;
-using cv::Ptr;
 using cv::Point;
 using cv::Point2f;
+using cv::Ptr;
+using cv::Scalar;
 
 MeasureOpticalFlowDualTVL1::MeasureOpticalFlowDualTVL1()
 {

modules/OpticalFlow.cpp

@@ -31,12 +31,12 @@
 // Opencv
 #include <opencv2/optflow.hpp>
 
-using cv::Scalar;
 using cv::Mat;
 using cv::Mat_;
-using cv::Ptr;
 using cv::Point;
 using cv::Point2f;
+using cv::Ptr;
+using cv::Scalar;
 
 OpticalFlowModule::OpticalFlowModule()
 {

modules/PlaYUVerModuleFactory.cpp

@@ -34,10 +34,7 @@
 // Generated by cmake
 #include "ModulesListHeader.h"
 
-PlaYUVerModuleFactory::PlaYUVerModuleFactory()
-{
-  REGISTER_ALL_MODULES
-}
+PlaYUVerModuleFactory::PlaYUVerModuleFactory(){REGISTER_ALL_MODULES}
 
 PlaYUVerModuleFactory::~PlaYUVerModuleFactory()
 {

modules/WeightedPSNR.cpp

@@ -111,6 +111,4 @@ Double WeightedPSNR::measure( std::vector<PlaYUVerFrame*> apcFrameList )
   return dPSNR;
 }
 
-Void WeightedPSNR::destroy()
-{
-}
+Void WeightedPSNR::destroy() {}

tools/PlaYUVerToolsCmdParser.cpp

@@ -41,9 +41,7 @@ PlaYUVerToolsCmdParser::PlaYUVerToolsCmdParser()
   m_cOptions.addDefaultOptions();
 }
 
-PlaYUVerToolsCmdParser::~PlaYUVerToolsCmdParser()
-{
-}
+PlaYUVerToolsCmdParser::~PlaYUVerToolsCmdParser() {}
 
 Void PlaYUVerToolsCmdParser::log( UInt level, const char* fmt, ... )
 {

tools/PlaYUVerToolsCmdParser.h

@@ -53,6 +53,7 @@ class PlaYUVerToolsCmdParser
   Int parseToolsArgs( Int argc, Char* argv[] );
 
   PlaYUVerOptions& Opts() { return m_cOptions; }
+
  protected:
   PlaYUVerOptions m_cOptions;
   UInt m_uiLogLevel;