From 2caa7f6d647ab3c75d078caab670388e47cf755b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 13 Oct 2015 16:56:20 -0700
Subject: [PATCH] change getUrl to getATPUrl, use in ATPAssetMigrator

---
 interface/src/assets/ATPAssetMigrator.cpp | 3 ++-
 libraries/networking/src/AssetRequest.cpp | 5 -----
 libraries/networking/src/AssetRequest.h   | 2 +-
 libraries/networking/src/AssetUpload.cpp  | 2 +-
 libraries/networking/src/AssetUtils.cpp   | 4 ++--
 libraries/networking/src/AssetUtils.h     | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/interface/src/assets/ATPAssetMigrator.cpp b/interface/src/assets/ATPAssetMigrator.cpp
index c268b351fa..861a1df772 100644
--- a/interface/src/assets/ATPAssetMigrator.cpp
+++ b/interface/src/assets/ATPAssetMigrator.cpp
@@ -171,7 +171,8 @@ void ATPAssetMigrator::assetUploadFinished(AssetUpload *upload, const QString& h
         // successfully uploaded asset - make any required replacements found in the pending replacements
         auto values = _pendingReplacements.values(modelURL);
         
-        QString atpURL = QString("%1:%2.%3").arg(URL_SCHEME_ATP).arg(hash).arg(upload->getExtension());
+        
+        QString atpURL = getATPUrl(hash, upload->getExtension()).toString();
         
         for (auto value : values) {
             // replace the modelURL in this QJsonValueRef with the hash
diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp
index 121b4cd4fd..7e647e9142 100644
--- a/libraries/networking/src/AssetRequest.cpp
+++ b/libraries/networking/src/AssetRequest.cpp
@@ -127,8 +127,3 @@ void AssetRequest::start() {
         });
     });
 }
-
-QUrl AssetRequest::getUrl() const {
-    return ::getUrl(_hash, _extension);
-}
-
diff --git a/libraries/networking/src/AssetRequest.h b/libraries/networking/src/AssetRequest.h
index a5275e718a..3c3459b15d 100644
--- a/libraries/networking/src/AssetRequest.h
+++ b/libraries/networking/src/AssetRequest.h
@@ -46,7 +46,7 @@ public:
     const QByteArray& getData() const { return _data; }
     const State& getState() const { return _state; }
     const Error& getError() const { return _error; }
-    QUrl getUrl() const;
+    QUrl getUrl() const { return ::getATPUrl(_hash, _extension); }
 
 signals:
     void finished(AssetRequest* thisRequest);
diff --git a/libraries/networking/src/AssetUpload.cpp b/libraries/networking/src/AssetUpload.cpp
index 67c1049d1a..e6f467e717 100644
--- a/libraries/networking/src/AssetUpload.cpp
+++ b/libraries/networking/src/AssetUpload.cpp
@@ -102,7 +102,7 @@ void AssetUpload::start() {
         }
         
         if (_error == NoError && hash == hashData(_data).toHex()) {
-            saveToCache(getUrl(hash, _extension), _data);
+            saveToCache(getATPUrl(hash, _extension), _data);
         }
         
         emit finished(this, hash);
diff --git a/libraries/networking/src/AssetUtils.cpp b/libraries/networking/src/AssetUtils.cpp
index 7311d73525..f37e0af820 100644
--- a/libraries/networking/src/AssetUtils.cpp
+++ b/libraries/networking/src/AssetUtils.cpp
@@ -19,7 +19,7 @@
 
 #include "ResourceManager.h"
 
-QUrl getUrl(const QString& hash, const QString& extension) {
+QUrl getATPUrl(const QString& hash, const QString& extension) {
     if (!extension.isEmpty()) {
         return QUrl(QString("%1:%2.%3").arg(URL_SCHEME_ATP, hash, extension));
     } else {
@@ -66,4 +66,4 @@ bool saveToCache(const QUrl& url, const QByteArray& file) {
         qCWarning(asset_client) << "No disk cache to save assets to.";
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h
index 5fd5c9144d..21b6b3f434 100644
--- a/libraries/networking/src/AssetUtils.h
+++ b/libraries/networking/src/AssetUtils.h
@@ -32,7 +32,7 @@ enum AssetServerError : uint8_t {
     PermissionDenied
 };
 
-QUrl getUrl(const QString& hash, const QString& extension = QString());
+QUrl getATPUrl(const QString& hash, const QString& extension = QString());
 
 QByteArray hashData(const QByteArray& data);