summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-06-18 09:20:20 (GMT)
committermread <qt-info@nokia.com>2009-06-18 09:20:20 (GMT)
commit7f874fe9eb61eb155be02c7fc30e7a09d06d166b (patch)
treed5d306057a0c92051fd32ebc5bf6dfa8bc04043a
parent715db7c01d29d316700089f1abc5eea2f7c98975 (diff)
downloadQt-7f874fe9eb61eb155be02c7fc30e7a09d06d166b.zip
Qt-7f874fe9eb61eb155be02c7fc30e7a09d06d166b.tar.gz
Qt-7f874fe9eb61eb155be02c7fc30e7a09d06d166b.tar.bz2
review fixes
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp4
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 27118be..1c79aa6 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -979,10 +979,10 @@ QList<QEventDispatcherSymbian::TimerInfo> QEventDispatcherSymbian::registeredTim
*/
void CQtActiveScheduler::Error(TInt aError) const
{
- try {
+ QT_TRY {
qWarning("Error from active scheduler %d", aError);
}
- catch (const std::bad_alloc&) {} // ignore alloc fails, nothing more can be done
+ QT_CATCH (const std::bad_alloc&) {} // ignore alloc fails, nothing more can be done
}
QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
index c1cf7b6..b39d6df 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian_p.h
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -210,10 +210,10 @@ private:
};
class Q_CORE_EXPORT CQtActiveScheduler : public CActiveScheduler
- {
+{
public: // from CActiveScheduler
virtual void Error(TInt aError) const;
- };
+};
class Q_CORE_EXPORT QEventDispatcherSymbian : public QAbstractEventDispatcher
{