From c482e264f488bc2eb6d67ff07274ab0131b18ff5 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 4 Dec 2020 19:13:21 +0100 Subject: [PATCH] Rename variable --- src/core/player.cpp | 10 +++++----- src/core/player.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/player.cpp b/src/core/player.cpp index c02ddc4d3..930175618 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -398,21 +398,21 @@ void Player::NextItem(const Engine::TrackChangeFlags change, const Playlist::Aut } -void Player::PlayPlaylist(const QString &playlistName) { - PlayPlaylistInternal(Engine::Manual, Playlist::AutoScroll_Always, playlistName); +void Player::PlayPlaylist(const QString &playlist_name) { + PlayPlaylistInternal(Engine::Manual, Playlist::AutoScroll_Always, playlist_name); } -void Player::PlayPlaylistInternal(Engine::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const QString &playlistName) { +void Player::PlayPlaylistInternal(Engine::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const QString &playlist_name) { Playlist *playlist = nullptr; for (Playlist *p : app_->playlist_manager()->GetAllPlaylists()) { - if (playlistName == app_->playlist_manager()->GetPlaylistName(p->id())) { + if (playlist_name == app_->playlist_manager()->GetPlaylistName(p->id())) { playlist = p; break; } } if (playlist == nullptr) { - qLog(Warning) << "Playlist '" << playlistName << "' not found."; + qLog(Warning) << "Playlist '" << playlist_name << "' not found."; return; } diff --git a/src/core/player.h b/src/core/player.h index 59b75ff96..3a092b47f 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -82,7 +82,7 @@ class PlayerInterface : public QObject { // Skips this track. Might load more of the current radio station. virtual void Next() = 0; virtual void Previous() = 0; - virtual void PlayPlaylist(const QString &playlistName) = 0; + virtual void PlayPlaylist(const QString &playlist_name) = 0; virtual void SetVolume(const int value) = 0; virtual void VolumeUp() = 0; virtual void VolumeDown() = 0; @@ -163,7 +163,7 @@ class Player : public PlayerInterface { void RestartOrPrevious() override; void Next() override; void Previous() override; - void PlayPlaylist(const QString &playlistName) override; + void PlayPlaylist(const QString &playlist_name) override; void SetVolume(const int value) override; void VolumeUp() override { SetVolume(GetVolume() + 5); } void VolumeDown() override { SetVolume(GetVolume() - 5); } @@ -196,7 +196,7 @@ class Player : public PlayerInterface { void PreviousItem(const Engine::TrackChangeFlags change); void NextInternal(const Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll); - void PlayPlaylistInternal(Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll, const QString &playlistName); + void PlayPlaylistInternal(Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll, const QString &playlist_name); void FatalError(); void ValidSongRequested(const QUrl&);