replaced toAscii by toLatin1

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6933 90c681e8-e032-0410-971d-27865f9a5e38

16 files changed, 33 insertions, 33 deletions

diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index 4b5fcadaf..aa5ccd45a 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -49,7 +49,7 @@
 #ifdef Q_OS_WIN
 #define UDS_PATH QString("qmmp")
 #else
-#define UDS_PATH QString("/tmp/qmmp.sock.%1").arg(getuid()).toAscii().constData()
+#define UDS_PATH QString("/tmp/qmmp.sock.%1").arg(getuid()).toLatin1().constData()
 #endif
 
 using namespace std;
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
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 66c753832..6cb7bab75 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -141,7 +141,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
     }
     else
     {
-        cdio = cdio_open_cd(device_path.toAscii().constData());
+        cdio = cdio_open_cd(device_path.toLatin1().constData());
         if (!cdio)
         {
             qWarning("DecoderCDAudio: failed to open CD.");
@@ -246,12 +246,12 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
                 {
                     QUrl proxy = QmmpSettings::instance()->proxy();
                     cddb_http_proxy_enable (cddb_conn);
-                    cddb_set_http_proxy_server_name (cddb_conn, proxy.host().toAscii ());
+                    cddb_set_http_proxy_server_name (cddb_conn, proxy.host().toLatin1 ());
                     cddb_set_http_proxy_server_port (cddb_conn, proxy.port());
                     if(QmmpSettings::instance()->useProxyAuth())
                     {
-                        cddb_set_http_proxy_username (cddb_conn, proxy.userName().toAscii());
-                        cddb_set_http_proxy_password (cddb_conn, proxy.password().toAscii());
+                        cddb_set_http_proxy_username (cddb_conn, proxy.userName().toLatin1());
+                        cddb_set_http_proxy_password (cddb_conn, proxy.password().toLatin1());
                     }
                 }
             }
@@ -438,7 +438,7 @@ bool DecoderCDAudio::initialize()
     }
     else
     {
-        m_cdio = cdio_open_cd(device_path.toAscii().constData());
+        m_cdio = cdio_open_cd(device_path.toLatin1().constData());
         if (!m_cdio)
         {
             qWarning("DecoderCDAudio: failed to open CD.");
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index 74fdd4a1d..13b955050 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -79,7 +79,7 @@ QPixmap OpusMetaDataModel::cover()
     for(uint i = 0; i < list.size(); ++i)
     {
         TagLib::String value = list[i];
-        QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toAscii());
+        QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toLatin1());
         if(block.size() < 32)
             continue;
         qint64 pos = 0;
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index b7e60e39d..a12555810 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -79,7 +79,7 @@ QPixmap VorbisMetaDataModel::cover()
     for(uint i = 0; i < list.size(); ++i)
     {
         TagLib::String value = list[i];
-        QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toAscii());
+        QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toLatin1());
         if(block.size() < 32)
             continue;
         qint64 pos = 0;
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 2c49056da..f8135f3f0 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -38,7 +38,7 @@ OutputALSA::OutputALSA() : m_inited(false)
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString dev_name = settings.value("ALSA/device","default").toString();
     m_use_mmap = settings.value("ALSA/use_mmap", false).toBool();
-    pcm_name = strdup(dev_name.toAscii().data());
+    pcm_name = strdup(dev_name.toLatin1().data());
     pcm_handle = 0;
     m_prebuf = 0;
     m_prebuf_size = 0;
@@ -449,7 +449,7 @@ int VolumeALSA::setupMixer(QString card, QString device)
     if ((err = getMixer(&m_mixer, card)) < 0)
         return err;
 
-    parseMixerName(device.toAscii().data(), &name, &index);
+    parseMixerName(device.toLatin1().data(), &name, &index);
 
     pcm_element = getMixerElem(m_mixer, name, index);
 
@@ -536,7 +536,7 @@ int VolumeALSA::getMixer(snd_mixer_t **mixer, QString card)
         return -1;
     }
 
