sal_Char->char in idlc..linguistic

Change-Id: Ib30fe34123ad7e5d892e8db9c742e08c4ca8fcd2
Reviewed-on: https://gerrit.libreoffice.org/85477
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 21 insertions, 21 deletions

diff --git a/idlc/inc/astdeclaration.hxx b/idlc/inc/astdeclaration.hxx
index aca098d16bbd..ce8f9740a745 100644
--- a/idlc/inc/astdeclaration.hxx
+++ b/idlc/inc/astdeclaration.hxx
@@ -70,7 +70,7 @@ public:
         { return m_scopedName; }
     const OString&   getFullName() const
         { return m_fullName; }
-    virtual const sal_Char* getRelativName() const
+    virtual const char* getRelativName() const
         { return m_fullName.getStr()+1; }
     AstScope* getScope()
         { return m_pScope; }
diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx
index ae96dff602ea..b146e9c85a07 100644
--- a/idlc/inc/astexpression.hxx
+++ b/idlc/inc/astexpression.hxx
@@ -85,7 +85,7 @@ struct AstExprValue
     ExprType et;
 };
 
-const sal_Char* exprTypeToString(ExprType t);
+const char* exprTypeToString(ExprType t);
 
 class AstExpression final
 {
diff --git a/idlc/inc/astsequence.hxx b/idlc/inc/astsequence.hxx
index 0a8efc77b4f8..6c2143267532 100644
--- a/idlc/inc/astsequence.hxx
+++ b/idlc/inc/astsequence.hxx
@@ -35,7 +35,7 @@ public:
     virtual bool isUnsigned() const override
     { return m_pMemberType != nullptr && m_pMemberType->isUnsigned(); }
 
-    virtual const sal_Char* getRelativName() const override;
+    virtual const char* getRelativName() const override;
 private:
     AstType const * m_pMemberType;
     mutable o3tl::optional<OString> m_xRelativName;
diff --git a/idlc/inc/errorhandler.hxx b/idlc/inc/errorhandler.hxx
index 6a26497f042b..9b49f5df441a 100644
--- a/idlc/inc/errorhandler.hxx
+++ b/idlc/inc/errorhandler.hxx
@@ -83,10 +83,10 @@ public:
     static void error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2, AstDeclaration const * d3);
 
     // Warning
-    static void warning0(WarningCode e, const sal_Char* warningmsg);
+    static void warning0(WarningCode e, const char* warningmsg);
 
     // Report a syntax error in IDL input
-    static void syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg);
+    static void syntaxError(ParseState state, sal_Int32 lineNumber, const char* errmsg);
 
     // Report an unsuccessful coercion attempt
     static void coercionError(AstExpression *pExpr, ExprType et);
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 6038c4af7997..081671615912 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -404,7 +404,7 @@ void AstAttribute::dumpExceptions(
     }
 }
 
-const sal_Char* AstSequence::getRelativName() const
+const char* AstSequence::getRelativName() const
 {
     if ( !m_xRelativName )
     {
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index f9b0f08f0534..cd5a21656ff6 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -1277,7 +1277,7 @@ OString AstExpression::toString()
 }
 
 // Convert the type of an AST_Expression to a char *
-const sal_Char* exprTypeToString(ExprType t)
+const char* exprTypeToString(ExprType t)
 {
     switch (t)
     {
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index b31340ef5ee8..6d2d92ea35e5 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -20,7 +20,7 @@
 #include <errorhandler.hxx>
 #include <astinterface.hxx>
 
-static const sal_Char* errorCodeToMessage(ErrorCode eCode)
+static const char* errorCodeToMessage(ErrorCode eCode)
 {
     switch (eCode)
     {
@@ -121,7 +121,7 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
     return "unknown error";
 }
 
-static const sal_Char* warningCodeToMessage(WarningCode wCode)
+static const char* warningCodeToMessage(WarningCode wCode)
 {
     switch (wCode)
     {
@@ -131,7 +131,7 @@ static const sal_Char* warningCodeToMessage(WarningCode wCode)
     return "unknown warning";
 }
 
-static const sal_Char* parseStateToMessage(ParseState state)
+static const char* parseStateToMessage(ParseState state)
 {
     switch (state)
     {
@@ -452,7 +452,7 @@ void ErrorHandler::error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration
     idlc()->incErrorCount();
 }
 
-void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg)
+void ErrorHandler::warning0(WarningCode w, const char* warningmsg)
 {
     if ( idlc()->getOptions()->isValid("-w") || idlc()->getOptions()->isValid("-we") ) {
         warningHeader(w);
@@ -465,7 +465,7 @@ void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg)
         idlc()->incWarningCount();
 }
 
-void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const sal_Char* errmsg)
+void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const char* errmsg)
 {
     errorHeader(ErrorCode::SyntaxError, lineNumber);
     fprintf(stderr, "%s: %s\n", parseStateToMessage(ps), errmsg);
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 8d3897890e0f..1cb84cc9fe8b 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -49,7 +49,7 @@ extern int yyparse();
 extern FILE* yyin;
 extern int yydebug;
 
-static sal_Char tmpFilePattern[512];
+static char tmpFilePattern[512];
 
 bool isFileUrl(const OString& fileName)
 {
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index 9c055d920a33..40e82ef85216 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -213,7 +213,7 @@ static bool includes(AstDeclaration const * type1, AstDeclaration const * type2)
     FeInheritanceHeader*    ihval;      /* inheritance header value */
     OString*     sval;       /* OString value */
     std::vector< OString > * svals;
-    sal_Char*           strval; /* sal_Char* value */
+    char*               strval; /* char* value */
     bool                bval;       /* sal_Boolean* value */
     sal_Int64               ival;       /* sal_Int64 value */
     sal_uInt64 uval; /* sal_uInt64 value */
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 37b2bbff0829..660e01588960 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -146,7 +146,7 @@ static int asciiToInteger(char const * s, sal_Int64  * sval, sal_uInt64 * uval)
     }
 }
 
-static double asciiToFloat(const sal_Char *s)
+static double asciiToFloat(const char *s)
 {
     double      d = 0.0;
     double      e, k;
@@ -201,21 +201,21 @@ static double asciiToFloat(const sal_Char *s)
     return d;
 }
 
-static void idlParsePragma(sal_Char* pPragma)
+static void idlParsePragma(char* pPragma)
 {
     OString pragma(pPragma);
     sal_Int32 index = pragma.indexOf("include");
-    sal_Char* begin = pPragma + index + 8;
-    sal_Char* offset = begin;
+    char* begin = pPragma + index + 8;
+    char* offset = begin;
     while (*offset != ',') offset++;
     //OString include = pragma.copy(index + 8, offset - begin);
     //unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin)));
 }   
 
-static void parseLineAndFile(sal_Char* pBuf)
+static void parseLineAndFile(char* pBuf)
 {
-    sal_Char    *r = pBuf;
-    sal_Char    *h;
+    char    *r = pBuf;
+    char    *h;
     bool    bIsInMain = false;
 
     /* Skip initial '#' */