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

2
src/libcalamares/geoip/test_geoip.cpp
View File

@ -37,7 +37,7 @@ main( int argc, char** argv )
QString format( argv[ 1 ] ); QString format( argv[ 1 ] );
QString selector = argc == 3 ? QString( argv[ 2 ] ) : QString(); QString selector = argc == 3 ? QString( argv[ 2 ] ) : QString();
Logger::setupLogLevel(Logger::LOGVERBOSE); Logger::setupLogLevel( Logger::LOGVERBOSE );
cDebug() << "Doing GeoIP interpretation with format=" << format << "selector=" << selector; cDebug() << "Doing GeoIP interpretation with format=" << format << "selector=" << selector;
Interface* handler = nullptr; Interface* handler = nullptr;

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 );

4
src/libcalamares/utils/Retranslator.cpp
View File

@ -195,7 +195,7 @@ installTranslator( const QLocale& locale, const QString& brandingTranslationsPre
loadSingletonTranslator( TZLoader( locale ), s_tztranslator ); loadSingletonTranslator( TZLoader( locale ), s_tztranslator );
loadSingletonTranslator( CalamaresLoader( locale ), s_translator ); loadSingletonTranslator( CalamaresLoader( locale ), s_translator );
s_translatorLocaleName = CalamaresLoader::mungeLocaleName(locale); s_translatorLocaleName = CalamaresLoader::mungeLocaleName( locale );
} }
@ -206,7 +206,7 @@ translatorLocaleName()
} }
bool bool
loadTranslator( const QLocale& locale, const QString& prefix, QTranslator *translator ) loadTranslator( const QLocale& locale, const QString& prefix, QTranslator* translator )
{ {
return ::tryLoad( translator, prefix, locale.name() ); return ::tryLoad( translator, prefix, locale.name() );
} }

2
src/modules/partition/core/PartitionActions.cpp
View File

@ -196,7 +196,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
KPM_PARTITION_FLAG( None ) ); KPM_PARTITION_FLAG( None ) );
} }
PartitionInfo::setFormat( swapPartition, true ); PartitionInfo::setFormat( swapPartition, true );
if ( gs->contains( "swapPartitionName" )) if ( gs->contains( "swapPartitionName" ) )
{ {
swapPartition->setLabel( gs->value( "swapPartitionName" ).toString() ); swapPartition->setLabel( gs->value( "swapPartitionName" ).toString() );
} }

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() {}
{
}

6
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 ) );
@ -93,12 +94,11 @@ void GroupTests::testCreateGroup()
Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" ); Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
SetupGroupsJob j(&c); SetupGroupsJob j( &c );
QVERIFY( !j.exec() ); // running as regular user this should fail QVERIFY( !j.exec() ); // running as regular user this should fail
} }
QTEST_GUILESS_MAIN( GroupTests ) QTEST_GUILESS_MAIN( GroupTests )
#include "utils/moc-warnings.h" #include "utils/moc-warnings.h"