From 94a4d1918d5fe0d6d094b3f3cbc9e763a50bb19f Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 26 Aug 2009 09:17:04 +1000
Subject: Avoid shadowing QWebPage::view().

---
 src/declarative/fx/qfxwebview.cpp | 6 +++---
 src/declarative/fx/qfxwebview.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 347c9c2..5e3ce29 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -1174,15 +1174,15 @@ private:
     QFxWebView *webview;
 };
 
-QFxWebView *QFxWebPage::view()
+QFxWebView *QFxWebPage::viewItem()
 {
     return static_cast<QFxWebView*>(parent());
 }
 
 QObject *QFxWebPage::createPlugin(const QString &, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
 {
-    QUrl comp = qmlContext(view())->resolvedUrl(url);
-    return new QWidget_Dummy_Plugin(comp,view(),paramNames,paramValues);
+    QUrl comp = qmlContext(viewItem())->resolvedUrl(url);
+    return new QWidget_Dummy_Plugin(comp,viewItem(),paramNames,paramValues);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 40c86b4..d7c9fd0 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -70,7 +70,7 @@ public:
 protected:
     QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
 private:
-    QFxWebView *view();
+    QFxWebView *viewItem();
 };
 
 
-- 
cgit v0.12