diff --git a/src/GetWindowHandles.cpp b/src/GetWindowHandles.cpp
index 21502ef..17588ca 100644
--- a/src/GetWindowHandles.cpp
+++ b/src/GetWindowHandles.cpp
@@ -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(",") + "]";
 
diff --git a/src/WebPageManager.cpp b/src/WebPageManager.cpp
index be70076..77206a2 100644
--- a/src/WebPageManager.cpp
+++ b/src/WebPageManager.cpp
@@ -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) {
diff --git a/src/WebPageManager.h b/src/WebPageManager.h
index 1de830b..8785b05 100644
--- a/src/WebPageManager.h
+++ b/src/WebPageManager.h
@@ -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);
diff --git a/src/WindowFocus.cpp b/src/WindowFocus.cpp
index 8e221da..d522804 100644
--- a/src/WindowFocus.cpp
+++ b/src/WindowFocus.cpp
@@ -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;