fixed build regression

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

14 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp
index 663a7122f..ad7ee07d7 100644
--- a/src/plugins/Engines/mplayer/mplayerengine.cpp
+++ b/src/plugins/Engines/mplayer/mplayerengine.cpp
@@ -56,7 +56,7 @@ FileInfo *MplayerInfo::createFileInfo(const QString &path)
     mplayer_process.start("mplayer", args);
     mplayer_process.waitForFinished(1500);
     mplayer_process.kill();
-    QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed();
+    QString str = QString::fromLocal8Bit(mplayer_process.readAll().constData()).trimmed();
     FileInfo *info = new FileInfo(path);
     QStringList lines = str.split("\n");
     foreach(QString line, lines)
@@ -194,7 +194,7 @@ void MplayerEngine::setMuted(bool muted)
 
 void MplayerEngine::readStdOut()
 {
-    QString line = QString::fromLocal8Bit(m_process->readAll ()).trimmed();
+    QString line = QString::fromLocal8Bit(m_process->readAll().constData()).trimmed();
     QStringList lines = line.split("\n");
     foreach(line, lines)
     {
diff --git a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
index efac4af80..a16a4dabf 100644
--- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
+++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
@@ -64,7 +64,7 @@ QHash<QString, QString> MplayerMetaDataModel::audioProperties()
     QProcess mplayer_process;
     mplayer_process.start("mplayer", args);
     mplayer_process.waitForFinished();
-    QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed();
+    QString str = QString::fromLocal8Bit(mplayer_process.readAll().constData()).trimmed();
     QStringList lines = str.split("\n");
     int height = 0, width = 0;
     //mplayer std output parsing
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index c80e6c132..11266e611 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -272,7 +272,7 @@ void ConverterDialog::readPresets(const QString &path)
     QList <QVariantMap> dataList;
     while(!file.atEnd())
     {
-        QString line = QString::fromUtf8(file.readLine().trimmed());
+        QString line = QString::fromUtf8(file.readLine().trimmed().constData());
         if(!line.contains("="))
             continue;
         QString key = line.split("=").at(0);
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index d914e1630..c899e71bc 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -189,7 +189,7 @@ QString LyricsWindow::cacheFilePath() const
 {
     QString name = m_ui.artistLineEdit->text() + "_" + m_ui.titleLineEdit->text();
     QByteArray hash = QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Md5);
-    return m_cachePath + QString::fromLatin1(hash.toHex()) + ".html";
+    return m_cachePath + QString::fromLatin1(hash.toHex().constData()) + ".html";
 }
 
 bool LyricsWindow::loadFromCache()
@@ -205,7 +205,7 @@ bool LyricsWindow::loadFromCache()
         return false;
     }
 
-    m_ui.textBrowser->setHtml(QString::fromUtf8(file.readAll()));
+    m_ui.textBrowser->setHtml(QString::fromUtf8(file.readAll().constData()));
     m_ui.stateLabel->setText(tr("Done"));
     return true;
 }
