summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@nokia.com>2011-10-21 20:23:44 +0200
committerYoann Lopes <yoann.lopes@nokia.com>2011-10-21 20:23:44 +0200
commit2e7887e14ab7c28e354fd485486dddf70488eb61 (patch)
tree92e3d0dd295864b93d3e0603e01a56b4b3615b2d
parent93cd0000421b4dabfec5a967606be42980f9e02f (diff)
Use UTF8 encoding for all Spotify strings.
-rw-r--r--libQtSpotify/qspotifyalbum.cpp2
-rw-r--r--libQtSpotify/qspotifyartist.cpp2
-rw-r--r--libQtSpotify/qspotifyartistbrowse.cpp2
-rw-r--r--libQtSpotify/qspotifysession.cpp6
-rw-r--r--libQtSpotify/qspotifyuser.cpp4
5 files changed, 8 insertions, 8 deletions
diff --git a/libQtSpotify/qspotifyalbum.cpp b/libQtSpotify/qspotifyalbum.cpp
index cb371af..0c57e01 100644
--- a/libQtSpotify/qspotifyalbum.cpp
+++ b/libQtSpotify/qspotifyalbum.cpp
@@ -88,7 +88,7 @@ bool QSpotifyAlbum::updateData()
if (link) {
char buffer[200];
int uriSize = sp_link_as_string(link, &buffer[0], 200);
- m_coverId = QString::fromLatin1(&buffer[0], uriSize);
+ m_coverId = QString::fromUtf8(&buffer[0], uriSize);
sp_link_release(link);
updated = true;
}
diff --git a/libQtSpotify/qspotifyartist.cpp b/libQtSpotify/qspotifyartist.cpp
index 8ef6b32..f501f1d 100644
--- a/libQtSpotify/qspotifyartist.cpp
+++ b/libQtSpotify/qspotifyartist.cpp
@@ -79,7 +79,7 @@ bool QSpotifyArtist::updateData()
if (link) {
char buffer[200];
int uriSize = sp_link_as_string(link, &buffer[0], 200);
- m_pictureId = QString::fromLatin1(&buffer[0], uriSize);
+ m_pictureId = QString::fromUtf8(&buffer[0], uriSize);
sp_link_release(link);
updated = true;
}
diff --git a/libQtSpotify/qspotifyartistbrowse.cpp b/libQtSpotify/qspotifyartistbrowse.cpp
index 85303d5..7fe77c5 100644
--- a/libQtSpotify/qspotifyartistbrowse.cpp
+++ b/libQtSpotify/qspotifyartistbrowse.cpp
@@ -172,7 +172,7 @@ void QSpotifyArtistBrowse::processData()
sp_link *link = sp_link_create_from_artistbrowse_portrait(m_sp_artistbrowse, 0);
char buffer[200];
int uriSize = sp_link_as_string(link, &buffer[0], 200);
- m_pictureId = QString::fromLatin1(&buffer[0], uriSize);
+ m_pictureId = QString::fromUtf8(&buffer[0], uriSize);
sp_link_release(link);
}
diff --git a/libQtSpotify/qspotifysession.cpp b/libQtSpotify/qspotifysession.cpp
index b4a2731..043aeb7 100644
--- a/libQtSpotify/qspotifysession.cpp
+++ b/libQtSpotify/qspotifysession.cpp
@@ -746,7 +746,7 @@ void QSpotifySession::login(const QString &username, const QString &password)
if (password.isEmpty())
sp_session_relogin(m_sp_session);
else
- sp_session_login(m_sp_session, username.toLatin1().constData(), password.toLatin1().constData(), true);
+ sp_session_login(m_sp_session, username.toUtf8().constData(), password.toUtf8().constData(), true);
}
void QSpotifySession::logout(bool keepLoginInfo)
@@ -930,7 +930,7 @@ QString QSpotifySession::getStoredLoginInformation() const
char buffer[200];
int size = sp_session_remembered_user(m_sp_session, &buffer[0], 200);
if (size > 0) {
- username = QString::fromLatin1(&buffer[0], size);
+ username = QString::fromUtf8(&buffer[0], size);
}
return username;
}
@@ -957,7 +957,7 @@ static void callback_image_loaded(sp_image *image, void *)
void QSpotifySession::sendImageRequest(const QString &id)
{
- sp_link *link = sp_link_create_from_string(id.toLatin1().constData());
+ sp_link *link = sp_link_create_from_string(id.toUtf8().constData());
sp_image *image = sp_image_create_from_link(m_sp_session, link);
sp_link_release(link);
diff --git a/libQtSpotify/qspotifyuser.cpp b/libQtSpotify/qspotifyuser.cpp
index d24b6b8..dc5fd62 100644
--- a/libQtSpotify/qspotifyuser.cpp
+++ b/libQtSpotify/qspotifyuser.cpp
@@ -111,7 +111,7 @@ QSpotifyPlaylistContainer *QSpotifyUser::playlistContainer() const
pc = sp_session_playlistcontainer(QSpotifySession::instance()->m_sp_session);
sp_playlistcontainer_add_ref(pc);
} else {
- pc = sp_session_publishedcontainer_for_user_create(QSpotifySession::instance()->m_sp_session, m_canonicalName.toLatin1().constData());
+ pc = sp_session_publishedcontainer_for_user_create(QSpotifySession::instance()->m_sp_session, m_canonicalName.toUtf8().constData());
}
m_playlistContainer = new QSpotifyPlaylistContainer(pc);
connect(m_playlistContainer, SIGNAL(playlistContainerDataChanged()), this, SIGNAL(playlistsChanged()));
@@ -126,7 +126,7 @@ QSpotifyPlaylist *QSpotifyUser::starredList() const
if (QSpotifySession::instance()->user() == this) {
sl = sp_session_starred_create(QSpotifySession::instance()->m_sp_session);
} else {
- sl = sp_session_starred_for_user_create(QSpotifySession::instance()->m_sp_session, m_canonicalName.toLatin1().constData());
+ sl = sp_session_starred_for_user_create(QSpotifySession::instance()->m_sp_session, m_canonicalName.toUtf8().constData());
}
m_starredList = new QSpotifyPlaylist(QSpotifyPlaylist::Starred, sl, false);
connect(m_starredList, SIGNAL(playlistDataChanged()), this, SIGNAL(playlistsChanged()));