From dae5e609cc5c3b5e07f1ed01d756141511ba1347 Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Thu, 24 Sep 2009 13:55:31 +0200
Subject: Rename a variable, remove unecessary includes.

This addresses a review comment.
---
 src/gui/kernel/qapplication_s60.cpp | 6 +++---
 src/gui/kernel/qt_s60_p.h           | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index a5ecd4b..9d21c6c 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -324,11 +324,11 @@ QSymbianControl::QSymbianControl(QWidget *w)
 {
 }
 
-void QSymbianControl::ConstructL(bool topLevel, bool desktop)
+void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop)
 {
     if (!desktop)
     {
-        if (topLevel or !qwidget->parentWidget())
+        if (isWindowOwning or !qwidget->parentWidget())
             CreateWindowL(S60->windowGroup());
         else
             /**
@@ -348,7 +348,7 @@ void QSymbianControl::ConstructL(bool topLevel, bool desktop)
 #ifdef DEBUG_QSYMBIANCONTROL
         qDebug()    << "QSymbianControl::ConstructL [" << this
                     << "] widget" << qwidget
-                    << "topLevel" << topLevel
+                    << "isWindowOwning" << isWindowOwning
                     << "parentWidget" << qwidget->parentWidget()
                     << "OwnsWindow" << OwnsWindow()
                     << "Window.ClientHandle" << reinterpret_cast<const void*>(DrawableWindow()->ClientHandle())
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index fd12ef8..2474d69 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -74,8 +74,6 @@
 #include <eikspane.h>               // CEikStatusPane
 #endif
 
-#include <fbs.h> // for CFbsBitmap
-
 QT_BEGIN_NAMESPACE
 
 // Application internal HandleResourceChangeL events,
@@ -134,8 +132,6 @@ public:
 };
 class QLongTapTimer;
 
-class CFbsBitmap;
-
 class QSymbianControl : public CCoeControl, public QAbstractLongTapObserver
 {
 public:
@@ -143,7 +139,7 @@ public:
 
 public:
     QSymbianControl(QWidget *w);
-    void ConstructL(bool topLevel = false, bool desktop = false);
+    void ConstructL(bool isWindowOwning = false, bool desktop = false);
     ~QSymbianControl();
     void HandleResourceChange(int resourceType);
     void HandlePointerEventL(const TPointerEvent& aPointerEvent);
-- 
cgit v0.12