From d608fd604b4a3c0f0f9ba9dc3bcce7aae6c557f7 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 13 Jan 2013 18:42:11 +0100
Subject: 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
---
 rbutil/rbutilqt/base/bootloaderinstallbase.cpp | 2 +-
 rbutil/rbutilqt/base/httpget.cpp               | 9 ---------
 rbutil/rbutilqt/base/httpget.h                 | 1 -
 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 7a9258accc..6cfb2cd1c6 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 dc2b2ea0ed..05005ee6d3 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 438853ce82..e8a936de08 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 0cdd8365a0..0b94ba4c10 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());
-- 
cgit v1.2.3