From 9a9d190918108e6ee97072727cf906a01d45b433 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 26 Jul 2018 20:26:13 +1200 Subject: [PATCH] Remove unnecessary duplicate function --- libraries/animation/src/AnimationCacheScriptingInterface.cpp | 4 ++-- libraries/animation/src/AnimationCacheScriptingInterface.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/animation/src/AnimationCacheScriptingInterface.cpp b/libraries/animation/src/AnimationCacheScriptingInterface.cpp index 450187a084..3db1d31901 100644 --- a/libraries/animation/src/AnimationCacheScriptingInterface.cpp +++ b/libraries/animation/src/AnimationCacheScriptingInterface.cpp @@ -15,6 +15,6 @@ AnimationCacheScriptingInterface::AnimationCacheScriptingInterface() : ScriptableResourceCache::ScriptableResourceCache(DependencyManager::get()) { } -AnimationPointer AnimationCacheScriptingInterface::getAnimation(const QUrl& url) { - return DependencyManager::get()->getAnimation(url); +AnimationPointer AnimationCacheScriptingInterface::getAnimation(const QString& url) { + return DependencyManager::get()->getAnimation(QUrl(url)); } diff --git a/libraries/animation/src/AnimationCacheScriptingInterface.h b/libraries/animation/src/AnimationCacheScriptingInterface.h index 032ca169b8..1f5735dd0f 100644 --- a/libraries/animation/src/AnimationCacheScriptingInterface.h +++ b/libraries/animation/src/AnimationCacheScriptingInterface.h @@ -52,8 +52,7 @@ public: * @param {string} url - URL to load. * @returns {AnimationObject} animation */ - Q_INVOKABLE AnimationPointer getAnimation(const QString& url) { return getAnimation(QUrl(url)); } - Q_INVOKABLE AnimationPointer getAnimation(const QUrl& url); + Q_INVOKABLE AnimationPointer getAnimation(const QString& url); }; #endif // hifi_AnimationCacheScriptingInterface_h