summaryrefslogtreecommitdiffstats
path: root/src/render/io
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2018-01-22 12:01:09 +0100
committerPaul Lemire <paul.lemire@kdab.com>2018-01-23 10:13:47 +0000
commit947d5aa3ffffbf3387f53259720459562b4109c8 (patch)
tree6a8b6c47db14a350a237f784d7b5eb3646489245 /src/render/io
parent3957f6c8a6c47b6712a2f0e552b23799b2a89b14 (diff)
SceneManager: rename pendingSceneLoaderJobs()
Renamed to takePendingSceneLoaderJobs() as the name better indicates we are resetting the vector of jobs internally. Change-Id: I68a16139994552b7b26f1cf88a206a61a30950e0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io')
-rw-r--r--src/render/io/scenemanager.cpp2
-rw-r--r--src/render/io/scenemanager_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp
index cdf8aae87..fddb814c4 100644
--- a/src/render/io/scenemanager.cpp
+++ b/src/render/io/scenemanager.cpp
@@ -78,7 +78,7 @@ void SceneManager::addSceneData(const QUrl &source,
m_pendingJobs.push_back(newJob);
}
-QVector<LoadSceneJobPtr> SceneManager::pendingSceneLoaderJobs()
+QVector<LoadSceneJobPtr> SceneManager::takePendingSceneLoaderJobs()
{
// Explicitly use std::move to clear the m_pendingJobs vector
return std::move(m_pendingJobs);
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h
index 398569181..171cc28c9 100644
--- a/src/render/io/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
@@ -95,7 +95,7 @@ public:
void addSceneData(const QUrl &source, Qt3DCore::QNodeId sceneUuid,
const QByteArray &data = QByteArray());
- QVector<LoadSceneJobPtr> pendingSceneLoaderJobs();
+ QVector<LoadSceneJobPtr> takePendingSceneLoaderJobs();
void startSceneDownload(const QUrl &source, Qt3DCore::QNodeId sceneUuid);
void clearSceneDownload(SceneDownloader *downloader);