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

Don't pass non-const references

This commit is contained in:
David Sansome 2010-04-14 16:12:33 +00:00
parent 65440dd374
commit 76ef868c0a
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/playlist.cpp
View File

@ -630,7 +630,7 @@ void Playlist::Save() const {
for (int i=0 ; i<items_.count() ; ++i) {
settings_->setArrayIndex(i);
settings_->setValue("type", items_.at(i)->type_string());
items_.at(i)->Save(*settings_.get());
items_.at(i)->Save(settings_.get());
}
settings_->endArray();

2
src/playlistitem.h
View File

@ -50,7 +50,7 @@ class PlaylistItem {
virtual Options options() const { return Default; }
virtual void Save(SettingsProvider& settings) const = 0;
virtual void Save(SettingsProvider* settings) const = 0;
virtual void Restore(const SettingsProvider& settings) = 0;
virtual void Reload() {}

10
src/radioplaylistitem.cpp
View File

@ -37,11 +37,11 @@ RadioPlaylistItem::RadioPlaylistItem(RadioService* service, const QUrl& url,
InitMetadata();
}
void RadioPlaylistItem::Save(SettingsProvider& settings) const {
settings.setValue("service", service_->name());
settings.setValue("url", url_.toString());
settings.setValue("title", title_);
settings.setValue("artist", artist_);
void RadioPlaylistItem::Save(SettingsProvider* settings) const {
settings->setValue("service", service_->name());
settings->setValue("url", url_.toString());
settings->setValue("title", title_);
settings->setValue("artist", artist_);
}
void RadioPlaylistItem::Restore(const SettingsProvider& settings) {

2
src/radioplaylistitem.h
View File

@ -33,7 +33,7 @@ class RadioPlaylistItem : public PlaylistItem {
Type type() const { return Type_Radio; }
Options options() const;
void Save(SettingsProvider& settings) const;
void Save(SettingsProvider* settings) const;
void Restore(const SettingsProvider& settings);
Song Metadata() const;

26
src/songplaylistitem.cpp
View File

@ -30,10 +30,10 @@ SongPlaylistItem::SongPlaylistItem(const Song& song)
{
}
void SongPlaylistItem::Save(SettingsProvider& settings) const {
settings.setValue("filename", song_.filename());
settings.setValue("art_automatic", song_.art_automatic());
settings.setValue("art_manual", song_.art_manual());
void SongPlaylistItem::Save(SettingsProvider* settings) const {
settings->setValue("filename", song_.filename());
settings->setValue("art_automatic", song_.art_automatic());
settings->setValue("art_manual", song_.art_manual());
if (song_.filetype() == Song::Type_Stream) {
SaveStream(settings);
@ -42,17 +42,17 @@ void SongPlaylistItem::Save(SettingsProvider& settings) const {
}
}
void SongPlaylistItem::SaveFile(SettingsProvider& settings) const {
settings.setValue("stream", false);
settings.setValue("library_directory", song_.directory_id());
void SongPlaylistItem::SaveFile(SettingsProvider* settings) const {
settings->setValue("stream", false);
settings->setValue("library_directory", song_.directory_id());
}
void SongPlaylistItem::SaveStream(SettingsProvider& settings) const {
settings.setValue("stream", true);
settings.setValue("title", song_.title());
settings.setValue("artist", song_.artist());
settings.setValue("album", song_.album());
settings.setValue("length", song_.length());
void SongPlaylistItem::SaveStream(SettingsProvider* settings) const {
settings->setValue("stream", true);
settings->setValue("title", song_.title());
settings->setValue("artist", song_.artist());
settings->setValue("album", song_.album());
settings->setValue("length", song_.length());
}
void SongPlaylistItem::Restore(const SettingsProvider& settings) {

6
src/songplaylistitem.h
View File

@ -27,7 +27,7 @@ class SongPlaylistItem : public PlaylistItem {
Type type() const { return Type_Song; }
void Save(SettingsProvider& settings) const;
void Save(SettingsProvider* settings) const;
void Restore(const SettingsProvider& settings);
void Reload();
@ -36,8 +36,8 @@ class SongPlaylistItem : public PlaylistItem {
QUrl Url() const;
private:
void SaveFile(SettingsProvider& settings) const;
void SaveStream(SettingsProvider& settings) const;
void SaveFile(SettingsProvider* settings) const;
void SaveStream(SettingsProvider* settings) const;
void RestoreFile(const SettingsProvider& settings);
void RestoreStream(const SettingsProvider& settings);

2
tests/mock_playlistitem.h
View File

@ -32,7 +32,7 @@ class MockPlaylistItem : public PlaylistItem {
MOCK_CONST_METHOD0(options,
Options());
MOCK_CONST_METHOD1(Save,
void(SettingsProvider& settings));
void(SettingsProvider* settings));
MOCK_METHOD1(Restore,
void(const SettingsProvider& settings));
MOCK_METHOD0(Reload,