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

Changes: apply coding style

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-05 00:00:29 +01:00
parent be7b63051e
commit 59255c7a57
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamares/modulesystem/Module.cpp
View File

@ -86,7 +86,8 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c
return paths; return paths;
} }
void Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Exception void
Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Exception
{ {
QStringList configCandidates QStringList configCandidates
= moduleConfigurationCandidates( Settings::instance()->debugMode(), name(), configFileName ); = moduleConfigurationCandidates( Settings::instance()->debugMode(), name(), configFileName );

13
src/modules/partition/tests/CreateLayoutsTests.cpp
View File

@ -64,7 +64,8 @@ CreateLayoutsTests::testFixedSizePartition()
QFAIL( qPrintable( "Unable to create / partition" ) ); QFAIL( qPrintable( "Unable to create / partition" ) );
} }
partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role ); partitions
= layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
QCOMPARE( partitions.count(), 1 ); QCOMPARE( partitions.count(), 1 );
@ -84,7 +85,8 @@ CreateLayoutsTests::testPercentSizePartition()
QFAIL( qPrintable( "Unable to create / partition" ) ); QFAIL( qPrintable( "Unable to create / partition" ) );
} }
partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role ); partitions
= layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
QCOMPARE( partitions.count(), 1 ); QCOMPARE( partitions.count(), 1 );
@ -114,7 +116,8 @@ CreateLayoutsTests::testMixedSizePartition()
QFAIL( qPrintable( "Unable to create /bkup partition" ) ); QFAIL( qPrintable( "Unable to create /bkup partition" ) );
} }
partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role ); partitions
= layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
QCOMPARE( partitions.count(), 3 ); QCOMPARE( partitions.count(), 3 );
@ -155,6 +158,4 @@ TestDevice::TestDevice( const QString& name, const qint64 logicalSectorSize, con
} }
#endif #endif
TestDevice::~TestDevice() TestDevice::~TestDevice() {}
{
}

4
src/modules/users/TestGroupInformation.cpp
View File

@ -73,7 +73,8 @@ GroupTests::testReadGroup()
} }
} }
void GroupTests::testCreateGroup() void
GroupTests::testCreateGroup()
{ {
// BUILD_AS_TEST is the source-directory path // BUILD_AS_TEST is the source-directory path
QFile fi( QString( "%1/tests/5-issue-1523.conf" ).arg( BUILD_AS_TEST ) ); QFile fi( QString( "%1/tests/5-issue-1523.conf" ).arg( BUILD_AS_TEST ) );
@ -98,7 +99,6 @@ void GroupTests::testCreateGroup()
} }
QTEST_GUILESS_MAIN( GroupTests ) QTEST_GUILESS_MAIN( GroupTests )
#include "utils/moc-warnings.h" #include "utils/moc-warnings.h"