diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:11:00 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-21 13:16:53 +0100 |
commit | 70e36068a43cb6747232441ee67e609c86362aa0 (patch) | |
tree | ca05d17c538d3230ff904296fbb7625b2d7d5660 /sal/qa | |
parent | e8e093f14b698fc710930b2dead57c7d4fb63b8e (diff) |
tdf#123936 Formatting files in module sal with clang-format
Change-Id: I04a773e8fd565f57dc0eb887fb4714b6edbb35e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105699
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'sal/qa')
-rw-r--r-- | sal/qa/inc/stringhelper.hxx | 4 | ||||
-rw-r--r-- | sal/qa/osl/condition/osl_Condition_Const.h | 2 | ||||
-rw-r--r-- | sal/qa/osl/module/osl_Module_DLL.cxx | 5 | ||||
-rw-r--r-- | sal/qa/osl/security/osl_Security_Const.h | 4 | ||||
-rw-r--r-- | sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx | 11 | ||||
-rw-r--r-- | sal/qa/rtl/process/child_process_id.cxx | 18 | ||||
-rw-r--r-- | sal/qa/rtl/process/rtl_Process_Const.h | 3 |
7 files changed, 22 insertions, 25 deletions
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx index 5bce6ebbb7e9..24222b915c5b 100644 --- a/sal/qa/inc/stringhelper.hxx +++ b/sal/qa/inc/stringhelper.hxx @@ -23,9 +23,9 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> -inline void operator <<= (OString& _rAsciiString, OUString const & _rUnicodeString) +inline void operator<<=(OString& _rAsciiString, OUString const& _rUnicodeString) { - _rAsciiString = OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US); + _rAsciiString = OUStringToOString(_rUnicodeString, RTL_TEXTENCODING_ASCII_US); } #endif diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index 6bcf9e73018d..89b26121ba88 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -38,7 +38,7 @@ // condition names -OUString aTestCon( "testcondition" ); +OUString aTestCon("testcondition"); const char pTestString[17] = "Sun Microsystems"; diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index b8d4885969cb..59f30b137a6f 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -27,9 +27,6 @@ // But we instantiate a test plugin to fake the build process. CPPUNIT_PLUGIN_IMPLEMENT(); -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc( sal_Bool ) -{ - return true; -} +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc(sal_Bool) { return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 58f578814693..8329962a3dfb 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H #define INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H -#if defined(_WIN32) // Windows +#if defined(_WIN32) // Windows #include <io.h> #endif @@ -32,7 +32,7 @@ #include <stdlib.h> #include <stdio.h> -#if ( defined UNX ) +#if (defined UNX) #include <unistd.h> #include <pwd.h> #endif diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx index dc09f2a0da08..10f378c1acf9 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx @@ -16,11 +16,13 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -namespace { - -class Test: public CppUnit::TestFixture { +namespace +{ +class Test : public CppUnit::TestFixture +{ private: - void test() { + void test() + { OUStringBuffer b1; OUString s1("123456789012345"); b1 = s1; @@ -70,7 +72,6 @@ private: CPPUNIT_TEST(test); CPPUNIT_TEST_SUITE_END(); }; - } CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx index 17f330fa703f..077f5c668761 100644 --- a/sal/qa/rtl/process/child_process_id.cxx +++ b/sal/qa/rtl/process/child_process_id.cxx @@ -22,20 +22,20 @@ #include <rtl/process.h> #include <rtl_Process_Const.h> -void printUuid( sal_uInt8 *pNode ) +void printUuid(sal_uInt8* pNode) { - for( sal_Int32 i1 = 0 ; i1 < 4 ; i1++ ) + for (sal_Int32 i1 = 0; i1 < 4; i1++) { - for( sal_Int32 i2 = 0 ; i2 < 4 ; i2++ ) + for (sal_Int32 i2 = 0; i2 < 4; i2++) { - sal_uInt8 nValue = pNode[i1*4 +i2]; + sal_uInt8 nValue = pNode[i1 * 4 + i2]; if (nValue < 16) { - printf( "0"); + printf("0"); } - printf( "%02x" ,nValue ); + printf("%02x", nValue); } - if( i1 == 3 ) + if (i1 == 3) break; //printf( "-" ); } @@ -46,8 +46,8 @@ void printUuid( sal_uInt8 *pNode ) SAL_IMPLEMENT_MAIN() { sal_uInt8 pTargetUUID[16]; - rtl_getGlobalProcessId( pTargetUUID ); - printUuid( pTargetUUID ); + rtl_getGlobalProcessId(pTargetUUID); + printUuid(pTargetUUID); return 1; } diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h index 50c38eb97e6a..aab40ff9a86f 100644 --- a/sal/qa/rtl/process/rtl_Process_Const.h +++ b/sal/qa/rtl/process/rtl_Process_Const.h @@ -23,8 +23,7 @@ #include <rtl/ustring.hxx> #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif OUString suParam0("-join"); |