dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix casts from QByteArray

Browse Source
This commit is contained in:
Jonas Kvinge
2022-09-12 22:39:08 +02:00
parent b5fc19f08a
commit 78d6fd634b
9 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/deviceproperties.cpp
View File

@@ -175,7 +175,7 @@ void DeviceProperties::UpdateHardwareInfo() {
AddHardwareInfo(row++, tr("Manufacturer"), lister->DeviceManufacturer(id));
keys = info.keys();
for (const QString &key : keys) {
AddHardwareInfo(row++, tr(key.toLatin1()), info[key].toString());
AddHardwareInfo(row++, key, info[key].toString());
}
ui_->hardware_info->sortItems(0);

17
src/device/gpoddevice.cpp
View File

@@ -203,7 +203,8 @@ bool GPodDevice::CopyToStorage(const CopyJob &job) {
cover_file->close();
QImage image = job.metadata_.image();
if (image.save(cover_file->fileName(), "JPG")) {
result = itdb_track_set_thumbnails(track, QFile::encodeName(cover_file->fileName()));
const QByteArray filename = QFile::encodeName(cover_file->fileName());
result = itdb_track_set_thumbnails(track, filename.constData());
if (result) {
cover_files_ << cover_file;
track->has_artwork = 1;
@@ -218,7 +219,8 @@ bool GPodDevice::CopyToStorage(const CopyJob &job) {
}
}
else if (!job.cover_source_.isEmpty()) {
result = itdb_track_set_thumbnails(track, QFile::encodeName(job.cover_source_));
const QByteArray filename = QFile::encodeName(job.cover_source_);
result = itdb_track_set_thumbnails(track, filename.constData());
if (result) track->has_artwork = 1;
}
else {
@@ -245,14 +247,15 @@ bool GPodDevice::CopyToStorage(const CopyJob &job) {
// Put the track in the playlist, if one is specified
if (!job.playlist_.isEmpty()) {
// Does the playlist already exist?
auto itdbPlaylist = itdb_playlist_by_name(db_, job.playlist_.toUtf8().data());
if (itdbPlaylist == nullptr) {
QByteArray playlist_name = job.playlist_.toUtf8();
Itdb_Playlist *playlist = itdb_playlist_by_name(db_, playlist_name.data());
if (!playlist) {
// Create the playlist
itdbPlaylist = itdb_playlist_new(job.playlist_.toUtf8().data(), false);
itdb_playlist_add(db_, itdbPlaylist, -1);
playlist = itdb_playlist_new(playlist_name.data(), false);
itdb_playlist_add(db_, playlist, -1);
}
// Playlist should exist so add the track to the playlist
itdb_playlist_add_track(itdbPlaylist, track, -1);
itdb_playlist_add_track(playlist, track, -1);
}
AddTrackToModel(track, url_.path());

3
src/device/gpodloader.cpp
View File

@@ -65,8 +65,9 @@ void GPodLoader::LoadDatabase() {
Itdb_iTunesDB *GPodLoader::TryLoad() {
// Load the iTunes database
const QByteArray mountpoint = QDir::toNativeSeparators(mount_point_).toLocal8Bit();
GError *error = nullptr;
Itdb_iTunesDB *db = itdb_parse(QDir::toNativeSeparators(mount_point_).toLocal8Bit(), &error);
Itdb_iTunesDB *db = itdb_parse(mountpoint.constData(), &error);
// Check for errors
if (!db) {