From e6c80ed5bddfdb3da0ff57a8a5d37beeb502934f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Tue, 5 Aug 2014 09:54:30 +0200 Subject: [PATCH] Coding style --- .../partition/CreatePartitionDialog.cpp | 8 +++---- .../partition/EditExistingPartitionDialog.cpp | 12 +++++----- src/modules/partition/PMUtils.cpp | 22 +++++++++---------- src/modules/partition/PartitionCoreModule.cpp | 2 +- src/modules/partition/PartitionModel.cpp | 9 ++++---- src/modules/partition/PartitionPreview.cpp | 3 ++- 6 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/modules/partition/CreatePartitionDialog.cpp b/src/modules/partition/CreatePartitionDialog.cpp index 7ea7a5eca..a717848f5 100644 --- a/src/modules/partition/CreatePartitionDialog.cpp +++ b/src/modules/partition/CreatePartitionDialog.cpp @@ -124,10 +124,10 @@ CreatePartitionDialog::createPartition() ? FileSystem::Extended : FileSystem::typeForName( m_ui->fsComboBox->currentText() ); Partition* partition = PMUtils::createNewPartition( - m_parent, - *m_device, - m_role, - fsType, range.first, range.second ); + m_parent, + *m_device, + m_role, + fsType, range.first, range.second ); PartitionInfo::setMountPoint( partition, m_ui->mountPointComboBox->currentText() ); PartitionInfo::setFormat( partition, true ); diff --git a/src/modules/partition/EditExistingPartitionDialog.cpp b/src/modules/partition/EditExistingPartitionDialog.cpp index c8cc1fc78..18a25800c 100644 --- a/src/modules/partition/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/EditExistingPartitionDialog.cpp @@ -56,12 +56,12 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) if ( m_ui->formatRadioButton->isChecked() ) { Partition* newPartition = PMUtils::createNewPartition( - m_partition->parent(), - *m_device, - m_partition->roles(), - m_partition->fileSystem().type(), - range.first, - range.second); + m_partition->parent(), + *m_device, + m_partition->roles(), + m_partition->fileSystem().type(), + range.first, + range.second ); PartitionInfo::setMountPoint( newPartition, PartitionInfo::mountPoint( m_partition ) ); PartitionInfo::setFormat( newPartition, true ); diff --git a/src/modules/partition/PMUtils.cpp b/src/modules/partition/PMUtils.cpp index 5cc48ae55..7de100d27 100644 --- a/src/modules/partition/PMUtils.cpp +++ b/src/modules/partition/PMUtils.cpp @@ -53,17 +53,17 @@ createNewPartition( PartitionNode* parent, const Device& device, const Partition { FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector ); return new Partition( - parent, - device, - role, - fs, fs->firstSector(), fs->lastSector(), - QString() /* path */, - PartitionTable::FlagNone /* availableFlags */, - QString() /* mountPoint */, - false /* mounted */, - PartitionTable::FlagNone /* activeFlags */, - Partition::StateNew - ); + parent, + device, + role, + fs, fs->firstSector(), fs->lastSector(), + QString() /* path */, + PartitionTable::FlagNone /* availableFlags */, + QString() /* mountPoint */, + false /* mounted */, + PartitionTable::FlagNone /* activeFlags */, + Partition::StateNew + ); } } // namespace diff --git a/src/modules/partition/PartitionCoreModule.cpp b/src/modules/partition/PartitionCoreModule.cpp index 4d46cd3cb..9f6bb829a 100644 --- a/src/modules/partition/PartitionCoreModule.cpp +++ b/src/modules/partition/PartitionCoreModule.cpp @@ -46,7 +46,7 @@ static bool hasRootPartition( Device* device ) { for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) - if ( (*it)->mountPoint() == "/" ) + if ( ( *it )->mountPoint() == "/" ) return true; return false; } diff --git a/src/modules/partition/PartitionModel.cpp b/src/modules/partition/PartitionModel.cpp index e1c9aaa70..6364838ba 100644 --- a/src/modules/partition/PartitionModel.cpp +++ b/src/modules/partition/PartitionModel.cpp @@ -33,7 +33,8 @@ // Qt #include -static QColor COLORS[ 4 ] = { +static QColor COLORS[ 4 ] = +{ "#448eca", "#a5cc42", "#d87e30", @@ -54,7 +55,7 @@ static QColor colorForPartition( Partition* partition, int row ) //- ResetHelper -------------------------------------------- PartitionModel::ResetHelper::ResetHelper( PartitionModel* model ) -: m_model( model ) + : m_model( model ) { m_model->beginResetModel(); } @@ -98,8 +99,8 @@ QModelIndex PartitionModel::index( int row, int column, const QModelIndex& parent ) const { PartitionNode* parentPartition = parent.isValid() - ? static_cast< PartitionNode* >( partitionForIndex( parent )) - : static_cast< PartitionNode* >( m_device->partitionTable() ); + ? static_cast< PartitionNode* >( partitionForIndex( parent ) ) + : static_cast< PartitionNode* >( m_device->partitionTable() ); if ( !parentPartition ) return QModelIndex(); auto lst = parentPartition->children(); diff --git a/src/modules/partition/PartitionPreview.cpp b/src/modules/partition/PartitionPreview.cpp index 491747b2f..fd1749b32 100644 --- a/src/modules/partition/PartitionPreview.cpp +++ b/src/modules/partition/PartitionPreview.cpp @@ -99,7 +99,8 @@ PartitionPreview::drawPartitions( QPainter* painter, const QRect& rect, const QM return; const int count = modl->rowCount( parent ); const int totalWidth = rect.width(); - struct Item { + struct Item + { qreal size; QModelIndex index; };