From eea89ba010bedfe3052bf14e68450a6ba404e129 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 12 Oct 2015 14:26:28 -0700 Subject: [PATCH] CR - Rename method --- interface/src/Application.cpp | 4 ++-- interface/src/Application.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0d51ccbbc7..9e9830d977 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4091,7 +4091,7 @@ bool Application::askToUploadAsset(const QString& filename) { // connect to the finished signal so we know when the AssetUpload is done if (messageBox.checkBox() && (messageBox.checkBox()->checkState() == Qt::Checked)) { // Custom behavior for models - QObject::connect(upload, &AssetUpload::finished, this, &Application::assetUploadFinished); + QObject::connect(upload, &AssetUpload::finished, this, &Application::modelUploadFinished); } else { QObject::connect(upload, &AssetUpload::finished, &AssetUploadDialogFactory::getInstance(), @@ -4108,7 +4108,7 @@ bool Application::askToUploadAsset(const QString& filename) { return false; } -void Application::assetUploadFinished(AssetUpload* upload, const QString& hash) { +void Application::modelUploadFinished(AssetUpload* upload, const QString& hash) { auto filename = QFileInfo(upload->getFilename()).fileName(); if ((upload->getError() == AssetUpload::NoError) && diff --git a/interface/src/Application.h b/interface/src/Application.h index 3e443ea843..a2125e7e09 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -329,7 +329,7 @@ private slots: bool askToSetAvatarUrl(const QString& url); bool askToLoadScript(const QString& scriptFilenameOrURL); bool askToUploadAsset(const QString& asset); - void assetUploadFinished(AssetUpload* upload, const QString& hash); + void modelUploadFinished(AssetUpload* upload, const QString& hash); void setSessionUUID(const QUuid& sessionUUID); void domainChanged(const QString& domainHostname);