4 changes: 2 additions & 2 deletions mythtv/libs/libmythupnp/upnpcmgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ UPnpCMGR::UPnpCMGR ( UPnpDevice *pDevice,

void UPnpCMGR::AddSourceProtocol( const QString &sProtocol )
{
QString sValue = GetValue< QString >( "SourceProtocolInfo" );
auto sValue = GetValue< QString >( "SourceProtocolInfo" );

if (sValue.length() > 0 )
sValue += ',';
Expand All @@ -76,7 +76,7 @@ void UPnpCMGR::AddSourceProtocol( const QString &sProtocol )

void UPnpCMGR::AddSinkProtocol( const QString &sProtocol )
{
QString sValue = GetValue< QString >( "SinkProtocolInfo" );
auto sValue = GetValue< QString >( "SinkProtocolInfo" );

if (sValue.length() > 0 )
sValue += ',';
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/httpstatus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ void HttpStatus::FillStatusXML( QDomDocument *pDoc )
unsigned int iNum = 10;
unsigned int iNumRecordings = 0;

RecConstIter itProg = recordingList.begin();
auto itProg = recordingList.begin();
for (; (itProg != recordingList.end()) && iNumRecordings < iNum; ++itProg)
{
if (((*itProg)->GetRecordingStatus() <= RecStatus::WillRecord) &&
Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythbackend/scheduler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ bool Scheduler::ChangeRecordingEnd(RecordingInfo *oldp, RecordingInfo *newp)
// If any pending recordings are affected, set them to
// future conflicting and force a reschedule by marking
// reclist as changed.
RecConstIter j = m_recList.begin();
auto j = m_recList.cbegin();
while (FindNextConflict(m_recList, foundp, j, openEndNever, nullptr))
{
RecordingInfo *recp = *j;
Expand Down Expand Up @@ -1179,7 +1179,7 @@ const RecordingInfo *Scheduler::FindConflict(
bool checkAll) const
{
RecList &conflictlist = *m_sinputInfoMap[p->GetInputID()].m_conflictList;
RecConstIter k = conflictlist.begin();
auto k = conflictlist.cbegin();
if (FindNextConflict(conflictlist, p, k, openend, affinity))
{
RecordingInfo *firstConflict = *k;
Expand Down Expand Up @@ -1317,7 +1317,7 @@ bool Scheduler::TryAnotherShowing(RecordingInfo *p, bool samePriority,
{
// It is pointless to preempt another livetv session.
// (the livetvlist contains dummy livetv pginfo's)
RecConstIter k = m_livetvList.begin();
auto k = m_livetvList.cbegin();
if (FindNextConflict(m_livetvList, q, k))
{
PrintRec(q, " #");
Expand Down Expand Up @@ -1538,7 +1538,7 @@ void Scheduler::SchedNewRetryPass(const RecIter& start, const RecIter& end,
// Try to move each conflict. Restore the old status if we
// can't.
RecList &conflictlist = *m_sinputInfoMap[p->GetInputID()].m_conflictList;
RecConstIter k = conflictlist.begin();
auto k = conflictlist.cbegin();
for ( ; FindNextConflict(conflictlist, p, k); ++k)
{
if (!TryAnotherShowing(*k, samePriority, livetv))
Expand Down Expand Up @@ -1726,7 +1726,7 @@ void Scheduler::getConflicting(RecordingInfo *pginfo, RecList *retlist)
QMutexLocker lockit(&m_schedLock);
QReadLocker tvlocker(&TVRec::s_inputsLock);

RecConstIter i = m_recList.begin();
auto i = m_recList.cbegin();
for (; FindNextConflict(m_recList, pginfo, i); ++i)
{
const RecordingInfo *p = *i;
Expand Down
8 changes: 4 additions & 4 deletions mythtv/programs/mythfrontend/customedit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ void CustomEdit::ruleChanged(MythUIButtonListItem *item)

m_currentRuleItem = item;

CustomRuleInfo rule = item->GetData().value<CustomRuleInfo>();
auto rule = item->GetData().value<CustomRuleInfo>();

m_titleEdit->SetText(rule.title);
m_descriptionEdit->SetText(rule.description);
Expand All @@ -603,7 +603,7 @@ void CustomEdit::clauseChanged(MythUIButtonListItem *item)
if (!item)
return;

CustomRuleInfo rule = item->GetData().value<CustomRuleInfo>();
auto rule = item->GetData().value<CustomRuleInfo>();

QString msg = (m_evaluate) ? evaluate(rule.description) : rule.description;
msg.replace('\n', ' ');
Expand All @@ -623,7 +623,7 @@ void CustomEdit::clauseClicked(MythUIButtonListItem *item)
if (!item)
return;

CustomRuleInfo rule = item->GetData().value<CustomRuleInfo>();
auto rule = item->GetData().value<CustomRuleInfo>();

QString clause;
QString desc = m_descriptionEdit->GetText();
Expand Down Expand Up @@ -678,7 +678,7 @@ void CustomEdit::recordClicked(void)
auto *record = new RecordingRule();

MythUIButtonListItem* item = m_ruleList->GetItemCurrent();
CustomRuleInfo rule = item->GetData().value<CustomRuleInfo>();
auto rule = item->GetData().value<CustomRuleInfo>();

int cur_recid = rule.recordid.toInt();
if (cur_recid > 0)
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/custompriority.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ void CustomPriority::ruleChanged(MythUIButtonListItem *item)
if (!item)
return;

RuleInfo rule = item->GetData().value<RuleInfo>();
auto rule = item->GetData().value<RuleInfo>();

m_titleEdit->SetText(rule.title);

Expand Down
8 changes: 4 additions & 4 deletions mythtv/programs/mythfrontend/gallerythumbview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ void GalleryThumbView::customEvent(QEvent *event)
MythUIButtonListItem *button = location.first;
int index = location.second;

ImagePtrK im = button->GetData().value<ImagePtrK>();
auto im = button->GetData().value<ImagePtrK>();
if (im)
UpdateThumbnail(button, im, url, index);
}
Expand Down Expand Up @@ -691,7 +691,7 @@ void GalleryThumbView::BuildImageList()
*/
void GalleryThumbView::UpdateImageItem(MythUIButtonListItem *item)
{
ImagePtrK im = item->GetData().value<ImagePtrK >();
auto im = item->GetData().value<ImagePtrK >();
if (!im)
return;

Expand Down Expand Up @@ -956,7 +956,7 @@ void GalleryThumbView::ResetUiSelection()
*/
void GalleryThumbView::SetUiSelection(MythUIButtonListItem *item)
{
ImagePtrK im = item->GetData().value<ImagePtrK >();
auto im = item->GetData().value<ImagePtrK >();
if (im)
{
// update the position in the node list
Expand Down Expand Up @@ -1366,7 +1366,7 @@ void GalleryThumbView::ItemClicked(MythUIButtonListItem *item)
if (!item)
return;

ImagePtrK im = item->GetData().value<ImagePtrK>();
auto im = item->GetData().value<ImagePtrK>();
if (!im)
return;

Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/globalsettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static HostTextEditSetting *VAAPIDevice()
#if CONFIG_DEBUGTYPE
static HostCheckBoxSetting *FFmpegDemuxer()
{
HostCheckBoxSetting *gc = new HostCheckBoxSetting("FFMPEGTS");
auto *gc = new HostCheckBoxSetting("FFMPEGTS");

gc->setLabel(PlaybackSettings::tr("Use FFmpeg's original MPEG-TS demuxer"));

Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/schedulecommon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ void ScheduleCommon::customEvent(QEvent *event)
if (!dce->GetData().canConvert<RecordingInfo>())
return;

RecordingInfo recInfo = dce->GetData().value<RecordingInfo>();
auto recInfo = dce->GetData().value<RecordingInfo>();

if (resulttext == tr("Record this showing"))
{
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythfrontend/statusbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ void StatusBox::setHelpText(MythUIButtonListItem *item)
if (!item || GetFocusWidget() != m_logList)
return;

LogLine logline = item->GetData().value<LogLine>();
auto logline = item->GetData().value<LogLine>();
if (m_helpText)
m_helpText->SetText(logline.m_helpdetail);
if (m_justHelpText)
Expand All @@ -272,7 +272,7 @@ void StatusBox::clicked(MythUIButtonListItem *item)
if (!item)
return;

LogLine logline = item->GetData().value<LogLine>();
auto logline = item->GetData().value<LogLine>();

MythUIButtonListItem *currentButton = m_categoryList->GetItemCurrent();
QString currentItem;
Expand Down
4 changes: 1 addition & 3 deletions mythtv/programs/mythfrontend/videoglobalsettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,7 @@ HostCheckBoxSetting *RatingsToPL()
"Level %1.")
.arg(pl.GetLevel()));

r2pl_map::const_iterator def_setting =
r2pl_defaults.find(pl.GetLevel());

auto def_setting = r2pl_defaults.find(pl.GetLevel());
if (def_setting != r2pl_defaults.end())
{
hle->setValue(def_setting->second);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythfrontend/videolist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ void VideoListImp::build_generic_tree(MythGenericTree *dst, meta_dir_node *src,
return;
}

for (meta_dir_node::const_dir_iterator dir = src->dirs_begin();
for (auto dir = src->dirs_begin();
dir != src->dirs_end(); ++dir)
{
if ((*dir)->has_entries())
Expand All @@ -566,7 +566,7 @@ void VideoListImp::build_generic_tree(MythGenericTree *dst, meta_dir_node *src,
}
}

for (meta_dir_node::const_entry_iterator entry = src->entries_begin();
for (auto entry = src->entries_begin();
entry != src->entries_end(); ++entry)
{
if (((*entry)->getData()->GetSeason() > 0) ||
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/viewscheduled.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ void ViewScheduled::ChangeGroup(MythUIButtonListItem* item)
if (!item || m_recList.empty())
return;

QDate group = item->GetData().value<QDate>();
auto group = item->GetData().value<QDate>();

m_currentGroup = group;

Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythtv-setup/importicons.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ void ImportIconsWizard::menuSelection(MythUIButtonListItem *item)
if (!item)
return;

SearchEntry entry = item->GetData().value<SearchEntry>();
auto entry = item->GetData().value<SearchEntry>();

LOG(VB_GENERAL, LOG_INFO, QString("Menu Selection: %1 %2 %3")
.arg(entry.strID) .arg(entry.strName) .arg(entry.strLogo));
Expand Down