summaryrefslogtreecommitdiffstats
path: root/include/osl
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-09-11 22:05:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-09-12 13:36:42 +0200
commit04203a26757d26814a18c3251d1a97f6ded64a62 (patch)
tree80962f43d3b46e8670ad49068a1a6e8459c22f39 /include/osl
parentBreeze,Colibre,elementary,KJ,Sukapura: tdf#136593 icon for new Distribution u... (diff)
downloadcore-04203a26757d26814a18c3251d1a97f6ded64a62.tar.gz
core-04203a26757d26814a18c3251d1a97f6ded64a62.zip
Replace remaining uses of sal_Char
+ remove sal_Char check on compilerplugins Change-Id: I0f7da14e620f0c3d031d038aa8345ba4080fb3e9 Change-Id: Ia6dba4f27b47bc9e0c89159182ad80a5aee17166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102499 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/osl')
-rw-r--r--include/osl/module.h4
-rw-r--r--include/osl/profile.h30
-rw-r--r--include/osl/profile.hxx10
3 files changed, 22 insertions, 22 deletions
diff --git a/include/osl/module.h b/include/osl/module.h
index 563f3492c987..3d9a6cf1f2bd 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -81,7 +81,7 @@ SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_
@since UDK 3.6
*/
-SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nRtldMode);
+SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModuleAscii(const char *pModuleName, sal_Int32 nRtldMode);
/** Load a module located relative to some other module.
@@ -190,7 +190,7 @@ SAL_DLLPUBLIC oslGenericFunction SAL_CALL osl_getFunctionSymbol(
@see osl_getFunctionSymbol
*/
SAL_DLLPUBLIC oslGenericFunction SAL_CALL osl_getAsciiFunctionSymbol(
- oslModule Module, const sal_Char *pSymbol );
+ oslModule Module, const char *pSymbol );
/** Lookup URL of module which is mapped at the specified address.
diff --git a/include/osl/profile.h b/include/osl/profile.h
index fc553d545228..d8f6710cc85e 100644
--- a/include/osl/profile.h
+++ b/include/osl/profile.h
@@ -68,23 +68,23 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_flushProfile(
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_readProfileString(
oslProfile Profile,
- const sal_Char* pszSection, const sal_Char* pszEntry,
- sal_Char* pszString, sal_uInt32 MaxLen,
- const sal_Char* pszDefault) SAL_COLD;
+ const char* pszSection, const char* pszEntry,
+ char* pszString, sal_uInt32 MaxLen,
+ const char* pszDefault) SAL_COLD;
/** Deprecated API.
@deprecated
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_readProfileBool(
oslProfile Profile,
- const sal_Char* pszSection, const sal_Char* pszEntry,
+ const char* pszSection, const char* pszEntry,
sal_Bool Default) SAL_COLD;
/** Deprecated API.
@deprecated
*/
SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_readProfileIdent(
oslProfile Profile,
- const sal_Char* pszSection, const sal_Char* pszEntry,
- sal_uInt32 FirstId, const sal_Char* Strings[],
+ const char* pszSection, const char* pszEntry,
+ sal_uInt32 FirstId, const char* Strings[],
sal_uInt32 Default) SAL_COLD;
/** Deprecated API.
@@ -92,15 +92,15 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_readProfileIdent(
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_writeProfileString(
oslProfile Profile,
- const sal_Char* pszSection, const sal_Char* pszEntry,
- const sal_Char* pszString) SAL_COLD;
+ const char* pszSection, const char* pszEntry,
+ const char* pszString) SAL_COLD;
/** Deprecated API.
@deprecated
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_writeProfileBool(
oslProfile Profile,
- const sal_Char* pszSection, const sal_Char* pszEntry,
+ const char* pszSection, const char* pszEntry,
sal_Bool Value) SAL_COLD;
/** Deprecated API.
@@ -108,8 +108,8 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_writeProfileBool(
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_writeProfileIdent(
oslProfile Profile,
- const sal_Char* pszSection, const sal_Char* pszEntry,
- sal_uInt32 FirstId, const sal_Char* Strings[],
+ const char* pszSection, const char* pszEntry,
+ sal_uInt32 FirstId, const char* Strings[],
sal_uInt32 Value) SAL_COLD;
/** Deprecated API.
@@ -119,7 +119,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_writeProfileIdent(
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_removeProfileEntry(
oslProfile Profile,
- const sal_Char *pszSection, const sal_Char *pszEntry) SAL_COLD;
+ const char *pszSection, const char *pszEntry) SAL_COLD;
/** Deprecated API.
Get all entries belonging to the specified section.
@@ -127,8 +127,8 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_removeProfileEntry(
@deprecated
*/
SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSectionEntries(
- oslProfile Profile, const sal_Char *pszSection,
- sal_Char* pszBuffer, sal_uInt32 MaxLen) SAL_COLD;
+ oslProfile Profile, const char *pszSection,
+ char* pszBuffer, sal_uInt32 MaxLen) SAL_COLD;
/** Deprecated API.
Get all section entries
@@ -136,7 +136,7 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSectionEntries(
@deprecated
*/
SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSections(
- oslProfile Profile, sal_Char* pszBuffer, sal_uInt32 MaxLen) SAL_COLD;
+ oslProfile Profile, char* pszBuffer, sal_uInt32 MaxLen) SAL_COLD;
#ifdef __cplusplus
}
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index 0ce69a8aea3b..f8ead83d3dc0 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -70,7 +70,7 @@ namespace osl {
rtl::OString readString( const rtl::OString& rSection, const rtl::OString& rEntry,
const rtl::OString& rDefault)
{
- sal_Char aBuf[1024];
+ char aBuf[1024];
return osl_readProfileString( profile,
rSection.getStr(),
rEntry.getStr(),
@@ -90,7 +90,7 @@ namespace osl {
sal_uInt32 nDefault)
{
size_t nItems = rStrings.size();
- const sal_Char** pStrings = new const sal_Char*[ nItems+1 ];
+ const char** pStrings = new const char*[ nItems+1 ];
std::list< rtl::OString >::const_iterator it = rStrings.begin();
nItems = 0;
while( it != rStrings.end() )
@@ -120,7 +120,7 @@ namespace osl {
sal_uInt32 nValue)
{
size_t nItems = rStrings.size();
- const sal_Char** pStrings = new const sal_Char*[ nItems+1 ];
+ const char** pStrings = new const char*[ nItems+1 ];
std::list< rtl::OString >::const_iterator it = rStrings.begin();
nItems = 0;
while( it != rStrings.end() )
@@ -157,7 +157,7 @@ namespace osl {
size_t n = osl_getProfileSectionEntries( profile, rSection.getStr(), NULL, 0 );
if( n > 1 )
{
- sal_Char* pBuf = new sal_Char[ n+1 ];
+ char* pBuf = new char[ n+1 ];
osl_getProfileSectionEntries( profile, rSection.getStr(), pBuf, n+1 );
size_t nLen;
for( n = 0; ; n += nLen+1 )
@@ -184,7 +184,7 @@ namespace osl {
size_t n = osl_getProfileSections( profile, NULL, 0 );
if( n > 1 )
{
- sal_Char* pBuf = new sal_Char[ n+1 ];
+ char* pBuf = new char[ n+1 ];
osl_getProfileSections( profile, pBuf, n+1 );
size_t nLen;
for( n = 0; ; n += nLen+1 )