Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4901 from Chocobozzz/qt5 

[Qt5] Fix compilation error and adapt spotify part to Qt5
This commit is contained in:
John Maguire 2015-06-15 15:16:52 -04:00
parent c8b4612f66 43c98fd74e
commit b674f33dfb
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/clementine-spotifyblob/spotifyclient.cpp
View File

@ -697,7 +697,7 @@ void SpotifyClient::ConvertTrack(sp_track* track, pb::spotify::Track* pb) {
const QByteArray art_id(reinterpret_cast<const char*>(sp_album_cover(
sp_track_album(track), SP_IMAGE_SIZE_LARGE)),
kSpotifyImageIDSize);
const QString art_id_b64 = QString::fromAscii(art_id.toBase64());
const QString art_id_b64 = QString::fromLatin1(art_id.toBase64());
pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64));
// Artists
@ -732,7 +732,7 @@ void SpotifyClient::ConvertAlbum(sp_album* album, pb::spotify::Track* pb) {
const QByteArray art_id(
reinterpret_cast<const char*>(sp_album_cover(album, SP_IMAGE_SIZE_LARGE)),
kSpotifyImageIDSize);
const QString art_id_b64 = QString::fromAscii(art_id.toBase64());
const QString art_id_b64 = QString::fromLatin1(art_id.toBase64());
pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64));
// URI - Blugh
@ -979,7 +979,7 @@ void SpotifyClient::SendPlaybackError(const QString& error) {
}
void SpotifyClient::LoadImage(const QString& id_b64) {
QByteArray id = QByteArray::fromBase64(id_b64.toAscii());
QByteArray id = QByteArray::fromBase64(id_b64.toLatin1());
if (id.length() != kSpotifyImageIDSize) {
qLog(Warning) << "Invalid image ID (did not decode to"
<< kSpotifyImageIDSize << "bytes):" << id_b64;

17
ext/libclementine-common/core/logging.cpp
View File

@ -267,4 +267,21 @@ void DumpStackTrace() {
#endif
}
QDebug CreateLoggerFatal() { return qCreateLogger(Fatal); }
QDebug CreateLoggerError() { return qCreateLogger(Error); }
#ifdef QT_NO_WARNING_OUTPUT
QNoDebug CreateLoggerWarning() { return QNoDebug(); }
#else
QDebug CreateLoggerWarning() { return qCreateLogger(Warning); }
#endif // QT_NO_WARNING_OUTPUT
#ifdef QT_NO_DEBUG_OUTPUT
QNoDebug CreateLoggerInfo() { return QNoDebug(); }
QNoDebug CreateLoggerDebug() { return QNoDebug(); }
#else
QDebug CreateLoggerInfo() { return qCreateLogger(Info); }
QDebug CreateLoggerDebug() { return qCreateLogger(Debug); }
#endif // QT_NO_DEBUG_OUTPUT
} // namespace logging

16
ext/libclementine-common/core/logging.h
View File

@ -61,21 +61,21 @@ void DumpStackTrace();
QString ParsePrettyFunction(const char* pretty_function);
QDebug CreateLogger(Level level, const QString& class_name, int line);
QDebug CreateLoggerFatal() { return qCreateLogger(Fatal); }
QDebug CreateLoggerError() { return qCreateLogger(Error); }
QDebug CreateLoggerFatal();
QDebug CreateLoggerError();
#ifdef QT_NO_WARNING_OUTPUT
QNoDebug CreateLoggerWarning() { return QNoDebug(); }
QNoDebug CreateLoggerWarning();
#else
QDebug CreateLoggerWarning() { return qCreateLogger(Warning); }
QDebug CreateLoggerWarning();
#endif // QT_NO_WARNING_OUTPUT
#ifdef QT_NO_DEBUG_OUTPUT
QNoDebug CreateLoggerInfo() { return QNoDebug(); }
QNoDebug CreateLoggerDebug() { return QNoDebug(); }
QNoDebug CreateLoggerInfo();
QNoDebug CreateLoggerDebug();
#else
QDebug CreateLoggerInfo() { return qCreateLogger(Info); }
QDebug CreateLoggerDebug() { return qCreateLogger(Debug); }
QDebug CreateLoggerInfo();
QDebug CreateLoggerDebug();
#endif // QT_NO_DEBUG_OUTPUT