Skip to content

Commit ffd2f26

Browse files
committed
fix build on precise
1 parent 91e44ea commit ffd2f26

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

src/gui/qgsdial.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
#include "qgsdial.h"
1919
#include "qgslogger.h"
2020

21+
#include <QPaintEvent>
22+
#include <QPainter>
2123
#include <QRect>
24+
#include <qmath.h>
2225

2326
QgsDial::QgsDial( QWidget *parent ) : QDial( parent )
2427
{
@@ -87,14 +90,14 @@ void QgsDial::update()
8790
if ( minimum() != 0 )
8891
QDial::setMinimum( 0 );
8992

90-
int max = ( int ) ceil(( mMax.toDouble() - mMin.toDouble() ) / mStep.toDouble() );
93+
int max = qCeil(( mMax.toDouble() - mMin.toDouble() ) / mStep.toDouble() );
9194
if ( maximum() != max )
9295
QDial::setMaximum( max );
9396

9497
if ( singleStep() != 1 )
9598
QDial::setSingleStep( 1 );
9699

97-
QDial::setValue(( int ) ceil(( mValue.toDouble() - mMin.toDouble() ) / mStep.toDouble() ) );
100+
QDial::setValue( qCeil(( mValue.toDouble() - mMin.toDouble() ) / mStep.toDouble() ) );
98101
}
99102

100103
connect( this, SIGNAL( valueChanged( int ) ), this, SLOT( valueChanged( int ) ) );

src/gui/qgsdial.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* *
1616
***************************************************************************/
1717

18-
#include <QPainter>
19-
#include <QPaintEvent>
20-
#include <QSize>
2118
#include <QDial>
19+
#include <QVariant>
20+
21+
class QPaintEvent;
2222

2323
class GUI_EXPORT QgsDial : public QDial
2424
{

src/gui/qgsslider.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
#include "qgsslider.h"
1919
#include "qgslogger.h"
2020

21+
#include <QPaintEvent>
22+
#include <QPainter>
2123
#include <QRect>
24+
#include <qmath.h>
2225

2326
QgsSlider::QgsSlider( QWidget * parent ) : QSlider( parent )
2427
{
@@ -92,14 +95,14 @@ void QgsSlider::update()
9295
if ( minimum() != 0 )
9396
QSlider::setMinimum( 0 );
9497

95-
int max = ( int ) ceil(( mMax.toDouble() - mMin.toDouble() ) / mStep.toDouble() );
98+
int max = qCeil(( mMax.toDouble() - mMin.toDouble() ) / mStep.toDouble() );
9699
if ( maximum() != max )
97100
QSlider::setMaximum( max );
98101

99102
if ( singleStep() != 1 )
100103
QSlider::setSingleStep( 1 );
101104

102-
QSlider::setValue(( int ) ceil(( mValue.toDouble() - mMin.toDouble() ) / mStep.toDouble() ) );
105+
QSlider::setValue( qCeil(( mValue.toDouble() - mMin.toDouble() ) / mStep.toDouble() ) );
103106
}
104107

105108
connect( this, SIGNAL( valueChanged( int ) ), this, SLOT( valueChanged( int ) ) );

src/gui/qgsslider.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* *
1616
***************************************************************************/
1717

18-
#include <QPainter>
19-
#include <QPaintEvent>
20-
#include <QSize>
2118
#include <QSlider>
19+
#include <QVariant>
20+
21+
class QPaintEvent;
2222

2323
class GUI_EXPORT QgsSlider : public QSlider
2424
{

0 commit comments

Comments
 (0)