Skip to content

Commit abde48d

Browse files
committedAug 8, 2018
Fix some clang warnings
(cherry-picked from 13b790d)
1 parent 85cda45 commit abde48d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed
 

‎src/gui/qgstaskmanagerwidget.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ QgsTaskManagerWidget::QgsTaskManagerWidget( QgsTaskManager *manager, QWidget *pa
4646
mTreeView->setHeaderHidden( true );
4747
mTreeView->setRootIsDecorated( false );
4848
mTreeView->setSelectionBehavior( QAbstractItemView::SelectRows );
49-
int progressColWidth = fontMetrics().width( "X" ) * 10 * Qgis::UI_SCALE_FACTOR;
49+
int progressColWidth = static_cast< int >( fontMetrics().width( 'X' ) * 10 * Qgis::UI_SCALE_FACTOR );
5050
mTreeView->setColumnWidth( QgsTaskManagerModel::Progress, progressColWidth );
51-
int statusColWidth = fontMetrics().width( "X" ) * 2 * Qgis::UI_SCALE_FACTOR;
51+
int statusColWidth = static_cast< int >( fontMetrics().width( 'X' ) * 2 * Qgis::UI_SCALE_FACTOR );
5252
mTreeView->setColumnWidth( QgsTaskManagerModel::Status, statusColWidth );
5353
mTreeView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
5454
mTreeView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
@@ -85,7 +85,7 @@ void QgsTaskManagerWidget::modelRowsInserted( const QModelIndex &, int start, in
8585
if ( progress > 0 )
8686
{
8787
progressBar->setMaximum( 100 );
88-
progressBar->setValue( progress );
88+
progressBar->setValue( static_cast< int >( std::round( progress ) ) );
8989
}
9090
else
9191
progressBar->setMaximum( 0 );
@@ -485,8 +485,8 @@ QgsTaskManagerFloatingWidget::QgsTaskManagerFloatingWidget( QgsTaskManager *mana
485485
{
486486
setLayout( new QVBoxLayout() );
487487
QgsTaskManagerWidget *w = new QgsTaskManagerWidget( manager );
488-
int minWidth = fontMetrics().width( 'X' ) * 60 * Qgis::UI_SCALE_FACTOR;
489-
int minHeight = fontMetrics().height() * 15 * Qgis::UI_SCALE_FACTOR;
488+
int minWidth = static_cast< int >( fontMetrics().width( 'X' ) * 60 * Qgis::UI_SCALE_FACTOR );
489+
int minHeight = static_cast< int >( fontMetrics().height() * 15 * Qgis::UI_SCALE_FACTOR );
490490
setMinimumSize( minWidth, minHeight );
491491
layout()->addWidget( w );
492492
setStyleSheet( ".QgsTaskManagerFloatingWidget { border-top-left-radius: 8px;"
@@ -524,7 +524,7 @@ QgsTaskManagerStatusBarWidget::QgsTaskManagerStatusBarWidget( QgsTaskManager *ma
524524

525525
QSize QgsTaskManagerStatusBarWidget::sizeHint() const
526526
{
527-
int width = fontMetrics().width( 'X' ) * 10 * Qgis::UI_SCALE_FACTOR;
527+
int width = static_cast< int >( fontMetrics().width( 'X' ) * 10 * Qgis::UI_SCALE_FACTOR );
528528
int height = QToolButton::sizeHint().height();
529529
return QSize( width, height );
530530
}
@@ -542,7 +542,7 @@ void QgsTaskManagerStatusBarWidget::toggleDisplay()
542542

543543
void QgsTaskManagerStatusBarWidget::overallProgressChanged( double progress )
544544
{
545-
mProgressBar->setValue( progress );
545+
mProgressBar->setValue( static_cast< int >( std::round( progress ) ) );
546546
if ( qgsDoubleNear( progress, 0.0 ) )
547547
mProgressBar->setMaximum( 0 );
548548
else if ( mProgressBar->maximum() == 0 )

0 commit comments

Comments
 (0)
Please sign in to comment.