From 5a75184c4abfd2c8fa2a3ee705b94fc800d7b918 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Wed, 5 Mar 2008 21:12:24 +0000
Subject: add global proxy / cache settings to httpget class. This removes the
 need of passing proxy / cache values around all the time. Each object can
 still override the global values.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16530 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/installthemes.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'rbutil/rbutilqt/installthemes.cpp')

diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp
index dac7710713..37e2d9ebd7 100644
--- a/rbutil/rbutilqt/installthemes.cpp
+++ b/rbutil/rbutilqt/installthemes.cpp
@@ -65,9 +65,8 @@ void ThemesInstallWindow::downloadInfo()
     url = QUrl(settings->themeUrl() + "/rbutilqt.php?res=" + resolution());
     qDebug() << "downloadInfo()" << url;
     qDebug() << url.queryItems();
-    getter->setProxy(proxy);
     if(settings->cacheOffline())
-        getter->setCache(settings->cachePath());
+        getter->setCache(true);
     getter->setFile(&themesInfo);
     getter->getFile(url);
 }
@@ -172,9 +171,8 @@ void ThemesInstallWindow::updateDetails(int row)
     iniDetails.endGroup();
 
     igetter.abort();
-    igetter.setProxy(proxy);
     if(!settings->cacheDisabled())
-        igetter.setCache(settings->cachePath());
+        igetter.setCache(true);
     else
     {
         if(infocachedir=="")
@@ -248,13 +246,6 @@ void ThemesInstallWindow::abort()
 }
 
 
-void ThemesInstallWindow::setProxy(QUrl p)
-{
-    proxy = p;
-    qDebug() << "setProxy()" << proxy;
-}
-
-
 void ThemesInstallWindow::acceptAll()
 {
     ui.listThemes->selectAll();
@@ -299,12 +290,11 @@ void ThemesInstallWindow::accept()
 
     installer = new ZipInstaller(this);
     installer->setUrl(themes);
-    installer->setProxy(proxy);
     installer->setLogSection(names);
     installer->setLogVersion(version);
     installer->setMountPoint(mountPoint);
     if(!settings->cacheDisabled())
-        installer->setCache(settings->cachePath());
+        installer->setCache(true);
     installer->install(logger);
     connect(logger, SIGNAL(closed()), this, SLOT(close()));
 }
-- 
cgit v1.2.3