--- qt-1.44/src/kernel/qregion.h.chmou Fri Feb 26 17:58:47 1999 +++ qt-1.44/src/kernel/qregion.h Sat Nov 18 22:14:42 2000 @@ -57,22 +57,6 @@ QRegion intersect( const QRegion &) const; QRegion subtract( const QRegion & ) const; -// Work around clash with the ANSI C++ keyword "xor". -// -// Use of QRegion::xor() is deprecated - you should use QRegion::eor(). -// Calls to QRegion::xor() will work for now, but give a warning. -// -// If possible, compile the Qt library without this ANSI C++ feature enabled, -// thus including both the old xor() and new eor() in the library, so old -// binaries will continue to work (with the warning). -// -// We also hide the xor() function if there is a #define for xor, in -// case someone is using #define xor ^ to work around deficiencies in -// their compiler that cause problems with some other header files. -// -#if !(defined(__STRICT_ANSI__) && defined(_CC_GNU_)) && !defined(_CC_EDG_) && !defined(_CC_HP_) && !defined(_CC_HP_ACC_) && !defined(_CC_USLC_) && !defined(_CC_MWERKS_) && !defined(xor) - QRegion xor( const QRegion & ) const; -#endif QRegion eor( const QRegion & ) const; QRect boundingRect() const; --- qt-1.44/src/kernel/qregion.cpp.chmou Fri Feb 26 17:58:49 1999 +++ qt-1.44/src/kernel/qregion.cpp Sat Nov 18 22:14:42 2000 @@ -226,15 +226,3 @@ r.exec( b ); return s; } - - -// OBSOLETE -#if !(defined(__STRICT_ANSI__) && defined(_CC_GNU_)) && !defined(_CC_EDG_) && !defined(_CC_HP_) && !defined(_CC_HP_ACC_) && !defined(_CC_USLC_) && !defined(xor) -/*! - OBSOLETE - Use eor() instead. -*/ -QRegion QRegion::xor( const QRegion &r ) const -{ - return eor(r); -} -#endif