Formatting

This commit is contained in:
Jonas Kvinge
2019-04-12 19:55:19 +02:00
parent 77903a5ecd
commit 368bb54870
10 changed files with 29 additions and 36 deletions

View File

@@ -595,7 +595,8 @@ bool Database::IntegrityCheck(QSqlDatabase db) {
if (message == "ok") {
ok = true;
break;
} else {
}
else {
if (!error_reported) { app_->AddError(tr("Database corruption detected.")); }
app_->AddError("Database: " + message);
error_reported = true;
@@ -677,9 +678,9 @@ void Database::BackupFile(const QString &filename) {
do {
ret = sqlite3_backup_step(backup, 16);
const int page_count = sqlite3_backup_pagecount(backup);
app_->task_manager()->SetTaskProgress(
task_id, page_count - sqlite3_backup_remaining(backup), page_count);
} while (ret == SQLITE_OK);
app_->task_manager()->SetTaskProgress(task_id, page_count - sqlite3_backup_remaining(backup), page_count);
}
while (ret == SQLITE_OK);
if (ret != SQLITE_DONE) {
qLog(Error) << "Database backup failed";

View File

@@ -1321,7 +1321,7 @@ void MainWindow::AddToPlaylist(QAction *action) {
}
SongList songs;
for (const PlaylistItemPtr &item : items) {
for (const PlaylistItemPtr item : items) {
songs << item->Metadata();
}
@@ -1587,7 +1587,7 @@ void MainWindow::EditTracks() {
void MainWindow::EditTagDialogAccepted() {
for (const PlaylistItemPtr &item : edit_tag_dialog_->playlist_items()) {
for (const PlaylistItemPtr item : edit_tag_dialog_->playlist_items()) {
item->Reload();
}
@@ -2256,7 +2256,7 @@ void MainWindow::AutoCompleteTags() {
void MainWindow::AutoCompleteTagsAccepted() {
for (const PlaylistItemPtr &item : autocomplete_tag_items_) {
for (const PlaylistItemPtr item : autocomplete_tag_items_) {
item->Reload();
}

View File

@@ -265,8 +265,6 @@ bool RemoveRecursive(const QString &path) {
return dir.rmdir(path);
return true;
}
bool CopyRecursive(const QString &source, const QString &destination) {

View File

@@ -861,7 +861,7 @@ void Playlist::InsertItems(const PlaylistItemList &itemsIn, int pos, bool play_n
// exercise vetoes
SongList songs;
for (const PlaylistItemPtr &item : items) {
for (const PlaylistItemPtr item : items) {
songs << item->Metadata();
}
@@ -1736,7 +1736,7 @@ QSortFilterProxyModel *Playlist::proxy() const { return proxy_; }
SongList Playlist::GetAllSongs() const {
SongList ret;
for (const PlaylistItemPtr &item : items_) {
for (const PlaylistItemPtr item : items_) {
ret << item->Metadata();
}
return ret;
@@ -1746,7 +1746,7 @@ PlaylistItemList Playlist::GetAllItems() const { return items_; }
quint64 Playlist::GetTotalLength() const {
quint64 ret = 0;
for (const PlaylistItemPtr &item : items_) {
for (const PlaylistItemPtr item : items_) {
quint64 length = item->Metadata().length_nanosec();
if (length > 0) ret += length;
}

View File

@@ -292,7 +292,7 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemList &items,
if (db_->CheckErrors(clear)) return;
// Save the new ones
for (const PlaylistItemPtr &item : items) {
for (const PlaylistItemPtr item : items) {
insert.bindValue(":playlist", playlist);
item->BindToQuery(&insert);

View File

@@ -451,7 +451,7 @@ void PlaylistManager::SongsDiscovered(const SongList &songs) {
for (const Song &song : songs) {
for (const Data &data : playlists_) {
PlaylistItemList items = data.p->collection_items_by_id(song.id());
for (PlaylistItemPtr &item : items) {
for (const PlaylistItemPtr item : items) {
if (item->Metadata().directory_id() != song.directory_id()) continue;
static_cast<CollectionPlaylistItem*>(item.get())->SetMetadata(song);
data.p->ItemChanged(item);