diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2010-08-18 17:38:55 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2010-08-19 10:58:35 (GMT) |
| commit | c6cc767cb065ca77aba06fe15830c22f187e370c (patch) | |
| tree | e7f17f5fccbd06489c3c29b9dbd0605f850082f7 /src/s60main | |
| parent | 156d1590b405d1d374b5b8c87f5388718462c5e1 (diff) | |
| download | Qt-c6cc767cb065ca77aba06fe15830c22f187e370c.zip Qt-c6cc767cb065ca77aba06fe15830c22f187e370c.tar.gz Qt-c6cc767cb065ca77aba06fe15830c22f187e370c.tar.bz2 | |
Prefer Q_CHECK_PTR to q_check_ptr
With the macro version we get proper debug output (with __FILE__,
__LINE__ annotations) when compiling with -no-exceptions and
!QT_NO_DEBUG.
All changes in this patch affect assignment to local variables, where
the order of assignment versus actual pointer check is not important.
Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/s60main')
| -rw-r--r-- | src/s60main/qts60main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp index 5fbeea5..c65344b 100644 --- a/src/s60main/qts60main.cpp +++ b/src/s60main/qts60main.cpp @@ -51,7 +51,8 @@ GLDEF_C TInt QtMainWrapper(); */ GLDEF_C TInt E32Main() { - CTrapCleanup *cleanupStack = q_check_ptr(CTrapCleanup::New()); + CTrapCleanup *cleanupStack = CTrapCleanup::New(); + Q_CHECK_PTR(cleanupStack); TInt err = 0; TRAP(err, err = QtMainWrapper()); delete cleanupStack; |