From 5a7c3ad1945c2829d03642b4526b9a066c73f06c Mon Sep 17 00:00:00 2001 From: archshift Date: Mon, 11 Aug 2014 17:44:59 -0700 Subject: [PATCH] Changed iterators to use auto, some of which using range-based loops --- src/citra_qt/hotkeys.cpp | 30 ++++++++++---------- src/common/break_points.cpp | 55 +++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 1aa1e8b961..bbaa4a8dc8 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -21,14 +21,14 @@ void SaveHotkeys(QSettings& settings) { settings.beginGroup("Shortcuts"); - for (HotkeyGroupMap::iterator group = hotkey_groups.begin(); group != hotkey_groups.end(); ++group) + for (auto group : hotkey_groups) { - settings.beginGroup(group->first); - for (HotkeyMap::iterator hotkey = group->second.begin(); hotkey != group->second.end(); ++hotkey) + settings.beginGroup(group.first); + for (auto hotkey : group.second) { - settings.beginGroup(hotkey->first); - settings.setValue(QString("KeySeq"), hotkey->second.keyseq.toString()); - settings.setValue(QString("Context"), hotkey->second.context); + settings.beginGroup(hotkey.first); + settings.setValue(QString("KeySeq"), hotkey.second.keyseq.toString()); + settings.setValue(QString("Context"), hotkey.second.context); settings.endGroup(); } settings.endGroup(); @@ -42,17 +42,17 @@ void LoadHotkeys(QSettings& settings) // Make sure NOT to use a reference here because it would become invalid once we call beginGroup() QStringList groups = settings.childGroups(); - for (QList::iterator group = groups.begin(); group != groups.end(); ++group) + for (auto group : groups) { - settings.beginGroup(*group); + settings.beginGroup(group); QStringList hotkeys = settings.childGroups(); - for (QList::iterator hotkey = hotkeys.begin(); hotkey != hotkeys.end(); ++hotkey) + for (auto hotkey : hotkeys) { - settings.beginGroup(*hotkey); + settings.beginGroup(hotkey); // RegisterHotkey assigns default keybindings, so use old values as default parameters - Hotkey& hk = hotkey_groups[*group][*hotkey]; + Hotkey& hk = hotkey_groups[group][hotkey]; hk.keyseq = QKeySequence::fromString(settings.value("KeySeq", hk.keyseq.toString()).toString()); hk.context = (Qt::ShortcutContext)settings.value("Context", hk.context).toInt(); if (hk.shortcut) @@ -91,13 +91,13 @@ GHotkeysDialog::GHotkeysDialog(QWidget* parent): QDialog(parent) { ui.setupUi(this); - for (HotkeyGroupMap::iterator group = hotkey_groups.begin(); group != hotkey_groups.end(); ++group) + for (auto group : hotkey_groups) { - QTreeWidgetItem* toplevel_item = new QTreeWidgetItem(QStringList(group->first)); - for (HotkeyMap::iterator hotkey = group->second.begin(); hotkey != group->second.end(); ++hotkey) + QTreeWidgetItem* toplevel_item = new QTreeWidgetItem(QStringList(group.first)); + for (auto hotkey : group.second) { QStringList columns; - columns << hotkey->first << hotkey->second.keyseq.toString(); + columns << hotkey.first << hotkey.second.keyseq.toString(); QTreeWidgetItem* item = new QTreeWidgetItem(columns); toplevel_item->addChild(item); } diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp index 25d34a21a3..4e04a06ffc 100644 --- a/src/common/break_points.cpp +++ b/src/common/break_points.cpp @@ -11,16 +11,16 @@ bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { - for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) - if (i->iAddress == _iAddress) + for (auto breakpoint : m_BreakPoints) + if (breakpoint.iAddress == _iAddress) return true; return false; } bool BreakPoints::IsTempBreakPoint(u32 _iAddress) { - for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) - if (i->iAddress == _iAddress && i->bTemporary) + for (auto breakpoint : m_BreakPoints) + if (breakpoint.iAddress == _iAddress && breakpoint.bTemporary) return true; return false; } @@ -28,13 +28,12 @@ bool BreakPoints::IsTempBreakPoint(u32 _iAddress) BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const { TBreakPointsStr bps; - for (TBreakPoints::const_iterator i = m_BreakPoints.begin(); - i != m_BreakPoints.end(); ++i) + for (auto breakpoint : m_BreakPoints) { - if (!i->bTemporary) + if (!breakpoint.bTemporary) { std::stringstream bp; - bp << std::hex << i->iAddress << " " << (i->bOn ? "n" : ""); + bp << std::hex << breakpoint.iAddress << " " << (breakpoint.bOn ? "n" : ""); bps.push_back(bp.str()); } } @@ -44,13 +43,13 @@ BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const void BreakPoints::AddFromStrings(const TBreakPointsStr& bps) { - for (TBreakPointsStr::const_iterator i = bps.begin(); i != bps.end(); ++i) + for (auto bps_item : bps) { TBreakPoint bp; std::stringstream bpstr; - bpstr << std::hex << *i; + bpstr << std::hex << bps_item; bpstr >> bp.iAddress; - bp.bOn = i->find("n") != i->npos; + bp.bOn = bps_item.find("n") != bps_item.npos; bp.bTemporary = false; Add(bp); } @@ -84,7 +83,7 @@ void BreakPoints::Add(u32 em_address, bool temp) void BreakPoints::Remove(u32 em_address) { - for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) + for (auto i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) { if (i->iAddress == em_address) { @@ -114,14 +113,16 @@ void BreakPoints::Clear() MemChecks::TMemChecksStr MemChecks::GetStrings() const { TMemChecksStr mcs; - for (TMemChecks::const_iterator i = m_MemChecks.begin(); - i != m_MemChecks.end(); ++i) + for (auto memcheck : m_MemChecks) { std::stringstream mc; - mc << std::hex << i->StartAddress; - mc << " " << (i->bRange ? i->EndAddress : i->StartAddress) << " " << - (i->bRange ? "n" : "") << (i->OnRead ? "r" : "") << - (i->OnWrite ? "w" : "") << (i->Log ? "l" : "") << (i->Break ? "p" : ""); + mc << std::hex << memcheck.StartAddress; + mc << " " << (memcheck.bRange ? memcheck.EndAddress : memcheck.StartAddress) << " " + << (memcheck.bRange ? "n" : "") + << (memcheck.OnRead ? "r" : "") + << (memcheck.OnWrite ? "w" : "") + << (memcheck.Log ? "l" : "") + << (memcheck.Break ? "p" : ""); mcs.push_back(mc.str()); } @@ -130,17 +131,17 @@ MemChecks::TMemChecksStr MemChecks::GetStrings() const void MemChecks::AddFromStrings(const TMemChecksStr& mcs) { - for (TMemChecksStr::const_iterator i = mcs.begin(); i != mcs.end(); ++i) + for (auto mcs_item : mcs) { TMemCheck mc; std::stringstream mcstr; - mcstr << std::hex << *i; + mcstr << std::hex << mcs_item; mcstr >> mc.StartAddress; - mc.bRange = i->find("n") != i->npos; - mc.OnRead = i->find("r") != i->npos; - mc.OnWrite = i->find("w") != i->npos; - mc.Log = i->find("l") != i->npos; - mc.Break = i->find("p") != i->npos; + mc.bRange = mcs_item.find("n") != mcs_item.npos; + mc.OnRead = mcs_item.find("r") != mcs_item.npos; + mc.OnWrite = mcs_item.find("w") != mcs_item.npos; + mc.Log = mcs_item.find("l") != mcs_item.npos; + mc.Break = mcs_item.find("p") != mcs_item.npos; if (mc.bRange) mcstr >> mc.EndAddress; else @@ -157,7 +158,7 @@ void MemChecks::Add(const TMemCheck& _rMemoryCheck) void MemChecks::Remove(u32 _Address) { - for (TMemChecks::iterator i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i) + for (auto i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i) { if (i->StartAddress == _Address) { @@ -169,7 +170,7 @@ void MemChecks::Remove(u32 _Address) TMemCheck *MemChecks::GetMemCheck(u32 address) { - for (TMemChecks::iterator i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i) + for (auto i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i) { if (i->bRange) {