History

Remove _ prefix from private methods in XMLHttpRequest

Ryan Huffman committed 12 years ago

Commit a5c10221 parent dca555a2 files · +22 −22Browse files

Showing the changes to libraries/script-engine/src/XMLHttpRequestClass.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/XMLHttpRequestClass.cpp+17−17
@@ -63,7 +63,7 @@ QString XMLHttpRequestClass::getStatusText() const { · 62 unmodified lines
63}63}
64 64
65void XMLHttpRequestClass::abort() {65void XMLHttpRequestClass::abort() {
66 _abortRequest();66 abortRequest();
67}67}
68 68
69void XMLHttpRequestClass::setRequestHeader(const QString& name, const QString& value) {69void XMLHttpRequestClass::setRequestHeader(const QString& name, const QString& value) {
@@ -76,18 +76,18 @@ void XMLHttpRequestClass::requestMetaDataChanged() { · 6 unmodified lines
76 // If this is a redirect, abort the current request and start a new one76 // If this is a redirect, abort the current request and start a new one
77 if (redirect.isValid() && _numRedirects < MAXIMUM_REDIRECTS) {77 if (redirect.isValid() && _numRedirects < MAXIMUM_REDIRECTS) {
78 _numRedirects++;78 _numRedirects++;
79 _abortRequest();79 abortRequest();
80 80
81 QUrl newUrl = _url.resolved(redirect.toUrl().toString());81 QUrl newUrl = _url.resolved(redirect.toUrl().toString());
82 _request.setUrl(newUrl);82 _request.setUrl(newUrl);
83 _doSend();83 doSend();
84 }84 }
85}85}
86 86
87void XMLHttpRequestClass::requestDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {87void XMLHttpRequestClass::requestDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
88 if (_readyState == OPENED && bytesReceived > 0) {88 if (_readyState == OPENED && bytesReceived > 0) {
89 _setReadyState(HEADERS_RECEIVED);89 setReadyState(HEADERS_RECEIVED);
90 _setReadyState(LOADING);90 setReadyState(LOADING);
91 }91 }
92}92}
93 93
@@ -113,7 +113,7 @@ QScriptValue XMLHttpRequestClass::getResponseHeader(const QString& name) const { · 19 unmodified lines
113 return QScriptValue::NullValue;113 return QScriptValue::NullValue;
114}114}
115 115
116void XMLHttpRequestClass::_setReadyState(ReadyState readyState) {116void XMLHttpRequestClass::setReadyState(ReadyState readyState) {
117 if (readyState != _readyState) {117 if (readyState != _readyState) {
118 _readyState = readyState;118 _readyState = readyState;
119 if (_onReadyStateChange.isFunction()) {119 if (_onReadyStateChange.isFunction()) {
@@ -135,7 +135,7 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a · 15 unmodified lines
135 }135 }
136 _request.setUrl(_url);136 _request.setUrl(_url);
137 _method = method;137 _method = method;
138 _setReadyState(OPENED);138 setReadyState(OPENED);
139 }139 }
140}140}
141 141
@@ -150,7 +150,7 @@ void XMLHttpRequestClass::send(const QString& data) { · 8 unmodified lines
150 _sendData->setData(data.toUtf8());150 _sendData->setData(data.toUtf8());
151 }151 }
152 152
153 _doSend();153 doSend();
154 154
155 if (!_async) {155 if (!_async) {
156 QEventLoop loop;156 QEventLoop loop;
@@ -160,10 +160,10 @@ void XMLHttpRequestClass::send(const QString& data) { · 3 unmodified lines
160 }160 }
161}161}
162 162
163void XMLHttpRequestClass::_doSend() {163void XMLHttpRequestClass::doSend() {
164 _reply = _manager.sendCustomRequest(_request, _method.toLatin1(), _sendData);164 _reply = _manager.sendCustomRequest(_request, _method.toLatin1(), _sendData);
165 165
166 _connectToReply(_reply);166 connectToReply(_reply);
167 167
168 if (_timeout > 0) {168 if (_timeout > 0) {
169 _timer.start(_timeout);169 _timer.start(_timeout);
@@ -175,9 +175,9 @@ void XMLHttpRequestClass::requestTimeout() { · 5 unmodified lines
175 if (_onTimeout.isFunction()) {175 if (_onTimeout.isFunction()) {
176 _onTimeout.call(QScriptValue::NullValue);176 _onTimeout.call(QScriptValue::NullValue);
177 }177 }
178 _abortRequest();178 abortRequest();
179 _errorCode = QNetworkReply::TimeoutError;179 _errorCode = QNetworkReply::TimeoutError;
180 _setReadyState(DONE);180 setReadyState(DONE);
181 emit requestComplete();181 emit requestComplete();
182}182}
183 183
@@ -203,29 +203,29 @@ void XMLHttpRequestClass::requestFinished() { · 19 unmodified lines
203 _responseData = QScriptValue(QString(_rawResponseData.data()));203 _responseData = QScriptValue(QString(_rawResponseData.data()));
204 }204 }
205 }205 }
206 _setReadyState(DONE);206 setReadyState(DONE);
207 emit requestComplete();207 emit requestComplete();
208}208}
209 209
210void XMLHttpRequestClass::_abortRequest() {210void XMLHttpRequestClass::abortRequest() {
211 // Disconnect from signals we don't want to receive any longer.211 // Disconnect from signals we don't want to receive any longer.
212 disconnect(&_timer, SIGNAL(timeout()), this, SLOT(requestTimeout()));212 disconnect(&_timer, SIGNAL(timeout()), this, SLOT(requestTimeout()));
213 if (_reply) {213 if (_reply) {
214 _disconnectFromReply(_reply);214 disconnectFromReply(_reply);
215 _reply->abort();215 _reply->abort();
216 delete _reply;216 delete _reply;
217 _reply = NULL;217 _reply = NULL;
218 }218 }
219}219}
220 220
221void XMLHttpRequestClass::_connectToReply(QNetworkReply* reply) {221void XMLHttpRequestClass::connectToReply(QNetworkReply* reply) {
222 connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));222 connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
223 connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestError(QNetworkReply::NetworkError)));223 connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestError(QNetworkReply::NetworkError)));
224 connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(requestDownloadProgress(qint64, qint64)));224 connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(requestDownloadProgress(qint64, qint64)));
225 connect(reply, SIGNAL(metaDataChanged()), this, SLOT(requestMetaDataChanged()));225 connect(reply, SIGNAL(metaDataChanged()), this, SLOT(requestMetaDataChanged()));
226}226}
227 227
228void XMLHttpRequestClass::_disconnectFromReply(QNetworkReply* reply) {228void XMLHttpRequestClass::disconnectFromReply(QNetworkReply* reply) {
229 disconnect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));229 disconnect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
230 disconnect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestError(QNetworkReply::NetworkError)));230 disconnect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestError(QNetworkReply::NetworkError)));
231 disconnect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(requestDownloadProgress(qint64, qint64)));231 disconnect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(requestDownloadProgress(qint64, qint64)));