aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Transports
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Transports')
-rw-r--r--src/plugins/Transports/http/downloader.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/Transports/http/downloader.cpp b/src/plugins/Transports/http/downloader.cpp
index 76f7c31ac..37e9c3061 100644
--- a/src/plugins/Transports/http/downloader.cpp
+++ b/src/plugins/Transports/http/downloader.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2009 by Ilya Kotov *
+ * Copyright (C) 2006-2010 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -20,11 +20,11 @@
#include <QApplication>
#include <QStringList>
-#include <QSettings>
#include <QDir>
#include <QMap>
#include <stdint.h>
#include <stdlib.h>
+#include <qmmp/qmmpsettings.h>
#include <qmmp/qmmp.h>
#include <qmmp/statehandler.h>
#include "downloader.h"
@@ -215,17 +215,16 @@ void Downloader::run()
qDebug("Downloader: starting download thread");
m_handle = curl_easy_init();
//proxy
- QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
- if (Qmmp::useProxy())
+ if (QmmpSettings::instance()->isProxyEnabled())
curl_easy_setopt(m_handle, CURLOPT_PROXY,
- strdup((Qmmp::proxy().host() + ":" +
- QString("%1").arg(Qmmp::proxy().port())).
+ strdup((QmmpSettings::instance()->proxy().host() + ":" +
+ QString("%1").arg(QmmpSettings::instance()->proxy().port())).
toLatin1 ().constData ()));
- if (Qmmp::useProxyAuth())
+ if (QmmpSettings::instance()->useProxyAuth())
curl_easy_setopt(m_handle, CURLOPT_PROXYUSERPWD,
- strdup((Qmmp::proxy().userName() + ":" +
- Qmmp::proxy().password()).
+ strdup((QmmpSettings::instance()->proxy().userName() + ":" +
+ QmmpSettings::instance()->proxy().password()).
toLatin1 ().constData ()));
// Set url to download