diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 12:02:07 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 20:37:44 +0100 |
commit | feb5df31d4c27d53746d0bb25b5ff06c466d9db7 (patch) | |
tree | 1a1be1b8948c87508ffc9f2512a208f70445a730 /include/comphelper | |
parent | 4ea1f7363d68296219f371076a93d3e480289368 (diff) |
sal_Char->char in comphelper
Change-Id: I63488463f2255a013cb80a9318d22207cb0ed532
Reviewed-on: https://gerrit.libreoffice.org/85395
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/comphelper')
-rw-r--r-- | include/comphelper/componentmodule.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/logging.hxx | 44 | ||||
-rw-r--r-- | include/comphelper/namedvaluecollection.hxx | 14 | ||||
-rw-r--r-- | include/comphelper/servicedecl.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/string.hxx | 10 |
5 files changed, 37 insertions, 37 deletions
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 277d0d483edf..cfffcb39b844 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -120,7 +120,7 @@ namespace comphelper /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call */ - void* getComponentFactory( const sal_Char* _pImplementationName ); + void* getComponentFactory( const char* _pImplementationName ); private: OModule( const OModule& ) = delete; diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index 1fa7601519db..7719e86da201 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -45,7 +45,7 @@ namespace comphelper return _rValue; } - inline OUString convertLogArgToString( const sal_Char* _pAsciiValue ) + inline OUString convertLogArgToString( const char* _pAsciiValue ) { return OUString::createFromAscii( _pAsciiValue ); } @@ -106,7 +106,7 @@ namespace comphelper */ EventLogger( const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const sal_Char* _pAsciiLoggerName + const char* _pAsciiLoggerName ); public: @@ -213,7 +213,7 @@ namespace comphelper is searched in the message string, and replaced with the argument string. */ template< typename ARGTYPE1 > - void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const + void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), @@ -222,7 +222,7 @@ namespace comphelper /// logs a given message, replacing 2 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2 > - void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const + void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), @@ -232,7 +232,7 @@ namespace comphelper /// logs a given message, replacing 3 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > - void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const + void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), @@ -243,7 +243,7 @@ namespace comphelper /// logs a given message, replacing 4 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > - void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const + void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), @@ -255,7 +255,7 @@ namespace comphelper /// logs a given message, replacing 5 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > - void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const + void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), @@ -268,7 +268,7 @@ namespace comphelper /// logs a given message, replacing 6 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > - void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const + void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), @@ -292,7 +292,7 @@ namespace comphelper is searched in the message string, and replaced with the argument string. */ template< typename ARGTYPE1 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -301,7 +301,7 @@ namespace comphelper /// logs a given message, replacing 2 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -311,7 +311,7 @@ namespace comphelper /// logs a given message, replacing 3 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -322,7 +322,7 @@ namespace comphelper /// logs a given message, replacing 4 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -334,7 +334,7 @@ namespace comphelper /// logs a given message, replacing 5 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -347,7 +347,7 @@ namespace comphelper /// logs a given message, replacing 6 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -371,7 +371,7 @@ namespace comphelper is searched in the message string, and replaced with the argument string. */ template< typename ARGTYPE1 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), @@ -380,7 +380,7 @@ namespace comphelper /// logs a given ASCII message, replacing 2 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), @@ -390,7 +390,7 @@ namespace comphelper /// logs a given ASCII message, replacing 3 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), @@ -401,7 +401,7 @@ namespace comphelper /// logs a given ASCII message, replacing 4 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), @@ -413,7 +413,7 @@ namespace comphelper /// logs a given ASCII message, replacing 5 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), @@ -426,7 +426,7 @@ namespace comphelper /// logs a given ASCII message, replacing 6 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > - void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const + void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), @@ -441,8 +441,8 @@ namespace comphelper protected: void impl_log( const sal_Int32 _nLogLevel, - const sal_Char* _pSourceClass, - const sal_Char* _pSourceMethod, + const char* _pSourceClass, + const char* _pSourceMethod, const OUString& _rMessage, const OptionalString& _rArgument1 = OptionalString(), const OptionalString& _rArgument2 = OptionalString(), diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index b6986b13033b..3fc2ed301b6c 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -146,7 +146,7 @@ namespace comphelper _out_rValue. */ template < typename VALUE_TYPE > - bool get_ensureType( const sal_Char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const + bool get_ensureType( const char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const { return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); } @@ -161,7 +161,7 @@ namespace comphelper in the collection */ template < typename VALUE_TYPE > - VALUE_TYPE getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const + VALUE_TYPE getOrDefault( const char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const { return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault ); } @@ -179,7 +179,7 @@ namespace comphelper If the collection does not contain a value with the given name, an empty Any is returned. */ - const css::uno::Any& get( const sal_Char* _pAsciiValueName ) const + const css::uno::Any& get( const char* _pAsciiValueName ) const { return get( OUString::createFromAscii( _pAsciiValueName ) ); } @@ -195,7 +195,7 @@ namespace comphelper } /// determines whether a value with a given name is present in the collection - bool has( const sal_Char* _pAsciiValueName ) const + bool has( const char* _pAsciiValueName ) const { return impl_has( OUString::createFromAscii( _pAsciiValueName ) ); } @@ -212,7 +212,7 @@ namespace comphelper which case it has been overwritten. */ template < typename VALUE_TYPE > - bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) + bool put( const char* _pAsciiValueName, const VALUE_TYPE& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) ); } @@ -228,7 +228,7 @@ namespace comphelper return impl_put( _rValueName, css::uno::makeAny( _rValue ) ); } - bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) + bool put( const char* _pAsciiValueName, const css::uno::Any& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue ); } @@ -242,7 +242,7 @@ namespace comphelper @return true if and only if a value with the given name existed in the collection. */ - bool remove( const sal_Char* _pAsciiValueName ) + bool remove( const char* _pAsciiValueName ) { return impl_remove( OUString::createFromAscii( _pAsciiValueName ) ); } diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx index 01c4d29c8992..8175b2f96ea0 100644 --- a/include/comphelper/servicedecl.hxx +++ b/include/comphelper/servicedecl.hxx @@ -114,7 +114,7 @@ public: m_pServiceNames(pSupportedServiceNames) {} /// @internal gets called by component_getFactoryHelper() - void * getFactory( sal_Char const* pImplName ) const; + void * getFactory( char const* pImplName ) const; /// @return supported service names css::uno::Sequence< OUString> getSupportedServiceNames() const; @@ -325,7 +325,7 @@ struct inheritingClass_ : public serviceimpl_base< detail::InheritingServiceImpl }; COMPHELPER_DLLPUBLIC -void* component_getFactoryHelper( const sal_Char* pImplName, +void* component_getFactoryHelper( const char* pImplName, std::initializer_list<ServiceDecl const *> args ); } // namespace service_decl diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx index 9f5738e5ba48..3f7ebf958512 100644 --- a/include/comphelper/string.hxx +++ b/include/comphelper/string.hxx @@ -81,7 +81,7 @@ inline OUStringBuffer& remove(OUStringBuffer &rIn, @return The resulting OString */ COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn, - sal_Char c); + char c); /** Strips occurrences of a character from the start of the source string @@ -101,7 +101,7 @@ COMPHELPER_DLLPUBLIC OUString stripStart(const OUString &rIn, @return The resulting OString */ COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn, - sal_Char c); + char c); /** Strips occurrences of a character from the end of the source string @@ -121,7 +121,7 @@ COMPHELPER_DLLPUBLIC OUString stripEnd(const OUString &rIn, @return The resulting OString */ COMPHELPER_DLLPUBLIC OString strip(const OString &rIn, - sal_Char c); + char c); /** Strips occurrences of a character from the start and end of the source string @@ -139,7 +139,7 @@ COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn, @param cTok the character which separate the tokens. @return the number of tokens */ -COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok); +COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, char cTok); /** Returns number of tokens in an OUString @@ -223,7 +223,7 @@ namespace detail */ inline OStringBuffer& padToLength( OStringBuffer& rBuffer, sal_Int32 nLength, - sal_Char cFill = '\0') + char cFill = '\0') { return detail::padToLength(rBuffer, nLength, cFill); } |