summaryrefslogtreecommitdiff
path: root/idlc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-15 15:24:27 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-17 17:55:17 +0100
commit361774e9107aac3f412ce546892a4b0e55c10dfb (patch)
tree4558fb6362cd1767c0a5ca00a80584171f7106b8 /idlc
parent20726ae6644236481cd15e2156935ba842cf88fd (diff)
idlc: sal_Bool -> bool
Change-Id: Ibeed903d73eb8b3fce7b8c6021c9107437a8c813
Diffstat (limited to 'idlc')
-rw-r--r--idlc/inc/idlc/astattribute.hxx24
-rw-r--r--idlc/inc/idlc/astconstant.hxx2
-rw-r--r--idlc/inc/idlc/astdeclaration.hxx22
-rw-r--r--idlc/inc/idlc/astenum.hxx2
-rw-r--r--idlc/inc/idlc/astexpression.hxx6
-rw-r--r--idlc/inc/idlc/astinterface.hxx18
-rw-r--r--idlc/inc/idlc/astinterfacemember.hxx2
-rw-r--r--idlc/inc/idlc/astmodule.hxx2
-rw-r--r--idlc/inc/idlc/astoperation.hxx2
-rw-r--r--idlc/inc/idlc/astservice.hxx2
-rw-r--r--idlc/inc/idlc/astservicemember.hxx2
-rw-r--r--idlc/inc/idlc/aststruct.hxx2
-rw-r--r--idlc/inc/idlc/asttypedef.hxx2
-rw-r--r--idlc/inc/idlc/fehelper.hxx2
-rw-r--r--idlc/inc/idlc/idlc.hxx18
-rw-r--r--idlc/inc/idlc/idlctypes.hxx4
-rw-r--r--idlc/source/astconstant.cxx6
-rw-r--r--idlc/source/astdeclaration.cxx22
-rw-r--r--idlc/source/astdump.cxx22
-rw-r--r--idlc/source/astenum.cxx8
-rw-r--r--idlc/source/astexpression.cxx10
-rw-r--r--idlc/source/astinterface.cxx12
-rw-r--r--idlc/source/astoperation.cxx4
-rw-r--r--idlc/source/astscope.cxx4
-rw-r--r--idlc/source/aststruct.cxx8
-rw-r--r--idlc/source/fehelper.cxx6
-rw-r--r--idlc/source/idlc.cxx8
-rw-r--r--idlc/source/idlccompile.cxx18
-rw-r--r--idlc/source/idlcproduce.cxx14
-rw-r--r--idlc/source/scanner.l2
30 files changed, 128 insertions, 128 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);
}
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index dae0e2d414c3..e72a28f7b27e 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -50,7 +50,7 @@ AstConstant::~AstConstant()
}
-sal_Bool AstConstant::dumpBlob(
+bool AstConstant::dumpBlob(
typereg::Writer & rBlob, sal_uInt16 index, bool published)
{
RTConstValue aConst;
@@ -102,7 +102,7 @@ sal_Bool AstConstant::dumpBlob(
{
fprintf(stderr, "%s: exprtype to const type: cannot convert ExprType\n",
idlc()->getOptions()->getProgramName().getStr());
- return sal_False;
+ return false;
}
}
@@ -119,7 +119,7 @@ sal_Bool AstConstant::dumpBlob(
RT_ACCESS_CONST | (published ? RT_ACCESS_PUBLISHED : 0),
OStringToOUString(name, RTL_TEXTENCODING_UTF8), type, aConst);
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index e8df3a6d5550..60f862639d8c 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -45,9 +45,9 @@ AstDeclaration::AstDeclaration(NodeType type, const OString& name, AstScope* pSc
: m_localName(name)
, m_pScope(pScope)
, m_nodeType(type)
- , m_bImported(sal_False)
- , m_bIsAdded(sal_False)
- , m_bInMainFile(sal_False)
+ , m_bImported(false)
+ , m_bIsAdded(false)
+ , m_bInMainFile(false)
, m_bPredefined(false)
{
if ( m_pScope )
@@ -69,11 +69,11 @@ AstDeclaration::AstDeclaration(NodeType type, const OString& name, AstScope* pSc
if ( idlc()->getFileName() == idlc()->getRealFileName() )
{
m_fileName = idlc()->getMainFileName();
- m_bInMainFile = sal_True;
+ m_bInMainFile = true;
} else
{
m_fileName = idlc()->getFileName();
- m_bImported = sal_True;
+ m_bImported = true;
}
m_documentation = idlc()->processDocumentation();
@@ -93,7 +93,7 @@ void AstDeclaration::setPredefined(bool bPredefined)
if ( m_bPredefined )
{
m_fileName = OString();
- m_bInMainFile = sal_False;
+ m_bInMainFile = false;
}
}
@@ -147,19 +147,19 @@ bool AstDeclaration::isType() const {
}
}
-sal_Bool AstDeclaration::hasAncestor(AstDeclaration* pDecl)
+bool AstDeclaration::hasAncestor(AstDeclaration* pDecl)
{
if (this == pDecl)
- return sal_True;
+ return true;
if ( !m_pScope )
- return sal_False;
+ return false;
return scopeAsDecl(m_pScope)->hasAncestor(pDecl);
}
-sal_Bool AstDeclaration::dump(RegistryKey& rKey)
+bool AstDeclaration::dump(RegistryKey& rKey)
{
AstScope* pScope = declAsScope(this);
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if ( pScope )
{
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 492714c2231e..56136eafb22b 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -34,7 +34,7 @@
using namespace ::rtl;
-sal_Bool AstModule::dump(RegistryKey& rKey)
+bool AstModule::dump(RegistryKey& rKey)
{
OUString emptyStr;
RegistryKey localKey;
@@ -48,7 +48,7 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
}
@@ -93,7 +93,7 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
} else
{
@@ -118,7 +118,7 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
}
}
@@ -129,7 +129,7 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
return AstDeclaration::dump(rKey);
}
-sal_Bool AstTypeDef::dump(RegistryKey& rKey)
+bool AstTypeDef::dump(RegistryKey& rKey)
{
OUString emptyStr;
RegistryKey localKey;
@@ -138,7 +138,7 @@ sal_Bool AstTypeDef::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
typereg::Writer aBlob(
@@ -158,13 +158,13 @@ sal_Bool AstTypeDef::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool AstService::dump(RegistryKey& rKey)
+bool AstService::dump(RegistryKey& rKey)
{
OUString emptyStr;
typereg_Version version = m_bPublished
@@ -324,7 +324,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
return true;
}
-sal_Bool AstAttribute::dumpBlob(
+bool AstAttribute::dumpBlob(
typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex)
{
RTFieldAccess accessMode = RT_ACCESS_INVALID;
@@ -381,7 +381,7 @@ sal_Bool AstAttribute::dumpBlob(
rBlob, m_setDocumentation, m_setExceptions, RT_MODE_ATTRIBUTE_SET,
methodIndex);
- return sal_True;
+ return true;
}
void AstAttribute::dumpExceptions(
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index 2edfb7cb9c49..8b95dc2e9c82 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -59,7 +59,7 @@ AstConstant* AstEnum::checkValue(AstExpression* pExpr)
return NULL;
}
-sal_Bool AstEnum::dump(RegistryKey& rKey)
+bool AstEnum::dump(RegistryKey& rKey)
{
RegistryKey localKey;
if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
@@ -67,7 +67,7 @@ sal_Bool AstEnum::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
OUString emptyStr;
@@ -102,11 +102,11 @@ sal_Bool AstEnum::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
AstDeclaration* AstEnum::addDeclaration(AstDeclaration* pDecl)
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 8839e4c3b961..1f22e9ce9473 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -707,7 +707,7 @@ eval_kind(AstExprValue *ev, EvalKind ek)
return NULL;
}
-AstExprValue* AstExpression::coerce(ExprType t, sal_Bool bAssign)
+AstExprValue* AstExpression::coerce(ExprType t, bool bAssign)
{
AstExprValue *copy;
@@ -785,9 +785,9 @@ void AstExpression::evaluate(EvalKind ek)
m_exprValue = eval_kind(m_exprValue, ek);
}
-sal_Bool AstExpression::operator==(AstExpression *pExpr)
+bool AstExpression::operator==(AstExpression *pExpr)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if (m_combOperator != pExpr->getCombOperator())
return bRet;
evaluate(EK_const);
@@ -830,14 +830,14 @@ sal_Bool AstExpression::operator==(AstExpression *pExpr)
break;
default:
OSL_ASSERT(false);
- bRet = sal_False;
+ bRet = false;
break;
}
return bRet;
}
-sal_Bool AstExpression::compare(AstExpression *pExpr)
+bool AstExpression::compare(AstExpression *pExpr)
{
bool bRet = false;
if (m_combOperator != pExpr->getCombOperator())
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 7d9f0dc1d515..20349ae22d65 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -34,8 +34,8 @@ AstInterface::AstInterface(const OString& name,
, AstScope(NT_interface)
, m_mandatoryInterfaces(0)
, m_bIsDefined(false)
- , m_bForwarded(sal_False)
- , m_bForwardedInSameFile(sal_False)
+ , m_bForwarded(false)
+ , m_bForwardedInSameFile(false)
, m_bSingleInheritance(pInherits != 0)
{
if (pInherits != 0) {
@@ -99,10 +99,10 @@ void AstInterface::forwardDefined(AstInterface const & def)
m_bIsDefined = true;
}
-sal_Bool AstInterface::dump(RegistryKey& rKey)
+bool AstInterface::dump(RegistryKey& rKey)
{
if ( !isDefined() )
- return sal_True;
+ return true;
RegistryKey localKey;
if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
@@ -110,7 +110,7 @@ sal_Bool AstInterface::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
if (m_mandatoryInterfaces > SAL_MAX_UINT16
@@ -250,7 +250,7 @@ sal_Bool AstInterface::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
return true;
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index 7a80f42b0cb6..3ee0bb973e49 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -40,7 +40,7 @@ bool AstOperation::isVariadic() const {
&& static_cast< AstParameter const * >(*(--i))->isRest();
}
-sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
+bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
{
sal_uInt16 nParam = getNodeCount(NT_parameter);
sal_uInt16 nExcep = nExceptions();
@@ -118,7 +118,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
}
}
- return sal_True;
+ return true;
}
AstDeclaration* AstOperation::addDeclaration(AstDeclaration* pDecl)
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index b127cf936c06..cc0812664181 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -134,11 +134,11 @@ AstDeclaration* AstScope::lookupByName(const OString& scopedName)
// Look up in the local scope and start with the first scope
sal_Int32 nIndex = scopedName.indexOf(':');
OString firstScope = nIndex > 0 ? scopedName.copy(0, nIndex) : scopedName;
- sal_Bool bFindFirstScope = sal_True;
+ bool bFindFirstScope = true;
pDecl = lookupByNameLocal(firstScope);
if ( !pDecl )
{
- bFindFirstScope = sal_False;
+ bFindFirstScope = false;
// OK, not found. Go down parent scope chain
pDecl = scopeAsDecl(this);
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index d60026a22b24..3938d4de0036 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -77,7 +77,7 @@ bool AstStruct::isType() const {
? getTypeParameterCount() == 0 : AstDeclaration::isType();
}
-sal_Bool AstStruct::dump(RegistryKey& rKey)
+bool AstStruct::dump(RegistryKey& rKey)
{
RegistryKey localKey;
if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
@@ -85,7 +85,7 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
if (m_typeParameters.size() > SAL_MAX_UINT16) {
@@ -170,10 +170,10 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 053473a2deb4..12636e1ef6a6 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -34,7 +34,7 @@ FeDeclarator::~FeDeclarator()
{
}
-sal_Bool FeDeclarator::checkType(AstDeclaration const * type)
+bool FeDeclarator::checkType(AstDeclaration const * type)
{
OString tmp(m_name);
sal_Int32 count = m_name.lastIndexOf( ':' );
@@ -42,9 +42,9 @@ sal_Bool FeDeclarator::checkType(AstDeclaration const * type)
tmp = m_name.copy( count+1 );
if (tmp == type->getLocalName())
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index 363815709e6a..bf7594eee467 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -199,8 +199,8 @@ static void SAL_CALL initializePredefinedTypes(AstModule* pRoot)
Idlc::Idlc(Options* pOptions)
: m_pOptions(pOptions)
- , m_bIsDocValid(sal_False)
- , m_bIsInMainfile(sal_True)
+ , m_bIsDocValid(false)
+ , m_bIsInMainfile(true)
, m_published(false)
, m_errorCount(0)
, m_warningCount(0)
@@ -241,8 +241,8 @@ void Idlc::init()
void Idlc::reset()
{
- m_bIsDocValid = sal_False;
- m_bIsInMainfile = sal_True;
+ m_bIsDocValid = false;
+ m_bIsInMainfile = true;
m_published = false;
m_errorCount = 0;
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 2bd544d2fe25..bbd080f550ca 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -58,11 +58,11 @@ static OUString TMP("TMP");
static OUString TEMP("TEMP");
static sal_Char tmpFilePattern[512];
-sal_Bool isFileUrl(const OString& fileName)
+bool isFileUrl(const OString& fileName)
{
if (fileName.startsWith("file://") )
- return sal_True;
- return sal_False;
+ return true;
+ return false;
}
OString convertToAbsoluteSystemPath(const OString& fileName)
@@ -174,19 +174,19 @@ OString makeTempName(const OString& prefix)
return OString(tmpFilePattern);
}
-sal_Bool copyFile(const OString* source, const OString& target)
+bool copyFile(const OString* source, const OString& target)
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
FILE* pSource = source == 0 ? stdin : fopen(source->getStr(), "rb");
if ( !pSource )
- return sal_False;
+ return false;
FILE* pTarget = fopen(target.getStr(), "wb");
if ( !pTarget )
{
fclose(pSource);
- return sal_False;
+ return false;
}
size_t totalSize = 512;
@@ -203,7 +203,7 @@ sal_Bool copyFile(const OString* source, const OString& target)
fclose(pSource);
}
fclose(pTarget);
- return sal_False;
+ return false;
}
}
}
@@ -212,7 +212,7 @@ sal_Bool copyFile(const OString* source, const OString& target)
fclose(pSource);
}
if ( fflush(pTarget) )
- bRet = sal_False;
+ bRet = false;
fclose(pTarget);
return bRet;
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index 5eaacbe0c6b1..cfc093c4227f 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -42,13 +42,13 @@ using namespace ::osl;
StringList* pCreatedDirectories = NULL;
-static sal_Bool checkOutputPath(const OString& completeName)
+static bool checkOutputPath(const OString& completeName)
{
OString sysPathName = convertToAbsoluteSystemPath(completeName);
OStringBuffer buffer(sysPathName.getLength());
if ( sysPathName.indexOf( SEPARATOR ) == -1 )
- return sal_True;
+ return true;
sal_Int32 nIndex = 0;
OString token(sysPathName.getToken(0, SEPARATOR, nIndex));
@@ -79,7 +79,7 @@ static sal_Bool checkOutputPath(const OString& completeName)
{
fprintf(stderr, "%s: cannot create directory '%s'\n",
idlc()->getOptions()->getProgramName().getStr(), buffer.getStr());
- return sal_False;
+ return false;
}
} else
{
@@ -90,10 +90,10 @@ static sal_Bool checkOutputPath(const OString& completeName)
}
buffer.append(SEPARATOR);
} while( nIndex != -1 );
- return sal_True;
+ return true;
}
-static sal_Bool cleanPath()
+static bool cleanPath()
{
if ( pCreatedDirectories )
{
@@ -109,13 +109,13 @@ static sal_Bool cleanPath()
{
fprintf(stderr, "%s: cannot remove directory '%s'\n",
idlc()->getOptions()->getProgramName().getStr(), (*iter).getStr());
- return sal_False;
+ return false;
}
++iter;
}
delete pCreatedDirectories;
}
- return sal_True;
+ return true;
}
void removeIfExists(const OString& pathname)
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index f904fb66b839..aca443f4ccdb 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -205,7 +205,7 @@ static void parseLineAndFile(sal_Char* pBuf)
{
sal_Char *r = pBuf;
sal_Char *h;
- sal_Bool bIsInMain = sal_False;
+ bool bIsInMain = sal_False;
/* Skip initial '#' */
if (*r != '#')