summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-06-29 10:58:35 (GMT)
committeraxis <qt-info@nokia.com>2009-06-29 10:58:35 (GMT)
commit5794f2253849c9dcdb11fd196a8980f273bdbba9 (patch)
tree9cce0998f4abf42e083e6cee4aae8367ef5d2322
parente507a4b2f59e42b74833d047cc51e648df6d5eb5 (diff)
downloadQt-5794f2253849c9dcdb11fd196a8980f273bdbba9.zip
Qt-5794f2253849c9dcdb11fd196a8980f273bdbba9.tar.gz
Qt-5794f2253849c9dcdb11fd196a8980f273bdbba9.tar.bz2
Fixed various useless warnings.
-rw-r--r--src/gui/kernel/qapplication_s60.cpp4
-rw-r--r--src/gui/kernel/qsound_s60.cpp2
-rw-r--r--src/testlib/qtestresult.cpp2
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<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;
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()
{