Skip to content

Commit

Permalink
service: change 0 (null pointer) with nullptr
Browse files Browse the repository at this point in the history 
Use nullptr pointer literal, since C++11 required by enigma2 now.

There are other places where 0 is used (or NULL) and those will be changed gradually.
  • Loading branch information
@athoik
athoik committed May 5, 2018
1 parent 39ae021 commit 430281b
Show file tree
Hide file tree
Showing 15 changed files with 81 additions and 81 deletions.
12 changes: 6 additions & 6 deletions lib/service/service.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RESULT eServiceCenter::play(const eServiceReference &ref, ePtr<iPlayableService>
std::map<int,ePtr<iServiceHandler> >::iterator i = handler.find(ref.type);
if (i == handler.end())
{
ptr = 0;
ptr = nullptr;
return -1;
}
return i->second->play(ref, ptr);
Expand All @@ -192,7 +192,7 @@ RESULT eServiceCenter::record(const eServiceReference &ref, ePtr<iRecordableServ
std::map<int,ePtr<iServiceHandler> >::iterator i = handler.find(ref.type);
if (i == handler.end())
{
ptr = 0;
ptr = nullptr;
return -1;
}
return i->second->record(ref, ptr);
Expand All @@ -203,7 +203,7 @@ RESULT eServiceCenter::list(const eServiceReference &ref, ePtr<iListableService>
std::map<int,ePtr<iServiceHandler> >::iterator i = handler.find(ref.type);
if (i == handler.end())
{
ptr = 0;
ptr = nullptr;
return -1;
}
return i->second->list(ref, ptr);
Expand All @@ -214,7 +214,7 @@ RESULT eServiceCenter::info(const eServiceReference &ref, ePtr<iStaticServiceInf
std::map<int,ePtr<iServiceHandler> >::iterator i = handler.find(ref.type);
if (i == handler.end())
{
ptr = 0;
ptr = nullptr;
return -1;
}
return i->second->info(ref, ptr);
Expand All @@ -225,7 +225,7 @@ RESULT eServiceCenter::offlineOperations(const eServiceReference &ref, ePtr<iSer
std::map<int,ePtr<iServiceHandler> >::iterator i = handler.find(ref.type);
if (i == handler.end())
{
ptr = 0;
ptr = nullptr;
return -1;
}
return i->second->offlineOperations(ref, ptr);
Expand Down Expand Up @@ -289,7 +289,7 @@ int eServiceCenter::getServiceTypeForExtension(const std::string &str)
/* default handlers */
RESULT iServiceHandler::info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
16 changes: 8 additions & 8 deletions lib/service/servicedvb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableServ
ePtr<eDVBServiceList> list = new eDVBServiceList(ref);
if (list->startQuery())
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down Expand Up @@ -972,7 +972,7 @@ RESULT eServiceFactoryDVB::offlineOperations(const eServiceReference &ref, ePtr<
{
if (ref.path.empty())
{
ptr = 0;
ptr = nullptr;
return -1;
} else
{
Expand Down Expand Up @@ -1125,7 +1125,7 @@ void eDVBServicePlay::updateEpgCacheNowNext()
{
bool update = false;
ePtr<eServiceEvent> next = 0;
ePtr<eServiceEvent> ptr = 0;
ePtr<eServiceEvent> ptr = nullptr;
eServiceReferenceDVB &ref = (eServiceReferenceDVB&) m_reference;
if (eEPGCache::getInstance() && eEPGCache::getInstance()->lookupEventTime(ref, -1, ptr) >= 0)
{
Expand Down Expand Up @@ -1457,7 +1457,7 @@ RESULT eDVBServicePlay::pause(ePtr<iPauseableService> &ptr)
is not active, you should activate it when unpausing */
if ((!m_is_pvr) && (!m_timeshift_enabled))
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down Expand Up @@ -1556,7 +1556,7 @@ RESULT eDVBServicePlay::seek(ePtr<iSeekableService> &ptr)
return 0;
}

ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down Expand Up @@ -1715,7 +1715,7 @@ RESULT eDVBServicePlay::subServices(ePtr<iSubserviceList> &ptr)

RESULT eDVBServicePlay::timeshift(ePtr<iTimeshiftService> &ptr)
{
ptr = 0;
ptr = nullptr;
eDebug("[eDVBServicePlay] timeshift");
if (m_timeshift_enabled || !m_is_pvr)
{
Expand Down Expand Up @@ -1756,7 +1756,7 @@ RESULT eDVBServicePlay::cueSheet(ePtr<iCueSheet> &ptr)
ptr = this;
return 0;
}
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down Expand Up @@ -1785,7 +1785,7 @@ RESULT eDVBServicePlay::streamed(ePtr<iStreamedService> &ptr)
ptr = this;
return 0;
}
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/service/servicedvb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class eDVBServicePlay: public eDVBServiceBase,
RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
RESULT audioDelay(ePtr<iAudioDelay> &ptr);
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = nullptr; return -1; }

// iStreamedService
RESULT streamed(ePtr<iStreamedService> &ptr);
Expand Down
8 changes: 4 additions & 4 deletions lib/service/servicedvd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ RESULT eServiceFactoryDVD::play(const eServiceReference &ref, ePtr<iPlayableServ

RESULT eServiceFactoryDVD::record(const eServiceReference &/*ref*/, ePtr<iRecordableService> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

RESULT eServiceFactoryDVD::list(const eServiceReference &, ePtr<iListableService> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand All @@ -79,7 +79,7 @@ RESULT eServiceFactoryDVD::info(const eServiceReference &/*ref*/, ePtr<iStaticSe

RESULT eServiceFactoryDVD::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down Expand Up @@ -980,7 +980,7 @@ RESULT eServiceDVD::cueSheet(ePtr<iCueSheet> &ptr)
ptr = this;
return 0;
}
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
16 changes: 8 additions & 8 deletions lib/service/servicedvd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ class eServiceDVD: public iPlayableService, public iPauseableService, public iSe
virtual ~eServiceDVD();
// not implemented (yet)
RESULT setTarget(int target, bool noaudio = false) { return -1; }
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = 0; return -1; }
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = nullptr; return -1; }
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = nullptr; return -1; }
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = nullptr; return -1; }
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = nullptr; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = nullptr; return -1; }
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = nullptr; return -1; }
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = nullptr; return -1; }
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = nullptr; return -1; }
RESULT cueSheet(ePtr<iCueSheet> &ptr);
void setQpipMode(bool value, bool audio) { }

Expand Down
2 changes: 1 addition & 1 deletion lib/service/servicefs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RESULT eServiceFactoryFS::info(const eServiceReference &ref, ePtr<iStaticService

RESULT eServiceFactoryFS::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/service/servicehdmi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RESULT eServiceFactoryHDMI::record(const eServiceReference &ref, ePtr<iRecordabl

RESULT eServiceFactoryHDMI::list(const eServiceReference &, ePtr<iListableService> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand All @@ -64,7 +64,7 @@ RESULT eServiceFactoryHDMI::info(const eServiceReference &ref, ePtr<iStaticServi

RESULT eServiceFactoryHDMI::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
32 changes: 16 additions & 16 deletions lib/service/servicehdmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ class eServiceHDMI: public iPlayableService, public iServiceInformation, public
RESULT stop();
RESULT setTarget(int target, bool noaudio);

RESULT pause(ePtr<iPauseableService> &ptr) { ptr = 0; return -1; }
RESULT seek(ePtr<iSeekableService> &ptr) { ptr = 0; return -1; }
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = 0; return -1; }
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = 0; return -1; }
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = 0; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }

RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; }

RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
RESULT pause(ePtr<iPauseableService> &ptr) { ptr = nullptr; return -1; }
RESULT seek(ePtr<iSeekableService> &ptr) { ptr = nullptr; return -1; }
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = nullptr; return -1; }
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = nullptr; return -1; }
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = nullptr; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = nullptr; return -1; }

RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = nullptr; return -1; }
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = nullptr; return -1; }
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = nullptr; return -1; }
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = nullptr; return -1; }

RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = nullptr; return -1; }
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = nullptr; return -1; }
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = nullptr; return -1; }
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = nullptr; return -1; }

RESULT info(ePtr<iServiceInformation>&);

Expand Down
2 changes: 1 addition & 1 deletion lib/service/servicem2ts.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ RESULT eServiceFactoryM2TS::info(const eServiceReference &ref, ePtr<iStaticServi

RESULT eServiceFactoryM2TS::offlineOperations(const eServiceReference &ref, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/service/servicets.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ RESULT eServiceFactoryTS::list(const eServiceReference &, ePtr<iListableService>

RESULT eServiceFactoryTS::info(const eServiceReference &ref, ePtr<iStaticServiceInformation> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

RESULT eServiceFactoryTS::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
20 changes: 10 additions & 10 deletions lib/service/servicets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ DECLARE_REF(eServiceTS);
RESULT setFastForward(int ratio) { return -1; };
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = this; return 0; };
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = this; return 0; };
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; };
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; };
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; };
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; };
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = nullptr; return -1; };
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = nullptr; return -1; };
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = nullptr; return -1; };
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = nullptr; return -1; };
void setQpipMode(bool value, bool audio) { }
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = 0; return -1; };
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; };
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; };
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; };
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; };
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; };
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = nullptr; return -1; };
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = nullptr; return -1; };
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = nullptr; return -1; };
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = nullptr; return -1; };
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = nullptr; return -1; };
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = nullptr; return -1; };

// iPausableService
RESULT pause();
Expand Down
2 changes: 1 addition & 1 deletion lib/service/servicewebts.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RESULT eServiceFactoryWebTS::info(const eServiceReference &ref, ePtr<iStaticServ

RESULT eServiceFactoryWebTS::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
20 changes: 10 additions & 10 deletions lib/service/servicewebts.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,17 @@ DECLARE_REF(eServiceWebTS);
RESULT setFastForward(int ratio) { return -1; };
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = this; return 0; };
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = this; return 0; };
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; };
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; };
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; };
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; };
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = nullptr; return -1; };
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = nullptr; return -1; };
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = nullptr; return -1; };
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = nullptr; return -1; };
void setQpipMode(bool value, bool audio) { }
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = 0; return -1; };
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; };
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; };
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; };
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; };
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; };
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = nullptr; return -1; };
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = nullptr; return -1; };
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = nullptr; return -1; };
RESULT stream(ePtr<iStreamableService> &ptr) { ptr = nullptr; return -1; };
RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = nullptr; return -1; };
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = nullptr; return -1; };

// iPausableService
RESULT pause();
Expand Down
2 changes: 1 addition & 1 deletion lib/service/servicexine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RESULT eServiceFactoryXine::info(const eServiceReference &ref, ePtr<iStaticServi

RESULT eServiceFactoryXine::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
{
ptr = 0;
ptr = nullptr;
return -1;
}

Expand Down
20 changes: 10 additions & 10 deletions lib/service/servicexine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ class eServiceXine: public iPlayableService, public iPauseableService,

// not implemented (yet)
RESULT setTarget(int target, bool noaudio = false) { return -1; }
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = 0; return -1; }
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = 0; return -1; }
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; }
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = 0; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = nullptr; return -1; }
RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = nullptr; return -1; }
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = nullptr; return -1; }
RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = nullptr; return -1; }
RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = nullptr; return -1; }
RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = nullptr; return -1; }
RESULT subtitle(ePtr<iSubtitleOutput> &ptr) { ptr = nullptr; return -1; }
RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = nullptr; return -1; }
RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = nullptr; return -1; }
RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = nullptr; return -1; }

// iPausableService
RESULT pause();
Expand Down

0 comments on commit 430281b

Please sign in to comment.