diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-15 15:24:27 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-17 17:55:17 +0100 |
commit | 361774e9107aac3f412ce546892a4b0e55c10dfb (patch) | |
tree | 4558fb6362cd1767c0a5ca00a80584171f7106b8 /idlc/inc | |
parent | 20726ae6644236481cd15e2156935ba842cf88fd (diff) |
idlc: sal_Bool -> bool
Change-Id: Ibeed903d73eb8b3fce7b8c6021c9107437a8c813
Diffstat (limited to 'idlc/inc')
-rw-r--r-- | idlc/inc/idlc/astattribute.hxx | 24 | ||||
-rw-r--r-- | idlc/inc/idlc/astconstant.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/astdeclaration.hxx | 22 | ||||
-rw-r--r-- | idlc/inc/idlc/astenum.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/astexpression.hxx | 6 | ||||
-rw-r--r-- | idlc/inc/idlc/astinterface.hxx | 18 | ||||
-rw-r--r-- | idlc/inc/idlc/astinterfacemember.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/astmodule.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/astoperation.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/astservice.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/astservicemember.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/aststruct.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/asttypedef.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/fehelper.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc/idlc.hxx | 18 | ||||
-rw-r--r-- | idlc/inc/idlc/idlctypes.hxx | 4 |
16 files changed, 56 insertions, 56 deletions
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx index 7cc3a65226b1..a5b4dd620848 100644 --- a/idlc/inc/idlc/astattribute.hxx +++ b/idlc/inc/idlc/astattribute.hxx @@ -69,30 +69,30 @@ public: AstType const * getType() const { return m_pType; } - sal_Bool isReadonly() const + bool isReadonly() const { return ((m_flags & AF_READONLY) == AF_READONLY); } - sal_Bool isOptional() const + bool isOptional() const { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); } - sal_Bool isAttribute() const + bool isAttribute() const { return ((m_flags & AF_ATTRIBUTE) == AF_ATTRIBUTE); } - sal_Bool isProperty() const + bool isProperty() const { return ((m_flags & AF_PROPERTY) == AF_PROPERTY); } - sal_Bool isBound() const + bool isBound() const { return ((m_flags & AF_BOUND) == AF_BOUND); } - sal_Bool isMayBeVoid() const + bool isMayBeVoid() const { return ((m_flags & AF_MAYBEVOID) == AF_MAYBEVOID); } - sal_Bool isConstrained() const + bool isConstrained() const { return ((m_flags & AF_CONSTRAINED) == AF_CONSTRAINED); } - sal_Bool isTransient() const + bool isTransient() const { return ((m_flags & AF_TRANSIENT) == AF_TRANSIENT); } - sal_Bool isMayBeAmbiguous() const + bool isMayBeAmbiguous() const { return ((m_flags & AF_MAYBEAMBIGUOUS) == AF_MAYBEAMBIGUOUS); } - sal_Bool isMayBeDefault() const + bool isMayBeDefault() const { return ((m_flags & AF_MAYBEDEFAULT) == AF_MAYBEDEFAULT); } - sal_Bool isRemoveable() const + bool isRemoveable() const { return ((m_flags & AF_REMOVABLE) == AF_REMOVABLE); } - sal_Bool dumpBlob( + bool dumpBlob( typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex); private: diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx index e012ecd9db98..57a43b62d981 100644 --- a/idlc/inc/idlc/astconstant.hxx +++ b/idlc/inc/idlc/astconstant.hxx @@ -38,7 +38,7 @@ public: ExprType getConstValueType() const { return m_constValueType; } - sal_Bool dumpBlob( + bool dumpBlob( typereg::Writer & rBlob, sal_uInt16 index, bool published); private: AstExpression* m_pConstValue; diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx index 424e5b2ae8d3..3f776625518a 100644 --- a/idlc/inc/idlc/astdeclaration.hxx +++ b/idlc/inc/idlc/astdeclaration.hxx @@ -80,13 +80,13 @@ public: { m_pScope = pSc; } NodeType getNodeType() const { return m_nodeType; } - sal_Bool isInMainfile() const + bool isInMainfile() const { return m_bInMainFile; } - void setInMainfile(sal_Bool bInMainfile) + void setInMainfile(bool bInMainfile) { m_bInMainFile = bInMainfile; } - sal_Bool isImported() const + bool isImported() const { return m_bImported; } - void setImported(sal_Bool bImported) + void setImported(bool bImported) { m_bImported = bImported; } sal_Int32 getLineNumber() const { return m_lineNumber; } @@ -100,19 +100,19 @@ public: { return m_documentation; } void setDocumentation(const OUString& rDocumentation) { m_documentation = rDocumentation; } - sal_Bool isAdded() + bool isAdded() { return m_bIsAdded; } void markAsAdded() - { m_bIsAdded = sal_True; } + { m_bIsAdded = true; } virtual bool isType() const; - sal_Bool hasAncestor(AstDeclaration* pDecl); + bool hasAncestor(AstDeclaration* pDecl); void setPublished() { m_bPublished = true; } bool isPublished() const { return m_bPublished; } - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); bool isPredefined() { return m_bPredefined; } void setPredefined(bool bPredefined); @@ -123,9 +123,9 @@ protected: OString m_fullName; // full qualified name with '/' as separator AstScope* m_pScope; NodeType m_nodeType; - sal_Bool m_bImported; // imported ? - sal_Bool m_bIsAdded; // mark declaration as added in scope - sal_Bool m_bInMainFile; // defined in main file + bool m_bImported; // imported ? + bool m_bIsAdded; // mark declaration as added in scope + bool m_bInMainFile; // defined in main file bool m_bPublished; bool m_bPredefined; sal_Int32 m_lineNumber; // line number defined in diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx index c332ba2a6cf3..d6d31a5ec668 100644 --- a/idlc/inc/idlc/astenum.hxx +++ b/idlc/inc/idlc/astenum.hxx @@ -38,7 +38,7 @@ public: AstConstant* checkValue(AstExpression* pExpr); - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl); private: diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx index 6caaf01d325f..242d0e80c268 100644 --- a/idlc/inc/idlc/astexpression.hxx +++ b/idlc/inc/idlc/astexpression.hxx @@ -141,14 +141,14 @@ public: { m_pSymbolicName = pSymbolicName; } // Evaluation and value coercion - AstExprValue* coerce(ExprType type, sal_Bool bAssign=sal_True); + AstExprValue* coerce(ExprType type, bool bAssign=true); // Evaluate then store value inside this AstExpression void evaluate(EvalKind ek); // Compare to AstExpressions - sal_Bool operator==(AstExpression *pExpr); - sal_Bool compare(AstExpression *pExpr); + bool operator==(AstExpression *pExpr); + bool compare(AstExpression *pExpr); OString toString(); void dump() {} diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx index fe7415dae625..e22cf61e296d 100644 --- a/idlc/inc/idlc/astinterface.hxx +++ b/idlc/inc/idlc/astinterface.hxx @@ -57,17 +57,17 @@ public: bool hasMandatoryInheritedInterfaces() const { return m_mandatoryInterfaces > 0; } - void setForwarded(sal_Bool bForwarded) + void setForwarded(bool bForwarded) { m_bForwarded = bForwarded; } - sal_Bool isForwarded() + bool isForwarded() { return m_bForwarded; } - void setForwardedInSameFile(sal_Bool bForwarded) + void setForwardedInSameFile(bool bForwarded) { m_bForwardedInSameFile = bForwarded; } - sal_Bool isForwardedInSameFile() + bool isForwardedInSameFile() { return m_bForwardedInSameFile; } void setDefined() { m_bIsDefined = true; } - sal_Bool isDefined() const + bool isDefined() const { return m_bIsDefined; } bool usesSingleInheritance() const { return m_bSingleInheritance; } @@ -86,7 +86,7 @@ public: void forwardDefined(AstInterface const & def); - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); private: enum InterfaceKind { @@ -124,9 +124,9 @@ private: InheritedInterfaces m_inheritedInterfaces; InheritedInterfaces::size_type m_mandatoryInterfaces; - sal_Bool m_bIsDefined; - sal_Bool m_bForwarded; - sal_Bool m_bForwardedInSameFile; + bool m_bIsDefined; + bool m_bForwarded; + bool m_bForwardedInSameFile; bool m_bSingleInheritance; VisibleInterfaces m_visibleInterfaces; VisibleMembers m_visibleMembers; diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx index 544bb18e3936..5047a2432cfe 100644 --- a/idlc/inc/idlc/astinterfacemember.hxx +++ b/idlc/inc/idlc/astinterfacemember.hxx @@ -34,7 +34,7 @@ public: AstInterface* getRealInterface() { return m_pRealInterface; } - sal_Bool isOptional() + bool isOptional() { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); } private: const sal_uInt32 m_flags; diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx index 93e12b1c4ba9..1a1381a3a25f 100644 --- a/idlc/inc/idlc/astmodule.hxx +++ b/idlc/inc/idlc/astmodule.hxx @@ -36,7 +36,7 @@ public: {} virtual ~AstModule() {} - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); }; #endif // _IDLC_ASTMODULE_HXX_ diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx index 4b6b8e7d14d5..c5dbf10b3332 100644 --- a/idlc/inc/idlc/astoperation.hxx +++ b/idlc/inc/idlc/astoperation.hxx @@ -47,7 +47,7 @@ public: sal_uInt16 nExceptions() { return (sal_uInt16)(m_exceptions.size()); } - sal_Bool dumpBlob(typereg::Writer & rBlob, sal_uInt16 index); + bool dumpBlob(typereg::Writer & rBlob, sal_uInt16 index); // scope management virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl); diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx index 2cca3ca2b2d4..1898b467fcc4 100644 --- a/idlc/inc/idlc/astservice.hxx +++ b/idlc/inc/idlc/astservice.hxx @@ -40,7 +40,7 @@ public: {} virtual ~AstService() {} - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); void setSingleInterfaceBasedService() { m_singleInterfaceBasedService = true; } diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx index 8bed1770040f..07f364474a8b 100644 --- a/idlc/inc/idlc/astservicemember.hxx +++ b/idlc/inc/idlc/astservicemember.hxx @@ -34,7 +34,7 @@ public: AstService* getRealService() { return m_pRealService; } - sal_Bool isOptional() + bool isOptional() { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); } private: const sal_uInt32 m_flags; diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx index e13229c66568..61abf0382da8 100644 --- a/idlc/inc/idlc/aststruct.hxx +++ b/idlc/inc/idlc/aststruct.hxx @@ -51,7 +51,7 @@ public: virtual bool isType() const; - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); private: AstStruct const* m_pBaseType; DeclList m_typeParameters; diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx index 2e1f4cd0c257..a5266ba018cc 100644 --- a/idlc/inc/idlc/asttypedef.hxx +++ b/idlc/inc/idlc/asttypedef.hxx @@ -36,7 +36,7 @@ public: virtual bool isUnsigned() const { return m_pBaseType != 0 && m_pBaseType->isUnsigned(); } - virtual sal_Bool dump(RegistryKey& rKey); + virtual bool dump(RegistryKey& rKey); private: AstType const * m_pBaseType; }; diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx index f93341a4bd62..3c3bd65a4141 100644 --- a/idlc/inc/idlc/fehelper.hxx +++ b/idlc/inc/idlc/fehelper.hxx @@ -44,7 +44,7 @@ public: DeclaratorType getDeclType() { return m_declType; } - sal_Bool checkType(AstDeclaration const * pType); + bool checkType(AstDeclaration const * pType); AstType const * compose(AstDeclaration const * pDecl); private: AstDeclaration* m_pComplexPart; diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx index 452cd913294e..4602ccbfff08 100644 --- a/idlc/inc/idlc/idlc.hxx +++ b/idlc/inc/idlc/idlc.hxx @@ -70,18 +70,18 @@ public: { m_realFileName = realFileName; } const OString& getDocumentation() { - m_bIsDocValid = sal_False; + m_bIsDocValid = false; return m_documentation; } void setDocumentation(const OString& documentation) { m_documentation = documentation; - m_bIsDocValid = sal_True; + m_bIsDocValid = true; } OUString processDocumentation(); - sal_Bool isInMainFile() + bool isInMainFile() { return m_bIsInMainfile; } - void setInMainfile(sal_Bool bInMainfile) + void setInMainfile(bool bInMainfile) { m_bIsInMainfile = bInMainfile; } sal_uInt32 getErrorCount() { return m_errorCount; } @@ -130,9 +130,9 @@ private: OString m_mainFileName; OString m_realFileName; OString m_documentation; - sal_Bool m_bIsDocValid; - sal_Bool m_bGenerateDoc; - sal_Bool m_bIsInMainfile; + bool m_bIsDocValid; + bool m_bGenerateDoc; + bool m_bIsInMainfile; bool m_published; sal_uInt32 m_errorCount; sal_uInt32 m_warningCount; @@ -153,10 +153,10 @@ sal_Int32 produceFile(const OString& filenameBase, void removeIfExists(const OString& pathname); OString makeTempName(const OString& prefix, const OString& postfix); -sal_Bool copyFile(const OString* source, const OString& target); +bool copyFile(const OString* source, const OString& target); // a null source means stdin -sal_Bool isFileUrl(const OString& fileName); +bool isFileUrl(const OString& fileName); OString convertToAbsoluteSystemPath(const OString& fileName); OString convertToFileUrl(const OString& fileName); diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx index fcda52100538..33e7a68b3900 100644 --- a/idlc/inc/idlc/idlctypes.hxx +++ b/idlc/inc/idlc/idlctypes.hxx @@ -32,7 +32,7 @@ struct EqualString { - sal_Bool operator()(const OString& str1, const OString& str2) const + bool operator()(const OString& str1, const OString& str2) const { return (str1 == str2); } @@ -48,7 +48,7 @@ struct HashString struct LessString { - sal_Bool operator()(const OString& str1, const OString& str2) const + bool operator()(const OString& str1, const OString& str2) const { return (str1 < str2); } |