oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: update Qt code deprecated in 5.15

Browse Source 
- Replaces QLinkedList with std::list as recommended by Qt docs.
- Replaces QWheelEvent::delta() with QWheelEvent::angleDelta(). This
  should also benefit trackpad behavior.
This commit is contained in:
itsmattkc
2020-05-27 02:54:05 +10:00
parent da04777a25
commit 3e3cacbc85
12 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/cache/cache.cpp
Vendored
+1 -1
View File
@@ -62,7 +62,7 @@ QFuture<void> CacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
return QtConcurrent::run(&download_threads_, FrameHashCache::SaveCacheFrame, hash, frame);
}
void CacheTask::FrameDownloaded(const QByteArray &hash, const QLinkedList<rational> &times)
void CacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times)
{
foreach (const rational& t, times) {
viewer()->video_frame_cache()->SetHash(t, hash);
app/task/cache/cache.h
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@ public slots:
protected:
virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) override;
virtual void FrameDownloaded(const QByteArray& hash, const QLinkedList<rational>& times) override;
virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) override;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
app/task/export/export.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ QFuture<void> ExportTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
return QtConcurrent::run(FrameColorConvert, color_processor_, frame);
}
void ExportTask::FrameDownloaded(const QByteArray &hash, const QLinkedList<rational> &times)
void ExportTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times)
{
FramePtr f = rendered_frame_.value(hash);
app/task/export/export.h
+1 -1
View File
@@ -41,7 +41,7 @@ public slots:
protected:
virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) override;
virtual void FrameDownloaded(const QByteArray& hash, const QLinkedList<rational>& times) override;
virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) override;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
app/task/render/render.h
+1 -1
View File
@@ -41,7 +41,7 @@ protected:
virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) = 0;
virtual void FrameDownloaded(const QByteArray& hash, const QLinkedList<rational>& times) = 0;
virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) = 0;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) = 0;
app/task/taskmanager.cpp
+3 -3
View File
@@ -102,8 +102,8 @@ void TaskManager::AddTask(Task* t)
void TaskManager::CancelTask(Task *t)
{
if (failed_tasks_.contains(t)) {
failed_tasks_.removeOne(t);
if (std::find(failed_tasks_.begin(), failed_tasks_.end(), t) != failed_tasks_.end()) {
failed_tasks_.remove(t);
emit TaskRemoved(t);
t->deleteLater();
} else {
@@ -125,7 +125,7 @@ void TaskManager::TaskFinished()
} else {
// Task failed, keep it so the user can see the error message
emit TaskFailed(t);
failed_tasks_.append(t);
failed_tasks_.push_back(t);
}
watcher->deleteLater();
app/task/taskmanager.h
+1 -1
View File
@@ -119,7 +119,7 @@ private:
/**
* @brief Internal list of failed tasks
*/
QLinkedList<Task*> failed_tasks_;
std::list<Task*> failed_tasks_;
/**
* @brief Task thread pool