Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix some const return declarations (caught by icc).

  • Loading branch information...
commit ddfb29cd70d931e8217c5e782af07473ca4c3177 1 parent aaee047
@daniel-kristjansson daniel-kristjansson authored
View
4 mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
@@ -773,7 +773,7 @@ const MasterGuideTable *ATSCStreamData::GetCachedMGT(bool current) const
return mgt;
}
-const tvct_ptr_t ATSCStreamData::GetCachedTVCT(uint pid, bool current) const
+tvct_ptr_t ATSCStreamData::GetCachedTVCT(uint pid, bool current) const
{
if (!current)
LOG(VB_GENERAL, LOG_WARNING, "Currently we ignore \'current\' param");
@@ -789,7 +789,7 @@ const tvct_ptr_t ATSCStreamData::GetCachedTVCT(uint pid, bool current) const
return tvct;
}
-const cvct_ptr_t ATSCStreamData::GetCachedCVCT(uint pid, bool current) const
+cvct_ptr_t ATSCStreamData::GetCachedCVCT(uint pid, bool current) const
{
if (!current)
LOG(VB_GENERAL, LOG_WARNING, "Currently we ignore \'current\' param");
View
4 mythtv/libs/libmythtv/mpeg/atscstreamdata.h
@@ -92,8 +92,8 @@ class MTV_PUBLIC ATSCStreamData : virtual public MPEGStreamData
{ return HasCachedAnyTVCTs(current) || HasCachedAnyCVCTs(current); }
const MasterGuideTable *GetCachedMGT(bool current = true) const;
- const tvct_ptr_t GetCachedTVCT(uint pid, bool current = true) const;
- const cvct_ptr_t GetCachedCVCT(uint pid, bool current = true) const;
+ tvct_ptr_t GetCachedTVCT(uint pid, bool current = true) const;
+ cvct_ptr_t GetCachedCVCT(uint pid, bool current = true) const;
tvct_vec_t GetCachedTVCTs(bool current = true) const;
cvct_vec_t GetCachedCVCTs(bool current = true) const;
View
8 mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
@@ -1419,8 +1419,7 @@ bool MPEGStreamData::HasCachedAnyPMTs(void) const
return _cached_pmts.size();
}
-const pat_ptr_t MPEGStreamData::GetCachedPAT(
- uint tsid, uint section_num) const
+pat_ptr_t MPEGStreamData::GetCachedPAT(uint tsid, uint section_num) const
{
QMutexLocker locker(&_cache_lock);
ProgramAssociationTable *pat = NULL;
@@ -1464,8 +1463,7 @@ pat_vec_t MPEGStreamData::GetCachedPATs(void) const
return pats;
}
-const cat_ptr_t MPEGStreamData::GetCachedCAT(
- uint tsid, uint section_num) const
+cat_ptr_t MPEGStreamData::GetCachedCAT(uint tsid, uint section_num) const
{
QMutexLocker locker(&_cache_lock);
ConditionalAccessTable *cat = NULL;
@@ -1509,7 +1507,7 @@ cat_vec_t MPEGStreamData::GetCachedCATs(void) const
return cats;
}
-const pmt_ptr_t MPEGStreamData::GetCachedPMT(
+pmt_ptr_t MPEGStreamData::GetCachedPMT(
uint program_num, uint section_num) const
{
QMutexLocker locker(&_cache_lock);
View
18 mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
@@ -235,17 +235,17 @@ class MTV_PUBLIC MPEGStreamData : public EITSource
bool HasCachedAllPMTs(void) const;
bool HasCachedAnyPMTs(void) const;
- const pat_ptr_t GetCachedPAT(uint tsid, uint section_num) const;
- pat_vec_t GetCachedPATs(uint tsid) const;
- pat_vec_t GetCachedPATs(void) const;
- pat_map_t GetCachedPATMap(void) const;
+ pat_ptr_t GetCachedPAT(uint tsid, uint section_num) const;
+ pat_vec_t GetCachedPATs(uint tsid) const;
+ pat_vec_t GetCachedPATs(void) const;
+ pat_map_t GetCachedPATMap(void) const;
- const cat_ptr_t GetCachedCAT(uint tsid, uint section_num) const;
- cat_vec_t GetCachedCATs(uint tsid) const;
- cat_vec_t GetCachedCATs(void) const;
- cat_map_t GetCachedCATMap(void) const;
+ cat_ptr_t GetCachedCAT(uint tsid, uint section_num) const;
+ cat_vec_t GetCachedCATs(uint tsid) const;
+ cat_vec_t GetCachedCATs(void) const;
+ cat_map_t GetCachedCATMap(void) const;
- const pmt_ptr_t GetCachedPMT(uint program_num, uint section_num) const;
+ pmt_ptr_t GetCachedPMT(uint program_num, uint section_num) const;
pmt_vec_t GetCachedPMTs(void) const;
pmt_map_t GetCachedPMTMap(void) const;
Please sign in to comment.
Something went wrong with that request. Please try again.