Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4088 from ctrlaltdavid/qnetworkreply-error-code

Browse source 
Use more appropriate QNetworkReply error code
This commit is contained in:
Clément Brisset 2015-01-13 17:06:42 -08:00
commit 808cbfe16a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/script-engine/src/XMLHttpRequestClass.cpp
View file

@ -66,7 +66,7 @@ QScriptValue XMLHttpRequestClass::getStatus() const {
return QScriptValue(200); return QScriptValue(200);
case QNetworkReply::ContentNotFoundError: case QNetworkReply::ContentNotFoundError:
return QScriptValue(404); return QScriptValue(404);
case QNetworkReply::ContentAccessDenied: case QNetworkReply::ContentConflictError:
return QScriptValue(409); return QScriptValue(409);
case QNetworkReply::TimeoutError: case QNetworkReply::TimeoutError:
return QScriptValue(408); return QScriptValue(408);
@ -89,7 +89,7 @@ QString XMLHttpRequestClass::getStatusText() const {
return "OK"; return "OK";
case QNetworkReply::ContentNotFoundError: case QNetworkReply::ContentNotFoundError:
return "Not Found"; return "Not Found";
case QNetworkReply::ContentAccessDenied: case QNetworkReply::ContentConflictError:
return "Conflict"; return "Conflict";
case QNetworkReply::TimeoutError: case QNetworkReply::TimeoutError:
return "Timeout"; return "Timeout";
@ -196,8 +196,7 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a
} else if (!_file->open(QIODevice::ReadOnly)) { } else if (!_file->open(QIODevice::ReadOnly)) {
qDebug() << "Can't open file " << _url.fileName(); qDebug() << "Can't open file " << _url.fileName();
abortRequest(); abortRequest();
//_errorCode = QNetworkReply::ContentConflictError; // TODO: Use this status when update to Qt 5.3 _errorCode = QNetworkReply::ContentConflictError;
_errorCode = QNetworkReply::ContentAccessDenied;
setReadyState(DONE); setReadyState(DONE);
emit requestComplete(); emit requestComplete();
} else { } else {