Revert "Fixed a few compiler warnings from QtGui for Symbian."

Accidentally used git commit -a when should have used only git commit :(

This reverts commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5.

7 files changed, 11 insertions, 16 deletions

diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 9ae8d7291d..554c0f30e7 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -716,8 +716,6 @@ void QS60PixmapData::beginDataAccess()
 
 void QS60PixmapData::endDataAccess(bool readOnly) const
 {
-    Q_UNUSED(readOnly);
-
     if(!cfbsBitmap)
         return;
 
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index f1bbcae15b..691929244c 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -929,7 +929,7 @@ TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id)
     return CCoeControl::MopSupplyObject(id);
 }
 
-void QSymbianControl::setFocusSafely(bool focus, bool resetLastFocused)
+void QSymbianControl::setFocusSafely(bool focus)
 {
     // The stack hack in here is very unfortunate, but it is the only way to ensure proper
     // focus in Symbian. If this is not executed, the control which happens to be on
@@ -939,19 +939,17 @@ void QSymbianControl::setFocusSafely(bool focus, bool resetLastFocused)
         S60->appUi()->RemoveFromStack(this);
         // Symbian doesn't automatically remove focus from the last focused control, so we need to
         // remember it and clear focus ourselves.
-        if (resetLastFocused && lastFocusedControl && lastFocusedControl != this)
+        if (lastFocusedControl && lastFocusedControl != this)
             lastFocusedControl->SetFocus(false);
         QT_TRAP_THROWING(S60->appUi()->AddToStackL(this,
                 ECoeStackPriorityDefault + 1, ECoeStackFlagStandard)); // Note the + 1
-        if (resetLastFocused)
-            lastFocusedControl = this;
+        lastFocusedControl = this;
         this->SetFocus(true);
     } else {
         S60->appUi()->RemoveFromStack(this);
         QT_TRAP_THROWING(S60->appUi()->AddToStackL(this,
                 ECoeStackPriorityDefault, ECoeStackFlagStandard));
-        if (resetLastFocused)
-            lastFocusedControl = 0;
+        lastFocusedControl = 0;
         this->SetFocus(false);
     }
 }
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 318622121b..d33791bdd6 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -157,7 +157,7 @@ public:
     void setIgnoreFocusChanged(bool enabled) { m_ignoreFocusChanged = enabled; }
     void CancelLongTapTimer();
 
-    void setFocusSafely(bool focus, bool resetLastFocused = true);
+    void setFocusSafely(bool focus);
 
 protected:
     void Draw(const TRect& aRect) const;
@@ -199,7 +199,7 @@ inline void QS60Data::updateScreenSize()
     S60->screenHeightInPixels = params.iPixelSize.iHeight;
     S60->screenWidthInTwips = params.iTwipsSize.iWidth;
     S60->screenHeightInTwips = params.iTwipsSize.iHeight;
-
+    
     S60->virtualMouseMaxAccel = qMax(S60->screenHeightInPixels, S60->screenWidthInPixels) / 20;
 
     TReal inches = S60->screenHeightInTwips / (TReal)KTwipsPerInch;
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 07308d23fa..b0d405afb3 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -370,7 +370,7 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de
             control->MakeVisible(false);
             QT_TRAP_THROWING(control->ControlEnv()->AppUi()->AddToStackL(control, ECoeStackPriorityDefault, stackingFlags));
             // Avoid keyboard focus to a hidden window.
-            control->setFocusSafely(false, false);
+            control->setFocusSafely(false);
 
             RDrawableWindow *const drawableWindow = control->DrawableWindow();
             // Request mouse move events.
diff --git a/src/gui/painting/qpaintengine_s60.cpp b/src/gui/painting/qpaintengine_s60.cpp
index 6f4f398061..e17dba1829 100644
--- a/src/gui/painting/qpaintengine_s60.cpp
+++ b/src/gui/painting/qpaintengine_s60.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 class QS60PaintEnginePrivate : public QRasterPaintEnginePrivate
 {
 public:
-    QS60PaintEnginePrivate(QS60PaintEngine *engine) { Q_UNUSED(engine); }
+    QS60PaintEnginePrivate(QS60PaintEngine *engine) { }
 };
 
 QS60PaintEngine::QS60PaintEngine(QPaintDevice *device, QS60PixmapData *data)
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 738e36aea9..e8f6d3901b 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1354,7 +1354,6 @@ static void match(int script, const QFontDef &request,
 #ifdef Q_WS_X11
     load(family_name, script, forceXLFD);
 #else
-    Q_UNUSED(forceXLFD);
     load(family_name, script);
 #endif
 
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 501e62f971..0947e1b22b 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -119,7 +119,7 @@ void QMainWindowPrivate::init()
     q->setAttribute(Qt::WA_Hover);
 #ifdef QT_SOFTKEYS_ENABLED
     menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q);
-    menuBarAction->setObjectName(QLatin1String("_q_menuSoftKeyAction"));
+    menuBarAction->setObjectName("_q_menuSoftKeyAction");
 #endif
 }
 
@@ -933,7 +933,7 @@ static bool checkDockWidgetArea(Qt::DockWidgetArea area, const char *where)
 }
 
 #ifndef QT_NO_TABBAR
-/*!
+/*! 
     \property QMainWindow::documentMode
     \brief whether the tab bar for tabbed dockwidgets is set to document mode.
     \since 4.5
@@ -954,7 +954,7 @@ void QMainWindow::setDocumentMode(bool enabled)
 #endif // QT_NO_TABBAR
 
 #ifndef QT_NO_TABWIDGET
-/*!
+/*! 
     \property QMainWindow::tabShape
     \brief the tab shape used for tabbed dock widgets.
     \since 4.5