Commit baac1e45 authored by Michael Reeves's avatar Michael Reeves

Convert more interator loops to ranged for

parent e5eac07e
...@@ -154,19 +154,18 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const ...@@ -154,19 +154,18 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const
return true; return true;
} }
QStringList::ConstIterator it;
QStringList::ConstIterator itEnd; for(const QString& startPattern: m_startPatterns)
for(it = m_startPatterns.begin(), itEnd = m_startPatterns.end(); it != itEnd; ++it)
{ {
if(text.startsWith(*it)) if(text.startsWith(startPattern))
{ {
return true; return true;
} }
} }
for(it = m_endPatterns.begin(), itEnd = m_endPatterns.end(); it != itEnd; ++it) for(const QString& endPattern: m_endPatterns)
{ {
if(text.mid(text.length() - it->length()) == *it) //(text.endsWith(*it)) if(text.mid(text.length() - endPattern.length()) == endPattern) //(text.endsWith(*it))
{ {
return true; return true;
} }
...@@ -184,9 +183,9 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const ...@@ -184,9 +183,9 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const
} }
*/ */
for(it = m_generalPatterns.begin(); it != m_generalPatterns.end(); ++it) for(const QString& globStr : m_generalPatterns)
{ {
QRegExp pattern(*it, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive, QRegExp::Wildcard); QRegExp pattern(globStr, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive, QRegExp::Wildcard);
if(pattern.exactMatch(text)) if(pattern.exactMatch(text))
return true; return true;
} }
...@@ -197,9 +196,9 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const ...@@ -197,9 +196,9 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const
bool CvsIgnoreList::cvsIgnoreExists(const t_DirectoryList* pDirList) bool CvsIgnoreList::cvsIgnoreExists(const t_DirectoryList* pDirList)
{ {
t_DirectoryList::const_iterator i; t_DirectoryList::const_iterator i;
for(i = pDirList->begin(); i != pDirList->end(); ++i) for(const FileAccess& dir : *pDirList)
{ {
if(i->fileName() == ".cvsignore") if(dir.fileName() == ".cvsignore")
return true; return true;
} }
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment