aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/lyrics/lyricswindow.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-01-22 22:07:03 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-01-22 22:07:03 +0000
commit68bb7c9621bc02451f968a3d389a2f6ff2daddfb (patch)
tree8dfba6ba7b131b0c93756bbe3ef2af89edacbdee /src/plugins/General/lyrics/lyricswindow.cpp
parentae5f1ffdb2490ec942346fd9509744292f6de21a (diff)
downloadqmmp-68bb7c9621bc02451f968a3d389a2f6ff2daddfb.tar.gz
qmmp-68bb7c9621bc02451f968a3d389a2f6ff2daddfb.tar.bz2
qmmp-68bb7c9621bc02451f968a3d389a2f6ff2daddfb.zip
added special class for settings
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1523 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/lyrics/lyricswindow.cpp')
-rw-r--r--src/plugins/General/lyrics/lyricswindow.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index a3c9262bd..22b81b1b9 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -21,6 +21,7 @@
#include <QHttp>
#include <QUrl>
#include <QRegExp>
+#include <qmmp/qmmpsettings.h>
#include <qmmp/qmmp.h>
#include "lyricswindow.h"
@@ -35,12 +36,13 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget
ui.artistLineEdit->setText(artist);
ui.titleLineEdit->setText(title);
m_http = new QHttp(this);
- //load global proxy settings
- if (Qmmp::useProxy())
- m_http->setProxy(Qmmp::proxy().host(),
- Qmmp::proxy().port(),
- Qmmp::useProxyAuth() ? Qmmp::proxy().userName() : QString(),
- Qmmp::useProxyAuth() ? Qmmp::proxy().password() : QString());
+ //load global proxy settings
+ QmmpSettings *gs = QmmpSettings::instance();
+ if (gs->isProxyEnabled())
+ m_http->setProxy(gs->proxy().host(),
+ gs->proxy().port(),
+ gs->useProxyAuth() ? gs->proxy().userName() : QString(),
+ gs->useProxyAuth() ? gs->proxy().password() : QString());
connect(m_http, SIGNAL(done(bool)), SLOT(showText(bool)));
connect(m_http, SIGNAL(stateChanged(int)), SLOT(showState (int)));
on_searchPushButton_clicked();