Use the foreach macro to iterate through pages

This commit is contained in:
Matthew Horan 2012-04-05 18:49:55 -04:00
parent 8f8c95d980
commit d154a65fe8
4 changed files with 6 additions and 13 deletions

View File

@ -8,14 +8,11 @@ GetWindowHandles::GetWindowHandles(WebPageManager *manager, QStringList &argumen
}
void GetWindowHandles::start() {
QListIterator<WebPage *> pageIterator = manager()->iterator();
QString handles = "[";
QStringList stringList;
while (pageIterator.hasNext()) {
stringList.append("\"" + pageIterator.next()->uuid() + "\"");
}
foreach(WebPage *page, manager()->pages())
stringList.append("\"" + page->uuid() + "\"");
handles += stringList.join(",") + "]";

View File

@ -11,8 +11,8 @@ void WebPageManager::append(WebPage *value) {
m_pages.append(value);
}
QListIterator<WebPage *> WebPageManager::iterator() {
return QListIterator<WebPage *>(m_pages);
QList<WebPage *> WebPageManager::pages() {
return m_pages;
}
void WebPageManager::setCurrentPage(WebPage *page) {

View File

@ -11,7 +11,7 @@ class WebPageManager : public QObject {
public:
WebPageManager(QObject *parent = 0);
void append(WebPage *value);
QListIterator<WebPage *> iterator();
QList<WebPage *> pages();
void setCurrentPage(WebPage *);
WebPage *currentPage();
WebPage *createPage(QObject *parent);

View File

@ -21,11 +21,7 @@ void WindowFocus::success(WebPage *page) {
}
void WindowFocus::focusWindow(QString selector) {
QListIterator<WebPage *> pageIterator = manager()->iterator();
while (pageIterator.hasNext()) {
WebPage *page = pageIterator.next();
foreach(WebPage *page, manager()->pages()) {
if (page->matchesWindowSelector(selector)) {
success(page);
return;