Merge branch 'warningRemovals'

9 files changed, 29 insertions, 23 deletions

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index b7561e4..5829217 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -416,7 +416,7 @@ void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent)
         events.append(Event(alienWidget,mEvent));
         QEventDispatcherS60 *dispatcher;
         // It is theoretically possible for someone to install a different event dispatcher.
-        if (dispatcher = qobject_cast<QEventDispatcherS60 *>(alienWidget->d_func()->threadData->eventDispatcher)) {
+        if ((dispatcher = qobject_cast<QEventDispatcherS60 *>(alienWidget->d_func()->threadData->eventDispatcher)) != 0) {
             if (dispatcher->excludeUserInputEvents()) {
                 for (int i=0;i < events.count();++i)
                 {
@@ -509,7 +509,7 @@ TKeyResponse QSymbianControl::OfferKeyEvent(const TKeyEvent& keyEvent, TEventCod
 
         QEventDispatcherS60 *dispatcher;
         // It is theoretically possible for someone to install a different event dispatcher.
-        if (dispatcher = qobject_cast<QEventDispatcherS60 *>(widget->d_func()->threadData->eventDispatcher)) {
+        if ((dispatcher = qobject_cast<QEventDispatcherS60 *>(widget->d_func()->threadData->eventDispatcher)) != 0) {
             if (dispatcher->excludeUserInputEvents()) {
                 dispatcher->saveInputEvent(this, widget, new QKeyEventEx(qKeyEvent));
                 return EKeyWasConsumed;
@@ -650,7 +650,7 @@ void QSymbianControl::PositionChanged()
     }
 }
 
-void QSymbianControl::FocusChanged(TDrawNow aDrawNow)
+void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */)
 {
     if (m_ignoreFocusChanged)
         return;
@@ -715,7 +715,7 @@ TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id)
     return CCoeControl::MopSupplyObject(id);
 }
 
-void qt_init(QApplicationPrivate *priv, int)
+void qt_init(QApplicationPrivate * /* priv */, int)
 {
     S60 = new QS60Data;
 
@@ -800,12 +800,12 @@ bool QApplicationPrivate::modalState()
     return false;
 }
 
-void QApplicationPrivate::enterModal_sys(QWidget *widget)
+void QApplicationPrivate::enterModal_sys(QWidget * /* widget */)
 {
     // TODO: Implement QApplicationPrivate::enterModal_sys(QWidget *widget)
 }
 
-void QApplicationPrivate::leaveModal_sys(QWidget *widget)
+void QApplicationPrivate::leaveModal_sys(QWidget * /* widget */)
 {
     // TODO: Implement QApplicationPrivate::leaveModal_sys(QWidget *widget)
 }
@@ -910,7 +910,7 @@ QWidget * QApplication::topLevelAt(QPoint const& point)
     return found;
 }
 
-void QApplication::alert(QWidget *widget, int duration)
+void QApplication::alert(QWidget * /* widget */, int /* duration */)
 {
     // TODO: Implement QApplication::alert(QWidget *widget, int duration)
 }
@@ -1052,7 +1052,7 @@ int QApplication::s60ProcessEvent(TWsEvent *event)
     return 0;
 }
 
-bool QApplication::s60EventFilter(TWsEvent *aEvent)
+bool QApplication::s60EventFilter(TWsEvent * /* aEvent */)
 {
     return false;
 }
@@ -1135,13 +1135,13 @@ void QApplication::setWheelScrollLines(int n)
 }
 #endif //QT_NO_WHEELEVENT
 
-bool QApplication::isEffectEnabled(Qt::UIEffect effect)
+bool QApplication::isEffectEnabled(Qt::UIEffect /* effect */)
 {
     // TODO: Implement QApplication::isEffectEnabled(Qt::UIEffect effect)
     return false;
 }
 
-void QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable)
+void QApplication::setEffectEnabled(Qt::UIEffect /* effect */, bool /* enable */)
 {
     // TODO: Implement QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable)
 }
@@ -1159,7 +1159,7 @@ TUint QApplicationPrivate::resolveS60ScanCode(TInt scanCode, TUint keysym)
 }
 
 #ifndef QT_NO_SESSIONMANAGER
-QSessionManager::QSessionManager(QApplication * app, QString &id, QString& key)
+QSessionManager::QSessionManager(QApplication * /* app */, QString & /* id */, QString& /* key */)
 {
 
 }
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index f89f3e5..c4e6648 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -261,7 +261,7 @@ bool QClipboard::ownsMode(Mode mode) const
     return false;
 }
 
-bool QClipboard::event(QEvent *e)
+bool QClipboard::event(QEvent * /* e */)
 {
     return true;
 }
diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp
index eefd0ef..a333d62 100644
--- a/src/gui/kernel/qdesktopwidget_s60.cpp
+++ b/src/gui/kernel/qdesktopwidget_s60.cpp
@@ -162,12 +162,12 @@ const QRect QDesktopWidget::screenGeometry(int /* screen */) const
     return QRect(0, 0, S60->screenWidthInPixels, S60->screenHeightInPixels);
     }
 
-int QDesktopWidget::screenNumber(const QWidget *widget) const
+int QDesktopWidget::screenNumber(const QWidget * /* widget */) const
 {
     return QDesktopWidgetPrivate::primaryScreen;
 }
 
-int QDesktopWidget::screenNumber(const QPoint &point) const
+int QDesktopWidget::screenNumber(const QPoint & /* point */) const
 {
     return QDesktopWidgetPrivate::primaryScreen;
 }
diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/kernel/qkeymapper_s60.cpp
index bb074c1..c13dd51 100644
--- a/src/gui/kernel/qkeymapper_s60.cpp
+++ b/src/gui/kernel/qkeymapper_s60.cpp
@@ -53,7 +53,7 @@ QKeyMapperPrivate::~QKeyMapperPrivate()
 {
 }
 
-QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *e)
+QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent * /* e */)
 {
     QList<int> result;
     return result;
@@ -64,7 +64,7 @@ void QKeyMapperPrivate::clearMappings()
     // stub
 }
 
-QString QKeyMapperPrivate::translateKeyEvent(int keySym, Qt::KeyboardModifiers modifiers)
+QString QKeyMapperPrivate::translateKeyEvent(int keySym, Qt::KeyboardModifiers /* modifiers */)
 {
     if (keySym >= Qt::Key_Escape)
         return QString();
diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/kernel/qsound_s60.cpp
index 00fc2fe..c9eedf5 100644
--- a/src/gui/kernel/qsound_s60.cpp
+++ b/src/gui/kernel/qsound_s60.cpp
@@ -117,7 +117,7 @@ protected:
         } else {
             // We don't have a way to inform about errors -> just decrement loops
             // in order that QSound::isFinished will return true;
-            while(decLoop(sound));
+            while(decLoop(sound)) {}
         }
     }    
 
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 6109f17..4e84ff4 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -144,7 +144,7 @@ void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys)
     nativeContainer->DrawDeferred(); // 3.1 needs an extra invitation
 }
 
-void QWidgetPrivate::setWSGeometry(bool dontShow)
+void QWidgetPrivate::setWSGeometry(bool /* dontShow */)
 {
 
 }
@@ -686,7 +686,7 @@ void QWidgetPrivate::setWindowTitle_sys(const QString &caption)
     }
 }
 
-void QWidgetPrivate::setWindowIconText_sys(const QString &iconText)
+void QWidgetPrivate::setWindowIconText_sys(const QString & /*iconText */)
 {
 
 }
@@ -738,7 +738,7 @@ void QWidgetPrivate::updateSystemBackground()
 
 }
 
-void QWidgetPrivate::registerDropSite(bool on)
+void QWidgetPrivate::registerDropSite(bool /* on */)
 {
 
 }
@@ -771,7 +771,7 @@ QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys()
     return new QS60WindowSurface(q_func());
 }
 
-void QWidgetPrivate::setMask_sys(const QRegion& region)
+void QWidgetPrivate::setMask_sys(const QRegion& /* region */)
 {
 
 }
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index ada3ebf..97c1fdc 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -4193,7 +4193,7 @@ int QCustomRasterPaintDevice::bytesPerLine() const
 
 #elif defined(Q_WS_S60)
 
-void QRasterBuffer::prepareBuffer(int width, int height)
+void QRasterBuffer::prepareBuffer(int /* width */, int /* height */)
 {
 }
 
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 97178a6..a41c2d5 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -294,6 +294,12 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     CGContextFlush(context);
 #endif
 #endif
+
+#ifdef Q_WS_S60
+    Q_UNUSED(widget);
+    Q_UNUSED(rgn);
+    Q_UNUSED(offset);
+#endif
 }
 
 void QRasterWindowSurface::setGeometry(const QRect &rect)
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 2a20b44..e81adcc 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -154,7 +154,7 @@ bool QS60WindowSurface::scroll(const QRegion &area, int dx, int dy)
     return true;
 }
 
-void QS60WindowSurface::endPaint(const QRegion &rgn)
+void QS60WindowSurface::endPaint(const QRegion & /* rgn */)
 {
     if(!d_ptr->bitmap)
         return;