Skip to content

Commit

Permalink
Fix some clang warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 7, 2018
1 parent 4b1bc82 commit 13b790d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/gui/qgstaskmanagerwidget.cpp
Expand Up @@ -46,9 +46,9 @@ QgsTaskManagerWidget::QgsTaskManagerWidget( QgsTaskManager *manager, QWidget *pa
mTreeView->setHeaderHidden( true );
mTreeView->setRootIsDecorated( false );
mTreeView->setSelectionBehavior( QAbstractItemView::SelectRows );
int progressColWidth = fontMetrics().width( "X" ) * 10 * Qgis::UI_SCALE_FACTOR;
int progressColWidth = static_cast< int >( fontMetrics().width( 'X' ) * 10 * Qgis::UI_SCALE_FACTOR );
mTreeView->setColumnWidth( QgsTaskManagerModel::Progress, progressColWidth );
int statusColWidth = fontMetrics().width( "X" ) * 2 * Qgis::UI_SCALE_FACTOR;
int statusColWidth = static_cast< int >( fontMetrics().width( 'X' ) * 2 * Qgis::UI_SCALE_FACTOR );
mTreeView->setColumnWidth( QgsTaskManagerModel::Status, statusColWidth );
mTreeView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
mTreeView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
Expand Down Expand Up @@ -85,7 +85,7 @@ void QgsTaskManagerWidget::modelRowsInserted( const QModelIndex &, int start, in
if ( progress > 0 )
{
progressBar->setMaximum( 100 );
progressBar->setValue( progress );
progressBar->setValue( static_cast< int >( std::round( progress ) ) );
}
else
progressBar->setMaximum( 0 );
Expand Down Expand Up @@ -570,8 +570,8 @@ QgsTaskManagerFloatingWidget::QgsTaskManagerFloatingWidget( QgsTaskManager *mana
{
setLayout( new QVBoxLayout() );
QgsTaskManagerWidget *w = new QgsTaskManagerWidget( manager );
int minWidth = fontMetrics().width( 'X' ) * 60 * Qgis::UI_SCALE_FACTOR;
int minHeight = fontMetrics().height() * 15 * Qgis::UI_SCALE_FACTOR;
int minWidth = static_cast< int >( fontMetrics().width( 'X' ) * 60 * Qgis::UI_SCALE_FACTOR );
int minHeight = static_cast< int >( fontMetrics().height() * 15 * Qgis::UI_SCALE_FACTOR );
setMinimumSize( minWidth, minHeight );
layout()->addWidget( w );
setStyleSheet( ".QgsTaskManagerFloatingWidget { border-top-left-radius: 8px;"
Expand Down Expand Up @@ -609,7 +609,7 @@ QgsTaskManagerStatusBarWidget::QgsTaskManagerStatusBarWidget( QgsTaskManager *ma

QSize QgsTaskManagerStatusBarWidget::sizeHint() const
{
int width = fontMetrics().width( 'X' ) * 10 * Qgis::UI_SCALE_FACTOR;
int width = static_cast< int >( fontMetrics().width( 'X' ) * 10 * Qgis::UI_SCALE_FACTOR );
int height = QToolButton::sizeHint().height();
return QSize( width, height );
}
Expand All @@ -627,7 +627,7 @@ void QgsTaskManagerStatusBarWidget::toggleDisplay()

void QgsTaskManagerStatusBarWidget::overallProgressChanged( double progress )
{
mProgressBar->setValue( progress );
mProgressBar->setValue( static_cast< int >( std::round( progress ) ) );
if ( qgsDoubleNear( progress, 0.0 ) )
mProgressBar->setMaximum( 0 );
else if ( mProgressBar->maximum() == 0 )
Expand Down

0 comments on commit 13b790d

Please sign in to comment.