diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h index 965267e83..e45d1de67 100644 --- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h +++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h @@ -42,7 +42,7 @@ public: virtual ShaderCode GetShaderCode(const QString& shader_id) const override; protected: - virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const; + virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const override; }; diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp index c34ee5764..4825c9b61 100644 --- a/app/window/mainwindow/mainwindow.cpp +++ b/app/window/mainwindow/mainwindow.cpp @@ -358,7 +358,7 @@ void MainWindow::SetApplicationProgressStatus(ProgressStatus status) taskbar_interface_->SetProgressState(reinterpret_cast(this->winId()), TBPF_NORMAL); break; case kProgressNone: - taskbar_interface_->SetProgressState(reinterpret_ cast(this->winId()), TBPF_NOPROGRESS); + taskbar_interface_->SetProgressState(reinterpret_cast(this->winId()), TBPF_NOPROGRESS); break; case kProgressError: taskbar_interface_->SetProgressState(reinterpret_cast(this->winId()), TBPF_ERROR);