From a55806a4d52d48b661a89da2d91ee5767060da42 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 31 Jan 2018 02:18:21 +0000 Subject: [PATCH] Format code --- app/SubWindowAbstract.h | 2 +- app/VideoHandle.cpp | 5 ++--- app/VideoSubWindow.cpp | 8 ++++---- app/VideoSubWindow.h | 2 +- lib/StreamHandlerLibav.cpp | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/SubWindowAbstract.h b/app/SubWindowAbstract.h index e46f6eb..242c396 100644 --- a/app/SubWindowAbstract.h +++ b/app/SubWindowAbstract.h @@ -136,7 +136,7 @@ public: protected: void focusInEvent( QFocusEvent* event ); - virtual void closeEvent( QCloseEvent* event ); + virtual void closeEvent( QCloseEvent* event ); Void setWidget( QWidget* widget ); diff --git a/app/VideoHandle.cpp b/app/VideoHandle.cpp index 5bd4a75..00cdef8 100644 --- a/app/VideoHandle.cpp +++ b/app/VideoHandle.cpp @@ -345,10 +345,9 @@ Void VideoHandle::update() m_pcFrameNumInfo->setCurrFrameNum( frame_num ); - - m_pcFrameSlider->blockSignals( true ); // Disable signals otherwise it will loop this function + m_pcFrameSlider->blockSignals( true ); // Disable signals otherwise it will loop this function m_pcFrameSlider->setValue( frame_num ); - m_pcFrameSlider->blockSignals( false ); + m_pcFrameSlider->blockSignals( false ); if( m_pcCurrentVideoSubWindow->isPlaying() ) { diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp index d4154c3..a1bae90 100644 --- a/app/VideoSubWindow.cpp +++ b/app/VideoSubWindow.cpp @@ -198,8 +198,8 @@ VideoSubWindow::~VideoSubWindow() Void VideoSubWindow::closeEvent( QCloseEvent* event ) { - stop(); - SubWindowAbstract::closeEvent( event ); + stop(); + SubWindowAbstract::closeEvent( event ); } Void VideoSubWindow::keyPressEvent( QKeyEvent* event ) @@ -798,8 +798,8 @@ Void VideoSubWindow::seekRelativeEvent( Bool bIsFoward ) Void VideoSubWindow::stop() { #ifndef QT_NO_CONCURRENT - m_cRefreshResult.waitForFinished(); - m_cReadResult.waitForFinished(); + m_cRefreshResult.waitForFinished(); + m_cReadResult.waitForFinished(); #endif m_bIsPlaying = false; seekAbsoluteEvent( 0 ); diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h index 0e9eae9..eebff9d 100644 --- a/app/VideoSubWindow.h +++ b/app/VideoSubWindow.h @@ -204,7 +204,7 @@ private: protected: Void keyPressEvent( QKeyEvent* event ); Void resizeEvent( QResizeEvent* event ); - Void closeEvent( QCloseEvent *event ); + Void closeEvent( QCloseEvent* event ); public Q_SLOTS: void updateWindowOnTimeout(); diff --git a/lib/StreamHandlerLibav.cpp b/lib/StreamHandlerLibav.cpp index fe69e42..76067c7 100644 --- a/lib/StreamHandlerLibav.cpp +++ b/lib/StreamHandlerLibav.cpp @@ -374,8 +374,8 @@ Bool StreamHandlerLibav::write( PlaYUVerFrame* pcFrame ) Bool StreamHandlerLibav::seek( UInt64 iFrameNum ) { - if( m_uiTotalNumberFrames == 1 ) - return true; + if( m_uiTotalNumberFrames == 1 ) + return true; if( m_uiCurrFrameFileIdx == iFrameNum ) return true;