A function parameter can be hidden within the function if the function From: Erik Hovland declares a variable with the same name. This fixes any in the libmythtv directory. --- libs/libmythtv/osd.cpp | 10 ++++----- libs/libmythtv/siscan.cpp | 6 +++-- libs/libmythtv/videoout_xv.cpp | 8 +++---- libs/libmythtv/viewschdiff.cpp | 46 ++++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/libs/libmythtv/osd.cpp b/libs/libmythtv/osd.cpp index 82c485a..e8715b5 100644 --- a/libs/libmythtv/osd.cpp +++ b/libs/libmythtv/osd.cpp @@ -2117,8 +2117,8 @@ void OSD::NewDialogBox(const QString &name, const QString &message, OSDTypeText *text = NULL; do { - QString name = QString("option%1").arg(availoptions + 1); - text = (OSDTypeText *)container->GetType(name); + QString optionName = QString("option%1").arg(availoptions + 1); + text = (OSDTypeText *)container->GetType(optionName); if (text) availoptions++; } @@ -2138,11 +2138,11 @@ void OSD::NewDialogBox(const QString &name, const QString &message, for (int i = 1; i <= numoptions && i <= availoptions; i++) { - QString name = QString("option%1").arg(offset + i); - text = (OSDTypeText *)container->GetType(name); + QString optionName = QString("option%1").arg(offset + i); + text = (OSDTypeText *)container->GetType(optionName); if (!text) { - VERBOSE(VB_IMPORTANT, "Couldn't find: " << name); + VERBOSE(VB_IMPORTANT, "Couldn't find: " << optionName); return; } diff --git a/libs/libmythtv/siscan.cpp b/libs/libmythtv/siscan.cpp index eaf82e1..58411a2 100644 --- a/libs/libmythtv/siscan.cpp +++ b/libs/libmythtv/siscan.cpp @@ -976,16 +976,16 @@ bool SIScan::ScanTransport(int mplexid) while (query.next()) { int sourceid = query.value(0).toInt(); - int mplexid = query.value(1).toInt(); + int queriedMplexid = query.value(1).toInt(); QString std = query.value(2).toString(); int tsid = query.value(3).toInt(); QString fn = (tsid) ? QString("Transport ID %1").arg(tsid) : - QString("Multiplex #%1").arg(mplexid); + QString("Multiplex #%1").arg(queriedMplexid); VERBOSE(VB_SIPARSER, LOC + "Adding " + fn); - TransportScanItem item(sourceid, std, fn, mplexid, signalTimeout); + TransportScanItem item(sourceid, std, fn, queriedMplexid, signalTimeout); scanTransports += item; } diff --git a/libs/libmythtv/videoout_xv.cpp b/libs/libmythtv/videoout_xv.cpp index 7a16e58..f86b4cc 100644 --- a/libs/libmythtv/videoout_xv.cpp +++ b/libs/libmythtv/videoout_xv.cpp @@ -531,10 +531,10 @@ void VideoOutputXv::InitDisplayMeasurements(uint width, uint height) float displayAspect = gContext->GetFloatSettingOnHost( "XineramaMonitorAspectRatio", gContext->GetHostName(), pixel_aspect); - int height = display_dim.height(); - if (height <= 0) - display_dim.setHeight(height = 300); - display_dim.setWidth((int) round(height * displayAspect)); + int displayHeight = display_dim.height(); + if (displayHeight <= 0) + display_dim.setHeight(displayHeight = 300); + display_dim.setWidth((int) round(displayHeight * displayAspect)); } VERBOSE(VB_PLAYBACK, LOC + diff --git a/libs/libmythtv/viewschdiff.cpp b/libs/libmythtv/viewschdiff.cpp index c321299..3dc45c3 100644 --- a/libs/libmythtv/viewschdiff.cpp +++ b/libs/libmythtv/viewschdiff.cpp @@ -512,20 +512,20 @@ void ViewScheduleDiff::updateList(QPainter *p) break; struct ProgramStruct s = recList[skip+i]; - struct ProgramInfo *p = s.after; - if (!p) p = s.before; + struct ProgramInfo *progInfo = s.after; + if (!progInfo) progInfo = s.before; QString temp; - temp = (p->recstartts).toString(dateformat); - temp += " " + (p->recstartts).toString(timeformat); + temp = (progInfo->recstartts).toString(dateformat); + temp += " " + (progInfo->recstartts).toString(timeformat); ltype->SetItemText(i, 1, temp); - ltype->SetItemText(i, 2, p->ChannelText(channelFormat)); + ltype->SetItemText(i, 2, progInfo->ChannelText(channelFormat)); - temp = p->title; - if ((p->subtitle).stripWhiteSpace().length() > 0) - temp += " - \"" + p->subtitle + "\""; + temp = progInfo->title; + if ((progInfo->subtitle).stripWhiteSpace().length() > 0) + temp += " - \"" + progInfo->subtitle + "\""; ltype->SetItemText(i, 3, temp); if (s.before) temp = s.before->RecStatusChar(); @@ -541,18 +541,18 @@ void ViewScheduleDiff::updateList(QPainter *p) if (!s.after) ltype->EnableForcedFont(i, "disabledrecording"); - else if (p->recstatus == rsRecording) + else if (progInfo->recstatus == rsRecording) ltype->EnableForcedFont(i, "recording"); - else if (p->recstatus == rsConflict || - p->recstatus == rsOffLine || - p->recstatus == rsAborted) + else if (progInfo->recstatus == rsConflict || + progInfo->recstatus == rsOffLine || + progInfo->recstatus == rsAborted) ltype->EnableForcedFont(i, "conflictingrecording"); - else if (p->recstatus == rsWillRecord) + else if (progInfo->recstatus == rsWillRecord) ltype->EnableForcedFont(i, "record"); - else if (p->recstatus == rsRepeat || - p->recstatus == rsOtherShowing || - (p->recstatus != rsDontRecord && - p->recstatus <= rsEarlierShowing)) + else if (progInfo->recstatus == rsRepeat || + progInfo->recstatus == rsOtherShowing || + (progInfo->recstatus != rsDontRecord && + progInfo->recstatus <= rsEarlierShowing)) ltype->EnableForcedFont(i, "disabledrecording"); } } @@ -619,11 +619,11 @@ void ViewScheduleDiff::updateInfo(QPainter *p) LayerSet *container = theme->GetSet("program_info"); if (container) { - ProgramInfo *p = CurrentProgram(); + ProgramInfo *progInfo = CurrentProgram(); - if (p) + if (progInfo) { - p->ToMap(infoMap); + progInfo->ToMap(infoMap); container->ClearAllText(); container->SetText(infoMap); } @@ -655,10 +655,10 @@ void ViewScheduleDiff::updateRecStatus(QPainter *p) LayerSet *container = theme->GetSet("status_info"); if (container) { - ProgramInfo *p = CurrentProgram(); - if (p) + ProgramInfo *progInfo = CurrentProgram(); + if (progInfo) { - p->ToMap(infoMap); + progInfo->ToMap(infoMap); container->ClearAllText(); container->SetText(infoMap); }