diff options
Diffstat (limited to 'xfa/src/fgas/include')
| -rw-r--r-- | xfa/src/fgas/include/fx_datetime.h | 36 | ||||
| -rw-r--r-- | xfa/src/fgas/include/fx_fnt.h | 4 | ||||
| -rw-r--r-- | xfa/src/fgas/include/fx_locale.h | 12 | ||||
| -rw-r--r-- | xfa/src/fgas/include/fx_utl.h | 2 |
4 files changed, 27 insertions, 27 deletions
diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h index 89b8a92d13..fa1ff6e16a 100644 --- a/xfa/src/fgas/include/fx_datetime.h +++ b/xfa/src/fgas/include/fx_datetime.h @@ -102,58 +102,58 @@ class CFX_Unitime { friend CFX_Unitime operator-(FX_UNITIME t1, const CFX_Unitime& t2) { return CFX_Unitime(t1 + t2.m_iUnitime); } - friend FX_BOOL operator==(const CFX_Unitime& t1, const CFX_Unitime& t2) { + friend bool operator==(const CFX_Unitime& t1, const CFX_Unitime& t2) { return t1.m_iUnitime == t2.m_iUnitime; } - friend FX_BOOL operator==(const CFX_Unitime& t1, FX_UNITIME t2) { + friend bool operator==(const CFX_Unitime& t1, FX_UNITIME t2) { return t1.m_iUnitime == t2; } - friend FX_BOOL operator==(FX_UNITIME t1, const CFX_Unitime& t2) { + friend bool operator==(FX_UNITIME t1, const CFX_Unitime& t2) { return t1 == t2.m_iUnitime; } - friend FX_BOOL operator!=(const CFX_Unitime& t1, const CFX_Unitime& t2) { + friend bool operator!=(const CFX_Unitime& t1, const CFX_Unitime& t2) { return t1.m_iUnitime != t2.m_iUnitime; } - friend FX_BOOL operator!=(const CFX_Unitime& t1, FX_UNITIME t2) { + friend bool operator!=(const CFX_Unitime& t1, FX_UNITIME t2) { return t1.m_iUnitime != t2; } - friend FX_BOOL operator!=(FX_UNITIME t1, const CFX_Unitime& t2) { + friend bool operator!=(FX_UNITIME t1, const CFX_Unitime& t2) { return t1 != t2.m_iUnitime; } - friend FX_BOOL operator>(const CFX_Unitime& t1, const CFX_Unitime& t2) { + friend bool operator>(const CFX_Unitime& t1, const CFX_Unitime& t2) { return t1.m_iUnitime > t2.m_iUnitime; } - friend FX_BOOL operator>(const CFX_Unitime& t1, FX_UNITIME t2) { + friend bool operator>(const CFX_Unitime& t1, FX_UNITIME t2) { return t1.m_iUnitime > t2; } - friend FX_BOOL operator>(FX_UNITIME t1, const CFX_Unitime& t2) { + friend bool operator>(FX_UNITIME t1, const CFX_Unitime& t2) { return t1 > t2.m_iUnitime; } - friend FX_BOOL operator>=(const CFX_Unitime& t1, const CFX_Unitime& t2) { + friend bool operator>=(const CFX_Unitime& t1, const CFX_Unitime& t2) { return t1.m_iUnitime >= t2.m_iUnitime; } - friend FX_BOOL operator>=(const CFX_Unitime& t1, FX_UNITIME t2) { + friend bool operator>=(const CFX_Unitime& t1, FX_UNITIME t2) { return t1.m_iUnitime >= t2; } - friend FX_BOOL operator>=(FX_UNITIME t1, const CFX_Unitime& t2) { + friend bool operator>=(FX_UNITIME t1, const CFX_Unitime& t2) { return t1 >= t2.m_iUnitime; } - friend FX_BOOL operator<(const CFX_Unitime& t1, const CFX_Unitime& t2) { + friend bool operator<(const CFX_Unitime& t1, const CFX_Unitime& t2) { return t1.m_iUnitime < t2.m_iUnitime; } - friend FX_BOOL operator<(const CFX_Unitime& t1, FX_UNITIME t2) { + friend bool operator<(const CFX_Unitime& t1, FX_UNITIME t2) { return t1.m_iUnitime < t2; } - friend FX_BOOL operator<(FX_UNITIME t1, const CFX_Unitime& t2) { + friend bool operator<(FX_UNITIME t1, const CFX_Unitime& t2) { return t1 < t2.m_iUnitime; } - friend FX_BOOL operator<=(const CFX_Unitime& t1, const CFX_Unitime& t2) { + friend bool operator<=(const CFX_Unitime& t1, const CFX_Unitime& t2) { return t1.m_iUnitime <= t2.m_iUnitime; } - friend FX_BOOL operator<=(const CFX_Unitime& t1, FX_UNITIME t2) { + friend bool operator<=(const CFX_Unitime& t1, FX_UNITIME t2) { return t1.m_iUnitime <= t2; } - friend FX_BOOL operator<=(FX_UNITIME t1, const CFX_Unitime& t2) { + friend bool operator<=(FX_UNITIME t1, const CFX_Unitime& t2) { return t1 <= t2.m_iUnitime; } diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h index 78c9b5ee13..efb1b03b33 100644 --- a/xfa/src/fgas/include/fx_fnt.h +++ b/xfa/src/fgas/include/fx_fnt.h @@ -123,8 +123,8 @@ typedef struct _FX_FONTDESCRIPTOR : public CFX_Target { } FX_FONTDESCRIPTOR, *FX_LPFONTDESCRIPTOR; typedef FX_FONTDESCRIPTOR const* FX_LPCFONTDESCRIPTOR; typedef CFX_MassArrayTemplate<FX_FONTDESCRIPTOR> CFX_FontDescriptors; -inline FX_BOOL operator==(const FX_FONTDESCRIPTOR& left, - const FX_FONTDESCRIPTOR& right) { +inline bool operator==(const FX_FONTDESCRIPTOR& left, + const FX_FONTDESCRIPTOR& right) { return left.uCharSet == right.uCharSet && left.dwFontStyles == right.dwFontStyles && FXSYS_wcscmp(left.wsFontFace, right.wsFontFace) == 0 && diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h index cf35491f9b..c558af62d0 100644 --- a/xfa/src/fgas/include/fx_locale.h +++ b/xfa/src/fgas/include/fx_locale.h @@ -164,12 +164,12 @@ class CFX_Decimal { CFX_Decimal(const CFX_ByteStringC& str); operator CFX_WideString() const; operator double() const; - FX_BOOL operator==(const CFX_Decimal& val) const; - FX_BOOL operator<=(const CFX_Decimal& val) const; - FX_BOOL operator>=(const CFX_Decimal& val) const; - FX_BOOL operator!=(const CFX_Decimal& val) const; - FX_BOOL operator<(const CFX_Decimal& val) const; - FX_BOOL operator>(const CFX_Decimal& val) const; + bool operator==(const CFX_Decimal& val) const; + bool operator<=(const CFX_Decimal& val) const; + bool operator>=(const CFX_Decimal& val) const; + bool operator!=(const CFX_Decimal& val) const; + bool operator<(const CFX_Decimal& val) const; + bool operator>(const CFX_Decimal& val) const; CFX_Decimal operator+(const CFX_Decimal& val) const; CFX_Decimal operator-(const CFX_Decimal& val) const; CFX_Decimal operator*(const CFX_Decimal& val) const; diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index e95d82005a..8ce736569d 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -664,7 +664,7 @@ class CFX_CPLTreeNode : public CFX_Target { } return iLevel; } - FX_BOOL IsRootNode() const { return m_pParentNode == NULL; } + bool IsRootNode() const { return !m_pParentNode; } baseType GetData() const { return m_Data; } void SetData(baseType data) { m_Data = data; } |