diff --git a/src/plugins/General/scrobbler/scrobblercache.cpp b/src/plugins/General/scrobbler/scrobblercache.cpp
index 70f2f8f7b..5a4475062 100644
--- a/src/plugins/General/scrobbler/scrobblercache.cpp
+++ b/src/plugins/General/scrobbler/scrobblercache.cpp
@@ -123,7 +123,7 @@ QList<SongInfo> ScrobblerCache::load()
 
     while (!file.atEnd())
     {
-        line = QString::fromUtf8(file.readLine()).trimmed();
+        line = QString::fromUtf8(file.readLine().constData()).trimmed();
         if ((s = line.indexOf("=")) < 0)
             continue;
 
diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp
index b307d57df..a6f4499ce 100644
--- a/src/plugins/General/udisks2/udisks2device.cpp
+++ b/src/plugins/General/udisks2/udisks2device.cpp
@@ -103,7 +103,7 @@ QStringList UDisks2Device::mountPoints() const
 
 QString UDisks2Device::deviceFile() const
 {
-    return QString::fromAscii(m_block_interface->property("Device").toByteArray());
+    return QString::fromAscii(m_block_interface->property("Device").toByteArray().constData());
 }
 
 QDBusObjectPath UDisks2Device::objectPath() const
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 69f5d2c0a..866d517e1 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -241,17 +241,17 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
             if (settings.value("cddb_http", false).toBool())
             {
                 cddb_http_enable (cddb_conn);
-                cddb_set_http_path_query (cddb_conn, settings.value("cddb_path").toByteArray());
+                cddb_set_http_path_query (cddb_conn, settings.value("cddb_path").toByteArray().constData());
                 if (QmmpSettings::instance()->isProxyEnabled())
                 {
                     QUrl proxy = QmmpSettings::instance()->proxy();
                     cddb_http_proxy_enable (cddb_conn);
-                    cddb_set_http_proxy_server_name (cddb_conn, proxy.host().toLatin1 ());
+                    cddb_set_http_proxy_server_name (cddb_conn, proxy.host().toLatin1().constData());
                     cddb_set_http_proxy_server_port (cddb_conn, proxy.port());
                     if(QmmpSettings::instance()->useProxyAuth())
                     {
-                        cddb_set_http_proxy_username (cddb_conn, proxy.userName().toLatin1());
-                        cddb_set_http_proxy_password (cddb_conn, proxy.password().toLatin1());
+                        cddb_set_http_proxy_username (cddb_conn, proxy.userName().toLatin1().constData());
+                        cddb_set_http_proxy_password (cddb_conn, proxy.password().toLatin1().constData());
                     }
                 }
             }
diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
index 4b071de75..42b2c0646 100644
--- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
+++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
@@ -77,7 +77,7 @@ QList<FileInfo *> DecoderWildMidiFactory::createPlayList(const QString &fileName
 
     if(WildMidiHelper::instance()->initialize() && WildMidiHelper::instance()->sampleRate())
     {
-        void *midi_ptr = WildMidi_Open (fileName.toLocal8Bit());
+        void *midi_ptr = WildMidi_Open (fileName.toLocal8Bit().constData());
         if(midi_ptr)
         {
             WildMidiHelper::instance()->addPtr(midi_ptr);
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 2431cd45a..86d406926 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.toLatin1(), O_WRONLY);
+    m_audio_fd = open(m_audio_device.toLatin1().constData(), 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.toLatin1(), O_RDWR);
+    m_mixer_fd = open(m_mixer_device.toLatin1().constData(), O_RDWR);
     if (m_mixer_fd < 0)
     {
         qWarning("VolumeControlOSS: unable to open mixer device '%s'", qPrintable(m_mixer_device));
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
index f5f0020ea..dd2ee0cd5 100644
--- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
@@ -35,7 +35,7 @@ const PlayListFormatProperties M3UPlaylistFormat::properties() const
 QList<PlayListTrack *> M3UPlaylistFormat::decode(const QByteArray &contents)
 {
     QList<PlayListTrack*> out;
-    QStringList splitted = QString::fromUtf8(contents).split("\n");
+    QStringList splitted = QString::fromUtf8(contents.constData()).split("\n");
     if(splitted.isEmpty())
         return out;
 
diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
index 8dec29304..9ee2fdd70 100644
--- a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
@@ -35,7 +35,7 @@ const PlayListFormatProperties PLSPlaylistFormat::properties() const
 QList<PlayListTrack *> PLSPlaylistFormat::decode(const QByteArray &contents)
 {
     QList<PlayListTrack *> out;
-    QStringList splitted = QString::fromUtf8(contents).split("\n");
+    QStringList splitted = QString::fromUtf8(contents.constData()).split("\n");
 
     if(splitted.isEmpty())
     {
diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
index 7a69aab81..562b8d154 100644
--- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
@@ -41,7 +41,7 @@ QList<PlayListTrack*> XSPFPlaylistFormat::decode(const QByteArray &contents)
 {
     QList<PlayListTrack*> out;
     QString currentTag;
-    QString contents_copy = QString::fromUtf8(contents);
+    QString contents_copy = QString::fromUtf8(contents.constData());
 
     //remove control symbols to avoid xml errors
     for(int i = 0; i < contents_copy.size(); ++i)
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index be051a89b..861c17735 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -75,7 +75,7 @@ static size_t curl_header(void *data, size_t size, size_t nmemb,
     }
     else
     {
-        QString key = QString::fromLatin1(header.left(header.indexOf(":")).trimmed().toLower());
+        QString key = QString::fromLatin1(header.left(header.indexOf(":")).trimmed().toLower().constData());
         QByteArray value = header.right(header.size() - header.indexOf(":") - 1).trimmed();
         dl->stream()->header.insert(key, value);
         qDebug("HttpStreamReader: key=%s, value=%s",qPrintable(key), value.constData());
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 6cd66d032..ed7edf89e 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -566,7 +566,7 @@ void Skin::loadVisColor()
     {
         j++;
         QByteArray line = file.readLine ();
-        QString tmp = QString::fromAscii (line);
+        QString tmp = QString::fromLatin1(line.constData());
         tmp = tmp.trimmed ();
         tmp.remove("\"");
         int i = tmp.indexOf ("//");