mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:29:32 +02:00
return an empty string for no error
This commit is contained in:
parent
e51aedeb35
commit
85e203e2cb
2 changed files with 5 additions and 4 deletions
|
@ -34,6 +34,8 @@ AssetUpload::AssetUpload(const QString& filename) :
|
||||||
QString AssetUpload::getErrorString() const {
|
QString AssetUpload::getErrorString() const {
|
||||||
// figure out the right error message for error
|
// figure out the right error message for error
|
||||||
switch (_error) {
|
switch (_error) {
|
||||||
|
case AssetUpload::NoError:
|
||||||
|
return QString();
|
||||||
case AssetUpload::PermissionDenied:
|
case AssetUpload::PermissionDenied:
|
||||||
return PERMISSION_DENIED_ERROR;
|
return PERMISSION_DENIED_ERROR;
|
||||||
case AssetUpload::TooLarge:
|
case AssetUpload::TooLarge:
|
||||||
|
@ -45,8 +47,7 @@ QString AssetUpload::getErrorString() const {
|
||||||
case AssetUpload::ServerFileError:
|
case AssetUpload::ServerFileError:
|
||||||
return "The Asset Server failed to store the asset. Please try again.";
|
return "The Asset Server failed to store the asset. Please try again.";
|
||||||
default:
|
default:
|
||||||
// not handled, do not show a message box
|
return QString("Unknown error with code %1").arg(_error);
|
||||||
return QString();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ void MappingRequest::start() {
|
||||||
QString MappingRequest::getErrorString() const {
|
QString MappingRequest::getErrorString() const {
|
||||||
switch (_error) {
|
switch (_error) {
|
||||||
case MappingRequest::NoError:
|
case MappingRequest::NoError:
|
||||||
return "No error";
|
return QString();
|
||||||
case MappingRequest::NotFound:
|
case MappingRequest::NotFound:
|
||||||
return "Asset not found";
|
return "Asset not found";
|
||||||
case MappingRequest::NetworkError:
|
case MappingRequest::NetworkError:
|
||||||
|
@ -42,7 +42,7 @@ QString MappingRequest::getErrorString() const {
|
||||||
case MappingRequest::UnknownError:
|
case MappingRequest::UnknownError:
|
||||||
return "Asset Server internal error";
|
return "Asset Server internal error";
|
||||||
default:
|
default:
|
||||||
return QString();
|
return QString("Unknown error with code %1").arg(_error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue