Skip to content

Commit

Permalink
tidy: Fix "inconsistent declaration parameter name" warnings.
Browse files Browse the repository at this point in the history
An earlier commit (ce1441115bc) hanged the names of these variables in
the header file, so this commit makes the same variable name changes
in the source files.
  • Loading branch information
linuxdude42 committed Dec 14, 2021
1 parent b6befde commit 54dc457
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 65 deletions.
26 changes: 13 additions & 13 deletions mythtv/programs/mythbackend/servicesv2/v2content.cpp
Expand Up @@ -312,18 +312,18 @@ QFileInfo V2Content::GetRecordingArtwork ( const QString &sType,

V2ArtworkInfoList* V2Content::GetRecordingArtworkList( int RecordedId,
int chanid,
const QDateTime &recstarttsRaw)
const QDateTime &StartTime)
{
if ((RecordedId <= 0) &&
(chanid <= 0 || !recstarttsRaw.isValid()))
(chanid <= 0 || !StartTime.isValid()))
throw QString("Recorded ID or Channel ID and StartTime appears invalid.");

// TODO Should use RecordingInfo
ProgramInfo pginfo;
if (RecordedId > 0)
pginfo = ProgramInfo(RecordedId);
else
pginfo = ProgramInfo(chanid, recstarttsRaw.toUTC());
pginfo = ProgramInfo(chanid, StartTime.toUTC());

return GetProgramArtworkList(pginfo.GetInetRef(), pginfo.GetSeason());
}
Expand Down Expand Up @@ -500,14 +500,14 @@ QFileInfo V2Content::GetAlbumArt( int nTrackId, int nWidth, int nHeight )

QFileInfo V2Content::GetPreviewImage( int nRecordedId,
int nChanId,
const QDateTime &recstarttsRaw,
const QDateTime &StartTime,
int nWidth,
int nHeight,
int nSecsIn,
const QString &sFormat )
{
if ((nRecordedId <= 0) &&
(nChanId <= 0 || !recstarttsRaw.isValid()))
(nChanId <= 0 || !StartTime.isValid()))
throw QString("Recorded ID or Channel ID and StartTime appears invalid.");

if (!sFormat.isEmpty()
Expand All @@ -525,7 +525,7 @@ QFileInfo V2Content::GetPreviewImage( int nRecordedId,
if (nRecordedId > 0)
pginfo = ProgramInfo(nRecordedId);
else
pginfo = ProgramInfo(nChanId, recstarttsRaw.toUTC());
pginfo = ProgramInfo(nChanId, StartTime.toUTC());

if (!pginfo.GetChanID())
{
Expand Down Expand Up @@ -674,10 +674,10 @@ QFileInfo V2Content::GetPreviewImage( int nRecordedId,

QFileInfo V2Content::GetRecording( int nRecordedId,
int nChanId,
const QDateTime &recstarttsRaw )
const QDateTime &StartTime )
{
if ((nRecordedId <= 0) &&
(nChanId <= 0 || !recstarttsRaw.isValid()))
(nChanId <= 0 || !StartTime.isValid()))
throw QString("Recorded ID or Channel ID and StartTime appears invalid.");

// ------------------------------------------------------------------
Expand All @@ -689,7 +689,7 @@ QFileInfo V2Content::GetRecording( int nRecordedId,
if (nRecordedId > 0)
pginfo = ProgramInfo(nRecordedId);
else
pginfo = ProgramInfo(nChanId, recstarttsRaw.toUTC());
pginfo = ProgramInfo(nChanId, StartTime.toUTC());

if (!pginfo.GetChanID())
{
Expand Down Expand Up @@ -1006,7 +1006,7 @@ bool V2Content::DownloadFile( const QString &sURL, const QString &sStorageGroup
// V2LiveStreamInfo *V2Content::AddRecordingLiveStream(
// int nRecordedId,
// int nChanId,
// const QDateTime &recstarttsRaw,
// const QDateTime &StartTime,
// int nMaxSegments,
// int nWidth,
// int nHeight,
Expand All @@ -1015,7 +1015,7 @@ bool V2Content::DownloadFile( const QString &sURL, const QString &sStorageGroup
// int nSampleRate )
// {
// if ((nRecordedId <= 0) &&
// (nChanId <= 0 || !recstarttsRaw.isValid()))
// (nChanId <= 0 || !StartTime.isValid()))
// throw QString("Recorded ID or Channel ID and StartTime appears invalid.");

// // ------------------------------------------------------------------
Expand All @@ -1027,7 +1027,7 @@ bool V2Content::DownloadFile( const QString &sURL, const QString &sStorageGroup
// if (nRecordedId > 0)
// pginfo = ProgramInfo(nRecordedId);
// else
// pginfo = ProgramInfo(nChanId, recstarttsRaw.toUTC());
// pginfo = ProgramInfo(nChanId, StartTime.toUTC());

// if (!pginfo.GetChanID())
// {
Expand Down Expand Up @@ -1064,7 +1064,7 @@ bool V2Content::DownloadFile( const QString &sURL, const QString &sStorageGroup
// {
// LOG( VB_UPNP, LOG_ERR, QString("AddRecordingLiveStream - for %1, %2 failed")
// .arg( nChanId )
// .arg( recstarttsRaw.toUTC().toString() ));
// .arg( StartTime.toUTC().toString() ));
// return nullptr;
// }

Expand Down

0 comments on commit 54dc457

Please sign in to comment.