Fix shadowing of "page" variable that is passed as argument as well as a member variable.

This also fixes compilation with gcc 4.3.

Signed-off-by: George Staikos <staikos@kde.org>
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 14bdef9d26835eab80750eb54b608da01f55ff0a..02663fe654bb3303a874577d401555edabd759f4 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -65,12 +65,12 @@
 
 using namespace WebCore;
 
-void QWebFramePrivate::init(QWebFrame *qframe, WebCore::Page *page, QWebFrameData *frameData)
+void QWebFramePrivate::init(QWebFrame *qframe, WebCore::Page *webcorePage, QWebFrameData *frameData)
 {
     q = qframe;
 
     frameLoaderClient = new FrameLoaderClientQt();
-    frame = new Frame(page, frameData->ownerElement, frameLoaderClient);
+    frame = new Frame(webcorePage, frameData->ownerElement, frameLoaderClient);
     frameLoaderClient->setFrame(qframe, frame.get());
 
     frameView = new FrameView(frame.get());

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 254d63214c9b6acc0ba3d2d791c36206f2b2698e..270cd490c3b5d973633707513679807839e615a1 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-22  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by George Staikos <staikos@kde.org>.
+
+        Fix shadowing of "page" variable that is passed as argument as well as a member variable.
+        
+        This also fixes compilation with gcc 4.3.
+        
+
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::init):
+
 2007-11-21  Adam Treat  <treat@kde.org>
 
         Reviewed by Simon.