-    if ((err = snd_mixer_attach(*mixer, card.toAscii().constData())) < 0)
+    if ((err = snd_mixer_attach(*mixer, card.toLatin1().constData())) < 0)
     {
         qWarning("OutputALSA: Attaching to mixer %s failed: %s",
                  qPrintable(card), snd_strerror(-err));
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index b30640000..89cdfe527 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -244,7 +244,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
         mixer = NULL;
         return -1;
     }
-    if ((err = snd_mixer_attach(*mixer, card.toAscii().constData())) < 0)
+    if ((err = snd_mixer_attach(*mixer, card.toLatin1().constData())) < 0)
     {
         qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
                  "Attaching to mixer %s failed: %s", qPrintable(card), snd_strerror(-err));
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 8b70a6e55..2431cd45a 100644
--- a/src/plugins/Output/oss/outputoss.cpp
+++ b/src/plugins/Output/oss/outputoss.cpp
@@ -72,7 +72,7 @@ void OutputOSS::sync()
 
 bool OutputOSS::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
 {
-    m_audio_fd = open(m_audio_device.toAscii(), O_WRONLY);
+    m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY);
 
     if (m_audio_fd < 0)
     {
@@ -215,7 +215,7 @@ void VolumeOSS::openMixer()
 {
     if (m_mixer_fd >= 0)
         return;
-    m_mixer_fd = open(m_mixer_device.toAscii(), O_RDWR);
+    m_mixer_fd = open(m_mixer_device.toLatin1(), O_RDWR);
     if (m_mixer_fd < 0)
     {
         qWarning("VolumeControlOSS: unable to open mixer device '%s'", qPrintable(m_mixer_device));
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp
index 0f4986fee..c8e45f4e9 100644
--- a/src/plugins/Output/oss4/outputoss4.cpp
+++ b/src/plugins/Output/oss4/outputoss4.cpp
@@ -108,7 +108,7 @@ void OutputOSS4::sync()
 
 bool OutputOSS4::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
 {
-    m_audio_fd = open(m_audio_device.toAscii(), O_WRONLY);
+    m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY);
 
     if (m_audio_fd < 0)
     {
diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
index c93aa1624..adea65e0e 100644
--- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
@@ -69,9 +69,9 @@ QStringList XSPFPlaylistFormat::decode(const QString & contents)
 
                 QUrl url(xml.text().toString());
                 if (url.scheme() == "file")  //remove scheme for local files only
-                    out << QUrl::fromPercentEncoding(url.toString().toAscii()).remove("file://");
+                    out << QUrl::fromPercentEncoding(url.toString().toLatin1()).remove("file://");
                 else
-                    out << QUrl::fromPercentEncoding(url.toString().toAscii());
+                    out << QUrl::fromPercentEncoding(url.toString().toLatin1());
             }
             else
                 xml.skipCurrentElement();
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index 7e2c018af..8668d144a 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -306,7 +306,7 @@ void HttpStreamReader::run()
                                 toLatin1 ().constData ()));
 
     // Set url to download
-    curl_easy_setopt(m_handle, CURLOPT_URL, strdup(m_url.toAscii().constData()));
+    curl_easy_setopt(m_handle, CURLOPT_URL, strdup(m_url.toLatin1().constData()));
     // callback for wrting
     curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION, curl_write_data);
     // Set destination file
diff --git a/src/qmmpui/playlistdownloader.cpp b/src/qmmpui/playlistdownloader.cpp
index 32c0ef8cb..1ce542aab 100644
--- a/src/qmmpui/playlistdownloader.cpp
+++ b/src/qmmpui/playlistdownloader.cpp
@@ -29,7 +29,7 @@
 PlayListDownloader::PlayListDownloader(QObject *parent) : QObject(parent)
 {
     m_getReply = 0;
-    m_ua = QString("qmmp/%1").arg(Qmmp::strVersion()).toAscii();
+    m_ua = QString("qmmp/%1").arg(Qmmp::strVersion()).toLatin1();
     m_manager = new QNetworkAccessManager(this);
     connect(m_manager, SIGNAL(finished (QNetworkReply *)), SLOT(readResponse(QNetworkReply *)));
     //load global proxy settings