diff options
Diffstat (limited to 'src/plugins/General')
| -rw-r--r-- | src/plugins/General/lyrics/lyricswindow.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/General/scrobbler/scrobbler.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/General/streambrowser/streamwindow.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/udisks/udisksdevice.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/udisks2/udisks2device.cpp | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index b8ab4f49d..e8d9b1bf3 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -125,17 +125,17 @@ void LyricsWindow::showText(QNetworkReply *reply) return; } - QString temp = url_regexp.cap(1).toAscii(); + QString temp = url_regexp.cap(1).toLatin1(); qDebug("LyricsWindow: received url = %s", qPrintable(temp)); temp.replace("http://lyrics.wikia.com/","http://lyrics.wikia.com/index.php?title="); temp.append("&action=edit"); - QUrl url = QUrl::fromEncoded(temp.toAscii()); + QUrl url = QUrl::fromEncoded(temp.toLatin1()); QString referer = url_regexp.cap(1); qDebug("LyricsWindow: request url = %s", url.toEncoded().constData()); QNetworkRequest request; request.setUrl(url); - request.setRawHeader("Referer", referer.toAscii()); + request.setRawHeader("Referer", referer.toLatin1()); ui.stateLabel->setText(tr("Receiving")); m_http->get(request); reply->deleteLater(); @@ -167,6 +167,6 @@ void LyricsWindow::on_searchPushButton_clicked() QNetworkRequest request; request.setUrl(QUrl("http://lyrics.wikia.com/api.php?action=lyrics&artist=" + ui.artistLineEdit->text()+"&song=" + ui.titleLineEdit->text() + "&fmt=xml")); - request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toAscii()); + request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toLatin1()); m_requestReply = m_http->get(request); } diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index 905f3c425..9f4401041 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -90,7 +90,7 @@ Scrobbler::Scrobbler(const QString &scrobblerUrl, const QString &name, QObject * m_name = name; m_time = new QTime(); m_cache = new ScrobblerCache(Qmmp::configDir() +"scrobbler_"+name+".cache"); - m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toAscii(); + m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toLatin1(); m_http = new QNetworkAccessManager(this); m_core = SoundCore::instance(); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); @@ -326,7 +326,7 @@ void Scrobbler::submit() QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); - request.setRawHeader("Host", url.host().toAscii()); + request.setRawHeader("Host", url.host().toLatin1()); request.setRawHeader("Accept", "*/*"); request.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentLengthHeader, bodyData.size()); @@ -375,7 +375,7 @@ void Scrobbler::sendNotification(const SongInfo &info) QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); - request.setRawHeader("Host", url.host().toAscii()); + request.setRawHeader("Host", url.host().toLatin1()); request.setRawHeader("Accept", "*/*"); request.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentLengthHeader, bodyData.size()); @@ -390,7 +390,7 @@ ScrobblerAuth::ScrobblerAuth(const QString &scrobblerUrl, const QString &authUrl m_scrobblerUrl = scrobblerUrl; m_authUrl = authUrl; m_name = name; - m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toAscii(); + m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toLatin1(); m_http = new QNetworkAccessManager(this); connect(m_http, SIGNAL(finished (QNetworkReply *)), SLOT(processResponse(QNetworkReply *))); @@ -426,7 +426,7 @@ void ScrobblerAuth::getToken() QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); - request.setRawHeader("Host",url.host().toAscii()); + request.setRawHeader("Host",url.host().toLatin1()); request.setRawHeader("Accept", "*/*"); m_getTokenReply = m_http->get(request); } @@ -449,7 +449,7 @@ void ScrobblerAuth::getSession() QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); - request.setRawHeader("Host",url.host().toAscii()); + request.setRawHeader("Host",url.host().toLatin1()); request.setRawHeader("Accept", "*/*"); m_getSessionReply = m_http->get(request); } @@ -480,7 +480,7 @@ void ScrobblerAuth::checkSession(const QString &session) QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); - request.setRawHeader("Host", url.host().toAscii()); + request.setRawHeader("Host", url.host().toLatin1()); request.setRawHeader("Accept", "*/*"); request.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentLengthHeader, bodyData.size()); diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp index cc98d338d..1d8cc24d8 100644 --- a/src/plugins/General/streambrowser/streamwindow.cpp +++ b/src/plugins/General/streambrowser/streamwindow.cpp @@ -159,7 +159,7 @@ void StreamWindow::on_updatePushButton_clicked() { QNetworkRequest request; request.setUrl(QUrl("http://dir.xiph.org/yp.xml")); - request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toAscii()); + request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toLatin1()); m_requestReply = m_http->get(request); ui.statusLabel->setText(tr("Receiving")); ui.statusLabel->show(); diff --git a/src/plugins/General/udisks/udisksdevice.cpp b/src/plugins/General/udisks/udisksdevice.cpp index 0a3bcf0dd..34a5fa49e 100644 --- a/src/plugins/General/udisks/udisksdevice.cpp +++ b/src/plugins/General/udisks/udisksdevice.cpp @@ -37,7 +37,7 @@ UDisksDevice::UDisksDevice(QDBusObjectPath o, QObject *parent) QVariant UDisksDevice::property (const QString &key) { - return m_interface->property(key.toAscii().data()); + return m_interface->property(key.toLatin1().data()); } UDisksDevice::~UDisksDevice() diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp index 3d0e84e07..18090685e 100644 --- a/src/plugins/General/udisks2/udisks2device.cpp +++ b/src/plugins/General/udisks2/udisks2device.cpp @@ -48,7 +48,7 @@ UDisks2Device::~UDisks2Device() QVariant UDisks2Device::property(const QString &key) const { - return m_block_interface->property(key.toAscii().data()); + return m_block_interface->property(key.toLatin1().data()); } bool UDisks2Device::isRemovable() const |
