diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-10-07 21:17:36 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-10-07 21:17:36 +0000 |
| commit | be8175313645542ae50e175a0b72c611e9178ae1 (patch) | |
| tree | 62f95bbc38e5327be81cb0bf904f2710404629e4 /src/plugins/General | |
| parent | 968048296c2d2650a6083a5d99ea3914352958e1 (diff) | |
| download | qmmp-be8175313645542ae50e175a0b72c611e9178ae1.tar.gz qmmp-be8175313645542ae50e175a0b72c611e9178ae1.tar.bz2 qmmp-be8175313645542ae50e175a0b72c611e9178ae1.zip | |
fixed build regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7519 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
| -rw-r--r-- | src/plugins/General/converter/converterdialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/lyrics/lyricswindow.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/scrobbler/scrobblercache.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/udisks2/udisks2device.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
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 |