peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Uwe Rathmann 2019-05-10 06:45:23 +02:00
parent 3a616d3c6a
commit d53cb4116b
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/layouts/QskGridBox.cpp
View File

@ -56,8 +56,7 @@ int QskGridBox::columnCount() const
QQuickItem* QskGridBox::itemAt( int row, int column ) const QQuickItem* QskGridBox::itemAt( int row, int column ) const
{ {
QskLayoutItem* layoutItem = engine().layoutItemAt( row, column ); if ( const auto layoutItem = engine().layoutItemAt( row, column ) )
if ( layoutItem )
return layoutItem->item(); return layoutItem->item();
return nullptr; return nullptr;
@ -70,45 +69,41 @@ int QskGridBox::indexAt( int row, int column ) const
int QskGridBox::rowOfIndex( int index ) const int QskGridBox::rowOfIndex( int index ) const
{ {
QskLayoutItem* layoutItem = engine().layoutItemAt( index ); if ( auto layoutItem = engine().layoutItemAt( index ) )
if ( layoutItem == nullptr )
return -1;
return layoutItem->firstRow(); return layoutItem->firstRow();
return -1;
} }
int QskGridBox::rowSpanOfIndex( int index ) const int QskGridBox::rowSpanOfIndex( int index ) const
{ {
QskLayoutItem* layoutItem = engine().layoutItemAt( index ); if ( auto layoutItem = engine().layoutItemAt( index ) )
if ( layoutItem == nullptr )
return 0;
return layoutItem->rowSpan(); return layoutItem->rowSpan();
return 0;
} }
int QskGridBox::columnOfIndex( int index ) const int QskGridBox::columnOfIndex( int index ) const
{ {
QskLayoutItem* layoutItem = engine().layoutItemAt( index ); if ( auto layoutItem = engine().layoutItemAt( index ) )
if ( layoutItem == nullptr )
return -1;
return layoutItem->firstColumn(); return layoutItem->firstColumn();
return -1;
} }
int QskGridBox::columnSpanOfIndex( int index ) const int QskGridBox::columnSpanOfIndex( int index ) const
{ {
QskLayoutItem* layoutItem = engine().layoutItemAt( index ); if ( auto layoutItem = engine().layoutItemAt( index ) )
if ( layoutItem == nullptr )
return 0;
return layoutItem->columnSpan(); return layoutItem->columnSpan();
return 0;
} }
void QskGridBox::setupLayoutItem( QskLayoutItem* layoutItem, int index ) void QskGridBox::setupLayoutItem( QskLayoutItem* layoutItem, int index )
{ {
Q_UNUSED( index ) Q_UNUSED( index )
QskLayoutEngine& engine = this->engine(); auto& engine = this->engine();
m_data->isExpanding = ( layoutItem->lastColumn() >= engine.columnCount() ) || m_data->isExpanding = ( layoutItem->lastColumn() >= engine.columnCount() ) ||
( layoutItem->lastRow() >= engine.rowCount() ); ( layoutItem->lastRow() >= engine.rowCount() );