From 897c48989aa314116aa1604f8f5d29514a40774d Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 29 Jun 2009 12:55:00 +0200 Subject: Remove some warnings in harfbuzz component. --- src/3rdparty/harfbuzz/src/harfbuzz-gpos.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-impl.c | 4 ++-- src/3rdparty/harfbuzz/src/harfbuzz-stream.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c index 1ac3779..c932ec2 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c @@ -2723,7 +2723,7 @@ static HB_Error Load_Mark2Array( HB_Mark2Array* m2a, { HB_Error error; - HB_UShort k, m, n, count; + HB_UShort m, n, count; HB_UInt cur_offset, new_offset, base_offset; HB_Mark2Record *m2r; diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c index 9056a55..ddbf36b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c @@ -33,7 +33,7 @@ HB_INTERNAL HB_Pointer _hb_alloc(size_t size, HB_Error *perror ) { - HB_Error error = 0; + HB_Error error = (HB_Error)0; HB_Pointer block = NULL; if ( size > 0 ) @@ -54,7 +54,7 @@ _hb_realloc(HB_Pointer block, HB_Error *perror ) { HB_Pointer block2 = NULL; - HB_Error error = 0; + HB_Error error = (HB_Error)0; block2 = realloc( block, new_size ); if ( block2 == NULL && new_size != 0 ) diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c index 3dcee82..2d9638f 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c @@ -70,7 +70,7 @@ HB_INTERNAL HB_Error _hb_stream_seek( HB_Stream stream, HB_UInt pos ) { - HB_Error error = 0; + HB_Error error = (HB_Error)0; stream->pos = pos; if (pos > stream->size) -- cgit v0.12 From e507a4b2f59e42b74833d047cc51e648df6d5eb5 Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 29 Jun 2009 12:57:22 +0200 Subject: Fix warnings because of unused variables. --- src/gui/kernel/qapplication_s60.cpp | 18 +++++++++--------- src/gui/kernel/qclipboard_s60.cpp | 2 +- src/gui/kernel/qdesktopwidget_s60.cpp | 4 ++-- src/gui/kernel/qkeymapper_s60.cpp | 4 ++-- src/gui/kernel/qwidget_s60.cpp | 8 ++++---- src/gui/painting/qpaintengine_raster.cpp | 2 +- src/gui/painting/qwindowsurface_raster.cpp | 6 ++++++ src/gui/painting/qwindowsurface_s60.cpp | 2 +- src/plugins/imageformats/jpeg/jpeg.pro | 4 ++++ src/plugins/imageformats/mng/mng.pro | 4 ++++ 10 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index b7561e4..cf74ba0 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -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 QKeyMapperPrivate::possibleKeys(QKeyEvent *e) +QList QKeyMapperPrivate::possibleKeys(QKeyEvent * /* e */) { QList 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/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 &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; diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index e2e1a66..f8893a0 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -13,6 +13,10 @@ wince*: { contains(CE_ARCH,x86):CONFIG += exceptions_off } +symbian: { + QMAKE_CXXFLAGS.CW += -W nounusedarg +} + contains(QT_CONFIG, system-jpeg) { unix:LIBS += -ljpeg win32:LIBS += libjpeg.lib diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 35cb47a..e391ebc 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -7,6 +7,10 @@ HEADERS += qmnghandler.h SOURCES += main.cpp \ qmnghandler.cpp +symbian: { + QMAKE_CXXFLAGS.CW += -W nounused +} + contains(QT_CONFIG, system-mng) { unix:LIBS += -lmng win32:LIBS += libmng.lib -- cgit v0.12 From 5794f2253849c9dcdb11fd196a8980f273bdbba9 Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 29 Jun 2009 12:58:35 +0200 Subject: Fixed various useless warnings. --- src/gui/kernel/qapplication_s60.cpp | 4 ++-- src/gui/kernel/qsound_s60.cpp | 2 +- src/testlib/qtestresult.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index cf74ba0..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(alienWidget->d_func()->threadData->eventDispatcher)) { + if ((dispatcher = qobject_cast(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(widget->d_func()->threadData->eventDispatcher)) { + if ((dispatcher = qobject_cast(widget->d_func()->threadData->eventDispatcher)) != 0) { if (dispatcher->excludeUserInputEvents()) { dispatcher->saveInputEvent(this, widget, new QKeyEventEx(qKeyEvent)); return EKeyWasConsumed; 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/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 39759b5..0f21378 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -68,7 +68,7 @@ namespace QTest static const char *expectFailComment = 0; static int expectFailMode = 0; -}; +} void QTestResult::reset() { -- cgit v0.12