Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:38:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR - Rename method

Browse source
This commit is contained in:
Atlante45 2015-10-12 14:26:28 -07:00
parent 7b41efcf86
commit eea89ba010
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -4091,7 +4091,7 @@ bool Application::askToUploadAsset(const QString& filename) {
// connect to the finished signal so we know when the AssetUpload is done // connect to the finished signal so we know when the AssetUpload is done
if (messageBox.checkBox() && (messageBox.checkBox()->checkState() == Qt::Checked)) { if (messageBox.checkBox() && (messageBox.checkBox()->checkState() == Qt::Checked)) {
// Custom behavior for models // Custom behavior for models
QObject::connect(upload, &AssetUpload::finished, this, &Application::assetUploadFinished); QObject::connect(upload, &AssetUpload::finished, this, &Application::modelUploadFinished);
} else { } else {
QObject::connect(upload, &AssetUpload::finished, QObject::connect(upload, &AssetUpload::finished,
&AssetUploadDialogFactory::getInstance(), &AssetUploadDialogFactory::getInstance(),
@ -4108,7 +4108,7 @@ bool Application::askToUploadAsset(const QString& filename) {
return false; return false;
} }
void Application::assetUploadFinished(AssetUpload* upload, const QString& hash) { void Application::modelUploadFinished(AssetUpload* upload, const QString& hash) {
auto filename = QFileInfo(upload->getFilename()).fileName(); auto filename = QFileInfo(upload->getFilename()).fileName();
if ((upload->getError() == AssetUpload::NoError) && if ((upload->getError() == AssetUpload::NoError) &&

2
interface/src/Application.h
View file

@ -329,7 +329,7 @@ private slots:
bool askToSetAvatarUrl(const QString& url); bool askToSetAvatarUrl(const QString& url);
bool askToLoadScript(const QString& scriptFilenameOrURL); bool askToLoadScript(const QString& scriptFilenameOrURL);
bool askToUploadAsset(const QString& asset); 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 setSessionUUID(const QUuid& sessionUUID);
void domainChanged(const QString& domainHostname); void domainChanged(const QString& domainHostname);