1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the TRUE and FALSE macros

Browse Source 
They are completely unused in Qt, and are a potential source of
compilation errors in application code.

Change-Id: I6dfe2891f3b2365a30048f99c31e8e3a2425e62b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
David Faure 2012-12-06 10:47:59 +01:00 committed by The Qt Project
parent ae8533e4ae
commit 158f39ec78
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/changes-5.0.0 vendored
View File

@ -60,6 +60,8 @@ information about a particular change.
in Qt4, so these methods return a bool now. If your code used the undocumented in Qt4, so these methods return a bool now. If your code used the undocumented
QBool, simply replace it with bool. QBool, simply replace it with bool.
- The old macros TRUE and FALSE have been removed, use true and false instead.
- qIsDetached<> has been removed without replacement. - qIsDetached<> has been removed without replacement.
- The return type of QFlags<Enum>::operator int() now matches the Enum's underlying - The return type of QFlags<Enum>::operator int() now matches the Enum's underlying

11
src/corelib/global/qglobal.h
View File

@ -436,17 +436,6 @@ typedef QIntegerForSizeof<void*>::Unsigned quintptr;
typedef QIntegerForSizeof<void*>::Signed qptrdiff; typedef QIntegerForSizeof<void*>::Signed qptrdiff;
typedef qptrdiff qintptr; typedef qptrdiff qintptr;
/*
Constant bool values
*/
#ifndef QT_LINUXBASE /* the LSB defines TRUE and FALSE for us */
# ifndef TRUE
# define TRUE true
# define FALSE false
# endif
#endif
/* moc compats (signals/slots) */ /* moc compats (signals/slots) */
#ifndef QT_MOC_COMPAT #ifndef QT_MOC_COMPAT
# define QT_MOC_COMPAT # define QT_MOC_COMPAT