napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Polish coding-style

Browse Source 
- don't break after return type in declarations
 - apply same to partition service
This commit is contained in:
Adriaan de Groot 2019-06-20 14:30:49 +02:00
parent e6b55a1f70
commit 2b4ffb2bd3
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -6,7 +6,7 @@ AllowAllParametersOfDeclarationOnNextLine: 'false'
AllowShortFunctionsOnASingleLine: Inline AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: 'false' AllowShortIfStatementsOnASingleLine: 'false'
AllowShortLoopsOnASingleLine: 'false' AllowShortLoopsOnASingleLine: 'false'
AlwaysBreakAfterDefinitionReturnType: All AlwaysBreakAfterReturnType: TopLevelDefinitions
AlwaysBreakTemplateDeclarations: Yes AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: 'false' BinPackArguments: 'false'
BinPackParameters: 'false' BinPackParameters: 'false'

9
src/libcalamares/partition/PartitionSize.h
View File

@ -60,11 +60,7 @@ public:
} }
PartitionSize( const QString& ); PartitionSize( const QString& );
bool bool isValid() const { return ( unit() != SizeUnit::None ) && ( value() > 0 ); }
isValid() const
{
return ( unit() != SizeUnit::None ) && ( value() > 0 );
}
bool operator<( const PartitionSize& other ) const; bool operator<( const PartitionSize& other ) const;
bool operator>( const PartitionSize& other ) const; bool operator>( const PartitionSize& other ) const;
@ -114,8 +110,7 @@ public:
* be compared with each other, and all the explicit sizes (KiB, ...) * be compared with each other, and all the explicit sizes (KiB, ...)
* can be compared with each other. * can be compared with each other.
*/ */
static constexpr bool static constexpr bool unitsComparable( const SizeUnit u1, const SizeUnit u2 )
unitsComparable( const SizeUnit u1, const SizeUnit u2 )
{ {
return !( ( u1 == SizeUnit::None || u2 == SizeUnit::None ) return !( ( u1 == SizeUnit::None || u2 == SizeUnit::None )
|| ( u1 == SizeUnit::Percent && u2 != SizeUnit::Percent ) || ( u1 == SizeUnit::Percent && u2 != SizeUnit::Percent )