nullptr check + use const ref
This commit is contained in:
+4
-1
@@ -682,7 +682,7 @@ bool SongManager::DoesSongGroupExist( RString sSongGroup ) const
|
|||||||
return find( m_sSongGroupNames.begin(), m_sSongGroupNames.end(), sSongGroup ) != m_sSongGroupNames.end();
|
return find( m_sSongGroupNames.begin(), m_sSongGroupNames.end(), sSongGroup ) != m_sSongGroupNames.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SongManager::HasPackIni(RString sSongGroup) const
|
bool SongManager::HasPackIni(const RString& sSongGroup) const
|
||||||
{
|
{
|
||||||
Group* group = GetGroupFromName(sSongGroup);
|
Group* group = GetGroupFromName(sSongGroup);
|
||||||
if(group != nullptr)
|
if(group != nullptr)
|
||||||
@@ -937,6 +937,9 @@ std::vector<Song*> SongManager::GetPreferredSortSongsBySectionName( const RStrin
|
|||||||
|
|
||||||
Group* SongManager::GetGroup( const Song* pSong ) const
|
Group* SongManager::GetGroup( const Song* pSong ) const
|
||||||
{
|
{
|
||||||
|
if ( pSong == nullptr ) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
return GetGroupFromName( pSong->m_sGroupName );
|
return GetGroupFromName( pSong->m_sGroupName );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -98,7 +98,7 @@ public:
|
|||||||
//RString GetSongGroupBackgroundPath( RString sSongGroup ) const;
|
//RString GetSongGroupBackgroundPath( RString sSongGroup ) const;
|
||||||
void GetSongGroupNames( std::vector<RString> &AddTo ) const;
|
void GetSongGroupNames( std::vector<RString> &AddTo ) const;
|
||||||
bool DoesSongGroupExist( RString sSongGroup ) const;
|
bool DoesSongGroupExist( RString sSongGroup ) const;
|
||||||
bool HasPackIni(RString sSongGroup) const;
|
bool HasPackIni(const RString& sSongGroup) const;
|
||||||
RageColor GetSongGroupColor( const RString &sSongGroupName ) const;
|
RageColor GetSongGroupColor( const RString &sSongGroupName ) const;
|
||||||
RageColor GetSongColor( const Song* pSong ) const;
|
RageColor GetSongColor( const Song* pSong ) const;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user