Commit e3011160 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

NULL -> nullptr

parent 42747712
......@@ -26,7 +26,7 @@ File::File( sqlite3* dbConnection, sqlite3_stmt* stmt )
}
File::File( const std::string& mrl )
: m_dbConnection( NULL )
: m_dbConnection( nullptr )
, m_id( 0 )
, m_type( UnknownType )
, m_duration( 0 )
......
......@@ -18,7 +18,7 @@ Label::Label( sqlite3* dbConnection, sqlite3_stmt* stmt )
}
Label::Label( const std::string& name )
: m_dbConnection( NULL )
: m_dbConnection( nullptr )
, m_id( 0 )
, m_name( name )
{
......
......@@ -12,7 +12,7 @@
#include "ShowEpisode.h"
MediaLibrary::MediaLibrary()
: m_dbConnection( NULL )
: m_dbConnection( nullptr )
{
}
......
......@@ -34,11 +34,11 @@ TEST_F( Files, Init )
TEST_F( Files, Create )
{
auto f = ml->addFile( "/dev/null" );
ASSERT_TRUE( f != NULL );
ASSERT_NE( f, nullptr );
ASSERT_EQ( f->playCount(), 0 );
ASSERT_TRUE( f->albumTrack() == NULL );
ASSERT_TRUE( f->showEpisode() == NULL );
ASSERT_EQ( f->albumTrack(), nullptr );
ASSERT_EQ( f->showEpisode(), nullptr );
std::vector<std::shared_ptr<IFile>> files;
bool success = ml->files( files );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment