From 2276a7f2745abb4d09aadecb458dd65b84613737 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Fri, 15 Nov 2013 19:35:06 +0100
Subject: [PATCH] PageFormCompleter: Coding style

PageFormCompleter::getAllElementsFromPage doesn't need passing
QWebPage *
---
 src/lib/autofill/pageformcompleter.cpp | 12 ++++++++----
 src/lib/autofill/pageformcompleter.h   |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/lib/autofill/pageformcompleter.cpp b/src/lib/autofill/pageformcompleter.cpp
index 55f071130..f41144c7c 100644
--- a/src/lib/autofill/pageformcompleter.cpp
+++ b/src/lib/autofill/pageformcompleter.cpp
@@ -49,7 +49,7 @@ PageFormData PageFormCompleter::extractFormData(const QByteArray &postData) cons
         return formData;
     }
 
-    const QWebElementCollection &allForms = getAllElementsFromPage(m_page, "form");
+    const QWebElementCollection &allForms = getAllElementsFromPage("form");
 
     // Find form that contains password value sent in data
     foreach (const QWebElement &formElement, allForms) {
@@ -100,7 +100,7 @@ bool PageFormCompleter::completePage(const QByteArray &data) const
     inputTypes << "text" << "password" << "email";
 
     // Find all input elements in the page
-    const QWebElementCollection &inputs = getAllElementsFromPage(m_page, "input");
+    const QWebElementCollection &inputs = getAllElementsFromPage("input");
 
     for (int i = 0; i < queryItems.count(); i++) {
         const QString &key = queryItems.at(i).first;
@@ -230,12 +230,16 @@ PageFormCompleter::QueryItems PageFormCompleter::createQueryItems(QByteArray dat
     return arguments;
 }
 
-QWebElementCollection PageFormCompleter::getAllElementsFromPage(QWebPage* page, const QString &selector) const
+QWebElementCollection PageFormCompleter::getAllElementsFromPage(const QString &selector) const
 {
     QWebElementCollection list;
 
+    if (!m_page) {
+        return list;
+    }
+
     QList<QWebFrame*> frames;
-    frames.append(page->mainFrame());
+    frames.append(m_page->mainFrame());
     while (!frames.isEmpty()) {
         QWebFrame* frame = frames.takeFirst();
         if (frame) {
diff --git a/src/lib/autofill/pageformcompleter.h b/src/lib/autofill/pageformcompleter.h
index f20292e0a..e59f997ee 100644
--- a/src/lib/autofill/pageformcompleter.h
+++ b/src/lib/autofill/pageformcompleter.h
@@ -55,7 +55,7 @@ private:
     QByteArray convertWebKitFormBoundaryIfNecessary(const QByteArray &data) const;
     QueryItem findUsername(const QWebElement &form) const;
     QueryItems createQueryItems(QByteArray data) const;
-    QWebElementCollection getAllElementsFromPage(QWebPage* page, const QString &selector) const;
+    QWebElementCollection getAllElementsFromPage(const QString &selector) const;
 
     QWebPage* m_page;
 };