diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp index c2660eed8..c3f3b2f3f 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.cpp +++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp @@ -58,7 +58,7 @@ void PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions ) { m_drawNestedPartitions = drawNestedPartitions; - QList< PartitionSplitterItem > allPartitionItems; + QVector< PartitionSplitterItem > allPartitionItems; PartitionSplitterItem* extendedPartitionItem = nullptr; for ( auto it = PartitionIterator::begin( dev ); it != PartitionIterator::end( dev ); ++it ) @@ -95,7 +95,7 @@ PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions ) } void -PartitionSplitterWidget::setupItems( const QList& items ) +PartitionSplitterWidget::setupItems( const QVector& items ) { m_itemToResize = nullptr; m_itemToResizeNext = nullptr; @@ -453,13 +453,13 @@ PartitionSplitterWidget::drawResizeHandle( QPainter* painter, void PartitionSplitterWidget::drawPartitions( QPainter* painter, const QRect& rect, - const QList< PartitionSplitterItem >& itemList ) + const QVector< PartitionSplitterItem >& itemList ) { const int count = itemList.count(); const int totalWidth = rect.width(); auto pair = computeItemsVector( itemList ); - QList< PartitionSplitterItem >& items = pair.first; + QVector< PartitionSplitterItem >& items = pair.first; qreal total = pair.second; int x = rect.x(); @@ -504,7 +504,7 @@ PartitionSplitterWidget::drawPartitions( QPainter* painter, template < typename F > PartitionSplitterItem* -PartitionSplitterWidget::_findItem( QList< PartitionSplitterItem >& items, +PartitionSplitterWidget::_findItem( QVector< PartitionSplitterItem >& items, F condition ) { for ( auto it = items.begin(); it != items.end(); ++it) @@ -520,10 +520,10 @@ PartitionSplitterWidget::_findItem( QList< PartitionSplitterItem >& items, } -QPair< QList< PartitionSplitterItem >, qreal > -PartitionSplitterWidget::computeItemsVector( const QList< PartitionSplitterItem >& originalItems ) const +QPair< QVector< PartitionSplitterItem >, qreal > +PartitionSplitterWidget::computeItemsVector( const QVector< PartitionSplitterItem >& originalItems ) const { - QList< PartitionSplitterItem > items; + QVector< PartitionSplitterItem > items; qreal total = 0; for ( int row = 0; row < originalItems.count(); ++row ) @@ -536,7 +536,7 @@ PartitionSplitterWidget::computeItemsVector( const QList< PartitionSplitterItem else { PartitionSplitterItem thisItem = originalItems[ row ]; - QPair< QList< PartitionSplitterItem >, qreal > pair = computeItemsVector( thisItem.children ); + QPair< QVector< PartitionSplitterItem >, qreal > pair = computeItemsVector( thisItem.children ); thisItem.children = pair.first; thisItem.size = pair.second; items += thisItem; diff --git a/src/modules/partition/gui/PartitionSplitterWidget.h b/src/modules/partition/gui/PartitionSplitterWidget.h index a59e03bbe..fe039fd27 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.h +++ b/src/modules/partition/gui/PartitionSplitterWidget.h @@ -30,7 +30,7 @@ struct PartitionSplitterItem bool isFreeSpace; qint64 size; - QList< PartitionSplitterItem > children; + QVector< PartitionSplitterItem > children; }; class PartitionSplitterWidget : public QWidget @@ -63,11 +63,11 @@ protected: void mouseReleaseEvent( QMouseEvent* event ) override; private: - void setupItems( const QList< PartitionSplitterItem >& items ); + void setupItems( const QVector< PartitionSplitterItem >& items ); void drawPartitions( QPainter* painter, const QRect& rect, - const QList< PartitionSplitterItem >& itemList ); + const QVector< PartitionSplitterItem >& itemList ); void drawSection( QPainter* painter, const QRect& rect_, int x, int width, const PartitionSplitterItem& item ); void drawResizeHandle( QPainter* painter, @@ -75,13 +75,13 @@ private: int x ); template < typename F > - PartitionSplitterItem* _findItem( QList< PartitionSplitterItem >& items, + PartitionSplitterItem* _findItem( QVector< PartitionSplitterItem >& items, F condition ); - QPair< QList< PartitionSplitterItem >, qreal > - computeItemsVector( const QList< PartitionSplitterItem >& originalItems ) const; + QPair< QVector< PartitionSplitterItem >, qreal > + computeItemsVector( const QVector< PartitionSplitterItem >& originalItems ) const; - QList< PartitionSplitterItem > m_items; + QVector< PartitionSplitterItem > m_items; QString m_itemToResizePath; PartitionSplitterItem* m_itemToResize; PartitionSplitterItem* m_itemToResizeNext;