diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-13 18:42:11 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-13 18:48:28 +0100 |
| commit | d608fd604b4a3c0f0f9ba9dc3bcce7aae6c557f7 (patch) | |
| tree | 695b0fa507f9e77f85f75116b8e77c12639f570a | |
| parent | 4307f95a1f57d3038a2d41f0f4c0ddf33f50630d (diff) | |
| download | rockbox-d608fd604b4a3c0f0f9ba9dc3bcce7aae6c557f7.zip rockbox-d608fd604b4a3c0f0f9ba9dc3bcce7aae6c557f7.tar.gz rockbox-d608fd604b4a3c0f0f9ba9dc3bcce7aae6c557f7.tar.bz2 rockbox-d608fd604b4a3c0f0f9ba9dc3bcce7aae6c557f7.tar.xz | |
Remove HttpGet::error() function.
This function returns an internal enum value of QHttp (which is also
deprecated). It was only used for showing an error to the user / showing it in
the system trace. Since it is an enum value it doesn't have much value. Log /
show the error string instead.
Change-Id: I54b9b6026969f8108f779b02a04477f0ad9201ab
| -rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallbase.cpp | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/httpget.cpp | 9 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/httpget.h | 1 | ||||
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 6 |
4 files changed, 4 insertions, 14 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp index 7a9258a..6cfb2cd 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp @@ -80,7 +80,7 @@ void BootloaderInstallBase::downloadBlFinish(bool error) } if(error) { emit logItem(tr("Download error: %1") - .arg(m_http.error()), LOGERROR); + .arg(m_http.errorString()), LOGERROR); emit done(true); return; } diff --git a/rbutil/rbutilqt/base/httpget.cpp b/rbutil/rbutilqt/base/httpget.cpp index dc2b2ea..05005ee 100644 --- a/rbutil/rbutilqt/base/httpget.cpp +++ b/rbutil/rbutilqt/base/httpget.cpp @@ -118,15 +118,6 @@ QByteArray HttpGet::readAll() } -/** @brief get http error - * @return http error - */ -QHttp::Error HttpGet::error() -{ - return http.error(); -} - - void HttpGet::setProxy(const QUrl &proxy) { m_proxy = proxy; diff --git a/rbutil/rbutilqt/base/httpget.h b/rbutil/rbutilqt/base/httpget.h index 438853c..e8a936d 100644 --- a/rbutil/rbutilqt/base/httpget.h +++ b/rbutil/rbutilqt/base/httpget.h @@ -35,7 +35,6 @@ class HttpGet : public QObject bool getFile(const QUrl &url); void setProxy(const QUrl &url); void setProxy(bool); - QHttp::Error error(void); QString errorString(void); void setFile(QFile*); void setCache(const QDir&); diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 0cdd836..0b94ba4 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -224,7 +224,7 @@ void RbUtilQt::downloadInfo() void RbUtilQt::downloadDone(bool error) { if(error) { - qDebug() << "[RbUtil] network error:" << daily->error(); + qDebug() << "[RbUtil] network error:" << daily->errorString(); ui.statusbar->showMessage(tr("Can't get version information!")); QMessageBox::critical(this, tr("Network error"), tr("Can't get version information.\n" @@ -232,7 +232,7 @@ void RbUtilQt::downloadDone(bool error) .arg(daily->errorString())); return; } - qDebug() << "[RbUtil] network status:" << daily->error(); + qDebug() << "[RbUtil] network status:" << daily->errorString(); // read info into ServerInfo object buildInfo.open(); @@ -655,7 +655,7 @@ void RbUtilQt::checkUpdate(void) void RbUtilQt::downloadUpdateDone(bool error) { if(error) { - qDebug() << "[RbUtil] network error:" << update->error(); + qDebug() << "[RbUtil] network error:" << update->errorString(); } else { QString toParse(update->readAll()); |