diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-02-16 14:44:52 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-02-16 14:10:39 +0100 |
commit | c691aed63451ba441d45d2feb90f7266e12366f4 (patch) | |
tree | 37879f918bf7a65b1237b517190cb01f4c8478f2 | |
parent | f99e765cb303e37e6b6c983d3ee040fa36c1e52c (diff) |
clang-format f*,h* with under 5-percent lines of change
Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i <path-of-the-file>
There will be follow-up patches to fix all 'under-5-percent' files.
Change-Id: I702c09bcd3a9a113b3d66c30edb6cf3b7e6a6593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88776
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
-rw-r--r-- | filter/qa/unit/filter-dialogs-test.cxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/boolexpression.hxx | 3 | ||||
-rw-r--r-- | formula/inc/core_resource.hxx | 2 | ||||
-rw-r--r-- | formula/qa/unit/formula-dialogs-test.cxx | 4 | ||||
-rw-r--r-- | fpicker/qa/unit/fpicker-dialogs-test.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/aqua/AquaFilePickerDelegate.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/aqua/NSURL_OOoAdditions.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaConstants.h | 3 | ||||
-rw-r--r-- | framework/source/accelerators/acceleratorcache.cxx | 6 | ||||
-rw-r--r-- | hwpfilter/source/fontmap.hxx | 2 | ||||
-rw-r--r-- | hwpfilter/source/grammar.hxx | 2 | ||||
-rw-r--r-- | hwpfilter/source/hwpeq.h | 2 | ||||
-rw-r--r-- | hwpfilter/source/lexer.hxx | 2 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 13 |
14 files changed, 17 insertions, 38 deletions
diff --git a/filter/qa/unit/filter-dialogs-test.cxx b/filter/qa/unit/filter-dialogs-test.cxx index 5bddb6ccefe0..d74f1dadc0ee 100644 --- a/filter/qa/unit/filter-dialogs-test.cxx +++ b/filter/qa/unit/filter-dialogs-test.cxx @@ -36,9 +36,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -FilterDialogsTest::FilterDialogsTest() -{ -} +FilterDialogsTest::FilterDialogsTest() {} void FilterDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx index cd5daa071cb9..ae3a0c120d77 100644 --- a/forms/source/xforms/boolexpression.hxx +++ b/forms/source/xforms/boolexpression.hxx @@ -24,7 +24,6 @@ namespace xforms { - /** BoolExpression represents a computed XPath expression that returns * a bool value and caches the results. * @@ -38,7 +37,7 @@ public: /// set the expression string /// (overridden for new definition of a simple expression) - void setExpression( const OUString& rExpression ); + void setExpression(const OUString& rExpression); }; } // namespace xforms diff --git a/formula/inc/core_resource.hxx b/formula/inc/core_resource.hxx index 8a8f49b77b0f..a1533f1b5186 100644 --- a/formula/inc/core_resource.hxx +++ b/formula/inc/core_resource.hxx @@ -22,6 +22,6 @@ #include <rtl/ustring.hxx> #include <formula/formuladllapi.h> -FORMULA_DLLPUBLIC OUString ForResId(const char *pId); +FORMULA_DLLPUBLIC OUString ForResId(const char* pId); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/qa/unit/formula-dialogs-test.cxx b/formula/qa/unit/formula-dialogs-test.cxx index 29262e53dac5..8f1f7e334a75 100644 --- a/formula/qa/unit/formula-dialogs-test.cxx +++ b/formula/qa/unit/formula-dialogs-test.cxx @@ -36,9 +36,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -FormulaDialogsTest::FormulaDialogsTest() -{ -} +FormulaDialogsTest::FormulaDialogsTest() {} void FormulaDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/fpicker/qa/unit/fpicker-dialogs-test.cxx b/fpicker/qa/unit/fpicker-dialogs-test.cxx index 7e83d2756674..8c8a78df00e5 100644 --- a/fpicker/qa/unit/fpicker-dialogs-test.cxx +++ b/fpicker/qa/unit/fpicker-dialogs-test.cxx @@ -36,9 +36,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -FpickerDialogsTest::FpickerDialogsTest() -{ -} +FpickerDialogsTest::FpickerDialogsTest() {} void FpickerDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx index 6ea35ec41d73..eb7e1ce402e6 100644 --- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx +++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx @@ -37,9 +37,9 @@ class FilterHelper; - (void)setFilterHelper:(FilterHelper*)filterHelper; -- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename; +- (BOOL)panel:(id)sender shouldShowFilename:(NSString*)filename; - (void)panelSelectionDidChange:(id)sender; -- (void)panel:(id)sender directoryDidChange:(NSString *)path; +- (void)panel:(id)sender directoryDidChange:(NSString*)path; - (void)filterSelectedAtIndex:(id)sender; - (void)autoextensionChanged:(id)sender; diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx index 5329e9261744..bf1c76bad93a 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx +++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx @@ -27,7 +27,7 @@ #include <rtl/ustring.hxx> @interface NSURL (OOoAdditions) -- (OUString) OUStringForInfo:(InfoType)info; +- (OUString)OUStringForInfo:(InfoType)info; @end /* @@ -35,7 +35,7 @@ if there was no alias, nil is returned */ -NSString* resolveAlias( NSString* i_pSystemPath ); +NSString* resolveAlias(NSString* i_pSystemPath); #endif diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h index 591525ba8601..f5f03f6f2114 100644 --- a/fpicker/source/aqua/SalAquaConstants.h +++ b/fpicker/source/aqua/SalAquaConstants.h @@ -42,7 +42,8 @@ #define kAquaSpacePopupMenuFrameBoundsDiffTop (2) #define kAquaSpacePopupMenuFrameBoundsDiffBottom (4) -#define kAquaSpacePopupMenuFrameBoundsDiffV (kAquaSpacePopupMenuFrameBoundsDiffTop + kAquaSpacePopupMenuFrameBoundsDiffBottom) +#define kAquaSpacePopupMenuFrameBoundsDiffV \ + (kAquaSpacePopupMenuFrameBoundsDiffTop + kAquaSpacePopupMenuFrameBoundsDiffBottom) #define kAquaSpacePopupMenuFrameBoundsDiffLeft (3) #define kAquaSpaceLabelFrameBoundsDiffH (3) diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 99350dda9f95..98596a895036 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -25,7 +25,6 @@ namespace framework { - bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const { SolarMutexGuard g; @@ -52,8 +51,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const return lKeys; } -void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , - const OUString& sCommand) +void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey, const OUString& sCommand) { SolarMutexGuard g; @@ -109,7 +107,7 @@ void AcceleratorCache::removeCommand(const OUString& sCommand) { SolarMutexGuard g; - const TKeyList& lKeys = getKeysByCommand(sCommand); + const TKeyList& lKeys = getKeysByCommand(sCommand); for (auto const& lKey : lKeys) { removeKey(lKey); diff --git a/hwpfilter/source/fontmap.hxx b/hwpfilter/source/fontmap.hxx index f9002e48ef99..3ab2e0849e1d 100644 --- a/hwpfilter/source/fontmap.hxx +++ b/hwpfilter/source/fontmap.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -int getRepFamilyName(char const *, char *, double &); +int getRepFamilyName(char const*, char*, double&); #endif diff --git a/hwpfilter/source/grammar.hxx b/hwpfilter/source/grammar.hxx index 334f4341c55a..a4a2e39cb0bb 100644 --- a/hwpfilter/source/grammar.hxx +++ b/hwpfilter/source/grammar.hxx @@ -24,7 +24,7 @@ class Node; -Node * mainParse(char const * _code); +Node* mainParse(char const* _code); #endif diff --git a/hwpfilter/source/hwpeq.h b/hwpfilter/source/hwpeq.h index 07e62ab7f985..cc96743c27a0 100644 --- a/hwpfilter/source/hwpeq.h +++ b/hwpfilter/source/hwpeq.h @@ -22,7 +22,7 @@ #include "mzstring.h" -void eq2latex(MzString &mstr, char const *str); +void eq2latex(MzString& mstr, char const* str); #endif // INCLUDED_HWPFILTER_SOURCE_HWPEQ_H diff --git a/hwpfilter/source/lexer.hxx b/hwpfilter/source/lexer.hxx index 333b117641db..0f0c1fe1525e 100644 --- a/hwpfilter/source/lexer.hxx +++ b/hwpfilter/source/lexer.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_HWPFILTER_SOURCE_LEXER_HXX #define INCLUDED_HWPFILTER_SOURCE_LEXER_HXX -void initFlex(char const * s); +void initFlex(char const* s); int yylex(); diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 8df1cac9df0c..687fb0b32db8 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4402,7 +4402,6 @@ filter/qa/cppunit/filters-tiff-test.cxx filter/qa/cppunit/msfilter-test.cxx filter/qa/cppunit/priority-test.cxx filter/qa/cppunit/xslt-test.cxx -filter/qa/unit/filter-dialogs-test.cxx filter/source/config/cache/basecontainer.cxx filter/source/config/cache/basecontainer.hxx filter/source/config/cache/cacheitem.cxx @@ -4723,7 +4722,6 @@ forms/source/xforms/NameContainer.hxx forms/source/xforms/binding.cxx forms/source/xforms/binding.hxx forms/source/xforms/boolexpression.cxx -forms/source/xforms/boolexpression.hxx forms/source/xforms/collection.hxx forms/source/xforms/computedexpression.cxx forms/source/xforms/computedexpression.hxx @@ -4775,8 +4773,6 @@ forms/source/xforms/xpathlib/extension.cxx forms/source/xforms/xpathlib/extension.hxx forms/source/xforms/xpathlib/xpathlib.cxx forms/source/xforms/xpathlib/xpathlib.hxx -formula/inc/core_resource.hxx -formula/qa/unit/formula-dialogs-test.cxx formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaOpCodeMapperObj.cxx formula/source/core/api/grammar.cxx @@ -4795,15 +4791,11 @@ formula/source/ui/dlg/parawin.hxx formula/source/ui/dlg/structpg.cxx formula/source/ui/dlg/structpg.hxx fpicker/inc/fpsofficeResMgr.hxx -fpicker/qa/unit/fpicker-dialogs-test.cxx -fpicker/source/aqua/AquaFilePickerDelegate.hxx fpicker/source/aqua/CFStringUtilities.hxx fpicker/source/aqua/ControlHelper.hxx fpicker/source/aqua/FPServiceInfo.hxx fpicker/source/aqua/FilterHelper.hxx fpicker/source/aqua/NSString_OOoAdditions.hxx -fpicker/source/aqua/NSURL_OOoAdditions.hxx -fpicker/source/aqua/SalAquaConstants.h fpicker/source/aqua/SalAquaFilePicker.hxx fpicker/source/aqua/SalAquaFolderPicker.hxx fpicker/source/aqua/SalAquaPicker.hxx @@ -4998,7 +4990,6 @@ framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxdocumenthandler.hxx framework/inc/xml/xmlnamespaces.hxx framework/qa/cppunit/dispatchtest.cxx -framework/source/accelerators/acceleratorcache.cxx framework/source/accelerators/acceleratorconfiguration.cxx framework/source/accelerators/documentacceleratorconfiguration.cxx framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -5209,12 +5200,10 @@ hwpfilter/source/datecode.h hwpfilter/source/drawdef.h hwpfilter/source/drawing.h hwpfilter/source/fontmap.cxx -hwpfilter/source/fontmap.hxx hwpfilter/source/formula.cxx hwpfilter/source/formula.h hwpfilter/source/grammar.cxx hwpfilter/source/grammar.h -hwpfilter/source/grammar.hxx hwpfilter/source/hbox.cxx hwpfilter/source/hbox.h hwpfilter/source/hcode.cxx @@ -5238,7 +5227,6 @@ hwpfilter/source/htags.h hwpfilter/source/hutil.cxx hwpfilter/source/hutil.h hwpfilter/source/hwpeq.cxx -hwpfilter/source/hwpeq.h hwpfilter/source/hwpfile.cxx hwpfilter/source/hwpfile.h hwpfilter/source/hwplib.h @@ -5247,7 +5235,6 @@ hwpfilter/source/hwpreader.cxx hwpfilter/source/hwpreader.hxx hwpfilter/source/ksc5601.h hwpfilter/source/lexer.cxx -hwpfilter/source/lexer.hxx hwpfilter/source/mapping.h hwpfilter/source/mzstring.cxx hwpfilter/source/mzstring.h |