QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

Change all mixed size_t variables to int to avoid cross-compiler hell

Browse Source
This commit is contained in:
Alex Spataru 2021-11-05 03:58:51 -06:00
parent 3da6ff63d2
commit 01fb3210cf
25 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/qwt/src/qwt_date_scale_engine.cpp
View File

@ -112,9 +112,9 @@ static double qwtRoundedIntervalWidth(
}
static inline int qwtStepCount( int intervalSize, int maxSteps,
const int limits[], size_t numLimits )
const int limits[], int numLimits )
{
for ( uint i = 0; i < numLimits; i++ )
for ( int i = 0; i < numLimits; i++ )
{
const int numSteps = intervalSize / limits[ i ];
@ -160,11 +160,11 @@ static int qwtStepSize( int intervalSize, int maxSteps, uint base )
}
static int qwtDivideInterval( double intervalSize, int numSteps,
const int limits[], size_t numLimits )
const int limits[], int numLimits )
{
const int v = qwtCeil( intervalSize / double( numSteps ) );
for ( uint i = 0; i < numLimits - 1; i++ )
for ( int i = 0; i < numLimits - 1; i++ )
{
if ( v <= limits[i] )
return limits[i];

4
libs/qwt/src/qwt_plot_abstract_barchart.cpp
View File

@ -247,7 +247,7 @@ double QwtPlotAbstractBarChart::sampleWidth( const QwtScaleMap& map,
case AutoAdjustSamples:
default:
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
double w = 1.0;
if ( numSamples > 1 )
@ -312,7 +312,7 @@ void QwtPlotAbstractBarChart::getCanvasMarginHint( const QwtScaleMap& xMap,
case ScaleSamplesToAxes:
default:
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
if ( numSamples <= 0 )
break;

10
libs/qwt/src/qwt_plot_barchart.cpp
View File

@ -185,7 +185,7 @@ QwtPlotBarChart::LegendMode QwtPlotBarChart::legendMode() const
*/
QRectF QwtPlotBarChart::boundingRect() const
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
if ( numSamples == 0 )
return QwtPlotSeriesItem::boundingRect();
@ -222,7 +222,7 @@ QRectF QwtPlotBarChart::boundingRect() const
*/
void QwtPlotBarChart::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
if ( to < 0 )
to = dataSize() - 1;
@ -239,7 +239,7 @@ void QwtPlotBarChart::drawSeries(QPainter* painter,
painter->save();
for ( size_t i = from; i <= to; i++ )
for ( int i = from; i <= to; i++ )
{
drawSample( painter, xMap, yMap,
canvasRect, interval, i, sample( i ) );
@ -419,10 +419,10 @@ QList< QwtLegendData > QwtPlotBarChart::legendData() const
if ( m_data->legendMode == LegendBarTitles )
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
list.reserve( numSamples );
for ( size_t i = 0; i < numSamples; i++ )
for ( int i = 0; i < numSamples; i++ )
{
QwtLegendData data;

2
libs/qwt/src/qwt_plot_barchart.h
View File

@ -87,7 +87,7 @@ class QWT_EXPORT QwtPlotBarChart
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual QRectF boundingRect() const QWT_OVERRIDE;

14
libs/qwt/src/qwt_plot_curve.cpp
View File

@ -55,13 +55,13 @@ static void qwtUpdateLegendIconSize( QwtPlotCurve* curve )
}
}
static int qwtVerifyRange( size_t size, size_t& i1, size_t& i2 )
static int qwtVerifyRange( int size, int& i1, int& i2 )
{
if ( size < 1 )
return 0;
i1 = qBound<size_t>( 0, i1, size - 1 );
i2 = qBound<size_t>( 0, i2, size - 1 );
i1 = qBound<int>( 0, i1, size - 1 );
i2 = qBound<int>( 0, i2, size - 1 );
if ( i1 > i2 )
qSwap( i1, i2 );
@ -380,9 +380,9 @@ const QBrush& QwtPlotCurve::brush() const
*/
void QwtPlotCurve::drawSeries( QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
if ( !painter || numSamples <= 0 )
return;
@ -1050,7 +1050,7 @@ double QwtPlotCurve::baseline() const
*/
int QwtPlotCurve::closestPoint( const QPointF& pos, double* dist ) const
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
if ( plot() == NULL || numSamples <= 0 )
return -1;
@ -1063,7 +1063,7 @@ int QwtPlotCurve::closestPoint( const QPointF& pos, double* dist ) const
int index = -1;
double dmin = 1.0e10;
for ( uint i = 0; i < numSamples; i++ )
for ( int i = 0; i < numSamples; i++ )
{
const QPointF sample = series->sample( i );

2
libs/qwt/src/qwt_plot_curve.h
View File

@ -301,7 +301,7 @@ class QWT_EXPORT QwtPlotCurve
virtual void drawSeries(QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual QwtGraphic legendIcon( int index, const QSizeF& ) const QWT_OVERRIDE;

2
libs/qwt/src/qwt_plot_histogram.cpp
View File

@ -333,7 +333,7 @@ void QwtPlotHistogram::setSamples(
*/
void QwtPlotHistogram::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
Q_UNUSED( canvasRect )

2
libs/qwt/src/qwt_plot_histogram.h
View File

@ -108,7 +108,7 @@ class QWT_EXPORT QwtPlotHistogram
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual QRectF boundingRect() const QWT_OVERRIDE;

6
libs/qwt/src/qwt_plot_intervalcurve.cpp
View File

@ -321,7 +321,7 @@ QRectF QwtPlotIntervalCurve::boundingRect() const
*/
void QwtPlotIntervalCurve::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
if ( to < 0 )
to = dataSize() - 1;
@ -376,11 +376,11 @@ void QwtPlotIntervalCurve::drawTube( QPainter* painter,
painter->save();
const size_t size = to - from + 1;
const int size = to - from + 1;
QPolygonF polygon( 2 * size );
QPointF* points = polygon.data();
for ( uint i = 0; i < size; i++ )
for ( int i = 0; i < size; i++ )
{
QPointF& minValue = points[i];
QPointF& maxValue = points[2 * size - 1 - i];

2
libs/qwt/src/qwt_plot_intervalcurve.h
View File

@ -106,7 +106,7 @@ class QWT_EXPORT QwtPlotIntervalCurve
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual QRectF boundingRect() const QWT_OVERRIDE;

8
libs/qwt/src/qwt_plot_multi_barchart.cpp
View File

@ -301,7 +301,7 @@ QwtPlotMultiBarChart::ChartStyle QwtPlotMultiBarChart::style() const
*/
QRectF QwtPlotMultiBarChart::boundingRect() const
{
const size_t numSamples = dataSize();
const int numSamples = dataSize();
if ( numSamples == 0 )
return QwtPlotSeriesItem::boundingRect();
@ -331,7 +331,7 @@ QRectF QwtPlotMultiBarChart::boundingRect() const
const QwtSeriesData< QwtSetSample >* series = data();
for ( size_t i = 0; i < numSamples; i++ )
for ( int i = 0; i < numSamples; i++ )
{
const QwtSetSample sample = series->sample( i );
if ( i == 0 )
@ -373,7 +373,7 @@ QRectF QwtPlotMultiBarChart::boundingRect() const
*/
void QwtPlotMultiBarChart::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
if ( to < 0 )
to = dataSize() - 1;
@ -390,7 +390,7 @@ void QwtPlotMultiBarChart::drawSeries(QPainter* painter,
painter->save();
for ( size_t i = from; i <= to; i++ )
for ( int i = from; i <= to; i++ )
{
drawSample( painter, xMap, yMap,
canvasRect, interval, i, sample( i ) );

2
libs/qwt/src/qwt_plot_multi_barchart.h
View File

@ -86,7 +86,7 @@ class QWT_EXPORT QwtPlotMultiBarChart
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual QRectF boundingRect() const QWT_OVERRIDE;

2
libs/qwt/src/qwt_plot_seriesitem.h
View File

@ -50,7 +50,7 @@ class QWT_EXPORT QwtPlotSeriesItem : public QwtPlotItem,
*/
virtual void drawSeries( QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const = 0;
const QRectF& canvasRect, int from, int to ) const = 0;
virtual QRectF boundingRect() const QWT_OVERRIDE;

2
libs/qwt/src/qwt_plot_spectrocurve.cpp
View File

@ -237,7 +237,7 @@ double QwtPlotSpectroCurve::penWidth() const
*/
void QwtPlotSpectroCurve::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
if ( !painter || dataSize() <= 0 )
return;

2
libs/qwt/src/qwt_plot_spectrocurve.h
View File

@ -55,7 +55,7 @@ class QWT_EXPORT QwtPlotSpectroCurve
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
void setPenWidth( double );
double penWidth() const;

2
libs/qwt/src/qwt_plot_tradingcurve.cpp
View File

@ -386,7 +386,7 @@ QRectF QwtPlotTradingCurve::boundingRect() const
*/
void QwtPlotTradingCurve::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
if ( to < 0 )
to = dataSize() - 1;

2
libs/qwt/src/qwt_plot_tradingcurve.h
View File

@ -135,7 +135,7 @@ class QWT_EXPORT QwtPlotTradingCurve
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual QRectF boundingRect() const QWT_OVERRIDE;

4
libs/qwt/src/qwt_plot_vectorfield.cpp
View File

@ -53,7 +53,7 @@ static QwtInterval qwtMagnitudeRange(
double min = s0.vx * s0.vx + s0.vy * s0.vy;
double max = min;
for ( uint i = 1; i < series->size(); i++ )
for ( int i = 1; i < series->size(); i++ )
{
const QwtVectorFieldSample s = series->sample( i );
const double l = s.vx * s.vx + s.vy * s.vy;
@ -806,7 +806,7 @@ QwtGraphic QwtPlotVectorField::legendIcon(
*/
void QwtPlotVectorField::drawSeries(QPainter* painter,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const
const QRectF& canvasRect, int from, int to ) const
{
if ( !painter || dataSize() <= 0 )
return;

2
libs/qwt/src/qwt_plot_vectorfield.h
View File

@ -136,7 +136,7 @@ class QWT_EXPORT QwtPlotVectorField
virtual void drawSeries( QPainter*,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, size_t from, size_t to ) const QWT_OVERRIDE;
const QRectF& canvasRect, int from, int to ) const QWT_OVERRIDE;
virtual int rtti() const QWT_OVERRIDE;

8
libs/qwt/src/qwt_point_data.cpp
View File

@ -18,7 +18,7 @@
\sa setInterval(), setSize()
*/
QwtSyntheticPointData::QwtSyntheticPointData(
size_t size, const QwtInterval& interval )
int size, const QwtInterval& interval )
: m_size( size )
, m_interval( interval )
{
@ -30,7 +30,7 @@ QwtSyntheticPointData::QwtSyntheticPointData(
\param size Number of points
\sa size(), setInterval()
*/
void QwtSyntheticPointData::setSize( size_t size )
void QwtSyntheticPointData::setSize( int size )
{
m_size = size;
}
@ -39,7 +39,7 @@ void QwtSyntheticPointData::setSize( size_t size )
\return Number of points
\sa setSize(), interval()
*/
size_t QwtSyntheticPointData::size() const
int QwtSyntheticPointData::size() const
{
return m_size;
}
@ -122,7 +122,7 @@ QRectF QwtSyntheticPointData::boundingRect() const
\warning For invalid indices ( index < 0 || index >= size() )
(0, 0) is returned.
*/
QPointF QwtSyntheticPointData::sample( size_t index ) const
QPointF QwtSyntheticPointData::sample( int index ) const
{
if ( index >= m_size )
return QPointF( 0, 0 );

62
libs/qwt/src/qwt_point_data.h
View File

@ -23,10 +23,10 @@ class QwtPointArrayData : public QwtPointSeriesData
{
public:
QwtPointArrayData( const QVector< T >& x, const QVector< T >& y );
QwtPointArrayData( const T* x, const T* y, size_t size );
QwtPointArrayData( const T* x, const T* y, int size );
virtual size_t size() const QWT_OVERRIDE;
virtual QPointF sample( size_t index ) const QWT_OVERRIDE;
virtual int size() const QWT_OVERRIDE;
virtual QPointF sample( int index ) const QWT_OVERRIDE;
const QVector< T >& xData() const;
const QVector< T >& yData() const;
@ -43,10 +43,10 @@ template< typename T >
class QwtCPointerData : public QwtPointSeriesData
{
public:
QwtCPointerData( const T* x, const T* y, size_t size );
QwtCPointerData( const T* x, const T* y, int size );
virtual size_t size() const QWT_OVERRIDE;
virtual QPointF sample( size_t index ) const QWT_OVERRIDE;
virtual int size() const QWT_OVERRIDE;
virtual QPointF sample( int index ) const QWT_OVERRIDE;
const T* xData() const;
const T* yData() const;
@ -54,7 +54,7 @@ class QwtCPointerData : public QwtPointSeriesData
private:
const T* m_x;
const T* m_y;
size_t m_size;
int m_size;
};
/*!
@ -68,10 +68,10 @@ class QwtValuePointData : public QwtPointSeriesData
{
public:
QwtValuePointData( const QVector< T >& y );
QwtValuePointData( const T* y, size_t size );
QwtValuePointData( const T* y, int size );
virtual size_t size() const QWT_OVERRIDE;
virtual QPointF sample( size_t index ) const QWT_OVERRIDE;
virtual int size() const QWT_OVERRIDE;
virtual QPointF sample( int index ) const QWT_OVERRIDE;
const QVector< T >& yData() const;
@ -89,16 +89,16 @@ template< typename T >
class QwtCPointerValueData : public QwtPointSeriesData
{
public:
QwtCPointerValueData( const T* y, size_t size );
QwtCPointerValueData( const T* y, int size );
virtual size_t size() const QWT_OVERRIDE;
virtual QPointF sample( size_t index ) const QWT_OVERRIDE;
virtual int size() const QWT_OVERRIDE;
virtual QPointF sample( int index ) const QWT_OVERRIDE;
const T* yData() const;
private:
const T* m_y;
size_t m_size;
int m_size;
};
/*!
@ -157,17 +157,17 @@ class QwtCPointerValueData : public QwtPointSeriesData
class QWT_EXPORT QwtSyntheticPointData : public QwtPointSeriesData
{
public:
QwtSyntheticPointData( size_t size,
QwtSyntheticPointData( int size,
const QwtInterval& = QwtInterval() );
void setSize( size_t size );
virtual size_t size() const QWT_OVERRIDE;
void setSize( int size );
virtual int size() const QWT_OVERRIDE;
void setInterval( const QwtInterval& );
QwtInterval interval() const;
virtual QRectF boundingRect() const QWT_OVERRIDE;
virtual QPointF sample( size_t index ) const QWT_OVERRIDE;
virtual QPointF sample( int index ) const QWT_OVERRIDE;
/*!
Calculate a y value for a x value
@ -182,7 +182,7 @@ class QWT_EXPORT QwtSyntheticPointData : public QwtPointSeriesData
QRectF rectOfInterest() const;
private:
size_t m_size;
int m_size;
QwtInterval m_interval;
QRectF m_rectOfInterest;
QwtInterval m_intervalOfInterest;
@ -213,7 +213,7 @@ QwtPointArrayData< T >::QwtPointArrayData(
\sa QwtPlotCurve::setData(), QwtPlotCurve::setSamples()
*/
template< typename T >
QwtPointArrayData< T >::QwtPointArrayData( const T* x, const T* y, size_t size )
QwtPointArrayData< T >::QwtPointArrayData( const T* x, const T* y, int size )
{
m_x.resize( size );
std::memcpy( m_x.data(), x, size * sizeof( T ) );
@ -224,7 +224,7 @@ QwtPointArrayData< T >::QwtPointArrayData( const T* x, const T* y, size_t size )
//! \return Size of the data set
template< typename T >
size_t QwtPointArrayData< T >::size() const
int QwtPointArrayData< T >::size() const
{
return qMin( m_x.size(), m_y.size() );
}
@ -236,7 +236,7 @@ size_t QwtPointArrayData< T >::size() const
\return Sample at position i
*/
template< typename T >
QPointF QwtPointArrayData< T >::sample( size_t index ) const
QPointF QwtPointArrayData< T >::sample( int index ) const
{
return QPointF( m_x[int( index )], m_y[int( index )] );
}
@ -276,7 +276,7 @@ QwtValuePointData< T >::QwtValuePointData( const QVector< T >& y )
\sa QwtPlotCurve::setData(), QwtPlotCurve::setSamples()
*/
template< typename T >
QwtValuePointData< T >::QwtValuePointData( const T* y, size_t size )
QwtValuePointData< T >::QwtValuePointData( const T* y, int size )
{
m_y.resize( size );
std::memcpy( m_y.data(), y, size * sizeof( T ) );
@ -284,7 +284,7 @@ QwtValuePointData< T >::QwtValuePointData( const T* y, size_t size )
//! \return Size of the data set
template< typename T >
size_t QwtValuePointData< T >::size() const
int QwtValuePointData< T >::size() const
{
return m_y.size();
}
@ -296,7 +296,7 @@ size_t QwtValuePointData< T >::size() const
\return Sample at position i
*/
template< typename T >
QPointF QwtValuePointData< T >::sample( size_t index ) const
QPointF QwtValuePointData< T >::sample( int index ) const
{
return QPointF( index, m_y[int( index )] );
}
@ -323,7 +323,7 @@ const QVector< T >& QwtValuePointData< T >::yData() const
*/
template< typename T >
QwtCPointerData< T >::QwtCPointerData( const T* x, const T* y, size_t size )
QwtCPointerData< T >::QwtCPointerData( const T* x, const T* y, int size )
: m_x( x )
, m_y( y )
, m_size( size )
@ -332,7 +332,7 @@ QwtCPointerData< T >::QwtCPointerData( const T* x, const T* y, size_t size )
//! \return Size of the data set
template< typename T >
size_t QwtCPointerData< T >::size() const
int QwtCPointerData< T >::size() const
{
return m_size;
}
@ -344,7 +344,7 @@ size_t QwtCPointerData< T >::size() const
\return Sample at position i
*/
template< typename T >
QPointF QwtCPointerData< T >::sample( size_t index ) const
QPointF QwtCPointerData< T >::sample( int index ) const
{
return QPointF( m_x[int( index )], m_y[int( index )] );
}
@ -377,7 +377,7 @@ const T* QwtCPointerData< T >::yData() const
*/
template< typename T >
QwtCPointerValueData< T >::QwtCPointerValueData( const T* y, size_t size )
QwtCPointerValueData< T >::QwtCPointerValueData( const T* y, int size )
: m_y( y )
, m_size( size )
{
@ -385,7 +385,7 @@ QwtCPointerValueData< T >::QwtCPointerValueData( const T* y, size_t size )
//! \return Size of the data set
template< typename T >
size_t QwtCPointerValueData< T >::size() const
int QwtCPointerValueData< T >::size() const
{
return m_size;
}
@ -397,7 +397,7 @@ size_t QwtCPointerValueData< T >::size() const
\return Sample at position i
*/
template< typename T >
QPointF QwtCPointerValueData< T >::sample( size_t index ) const
QPointF QwtCPointerValueData< T >::sample( int index ) const
{
return QPointF( index, m_y[ int( index ) ] );
}

2
libs/qwt/src/qwt_polar_curve.cpp
View File

@ -496,7 +496,7 @@ void QwtPolarCurve::drawSymbols( QPainter* painter, const QwtSymbol& symbol,
\return Number of points
\sa setData()
*/
size_t QwtPolarCurve::dataSize() const
int QwtPolarCurve::dataSize() const
{
return m_series->size();
}

2
libs/qwt/src/qwt_polar_curve.h
View File

@ -89,7 +89,7 @@ class QWT_EXPORT QwtPolarCurve : public QwtPolarItem
void setData( QwtSeriesData< QwtPointPolar >* data );
const QwtSeriesData< QwtPointPolar >* data() const;
size_t dataSize() const;
int dataSize() const;
QwtPointPolar sample( int i ) const;
void setPen( const QPen& );

16
libs/qwt/src/qwt_series_data.h
View File

@ -58,14 +58,14 @@ class QwtSeriesData
#ifndef QWT_PYTHON_WRAPPER
//! \return Number of samples
virtual size_t size() const = 0;
virtual int size() const = 0;
/*!
Return a sample
\param i Index
\return Sample at position i
*/
virtual T sample( size_t i ) const = 0;
virtual T sample( int i ) const = 0;
/*!
Calculate the bounding rect of all samples
@ -83,8 +83,8 @@ class QwtSeriesData
#else
// Needed for generating the python bindings, but not for using them !
virtual size_t size() const { return 0; }
virtual T sample( size_t i ) const { return T(); }
virtual int size() const { return 0; }
virtual T sample( int i ) const { return T(); }
virtual QRectF boundingRect() const { return cachedBoundingRect; }
#endif
@ -154,7 +154,7 @@ class QwtArraySeriesData : public QwtSeriesData< T >
const QVector< T > samples() const;
//! \return Number of samples
virtual size_t size() const QWT_OVERRIDE;
virtual int size() const QWT_OVERRIDE;
/*!
\return Sample at a specific position
@ -162,7 +162,7 @@ class QwtArraySeriesData : public QwtSeriesData< T >
\param index Index
\return Sample at position index
*/
virtual T sample( size_t index ) const QWT_OVERRIDE;
virtual T sample( int index ) const QWT_OVERRIDE;
protected:
//! Vector of samples
@ -194,13 +194,13 @@ const QVector< T > QwtArraySeriesData< T >::samples() const
}
template< typename T >
size_t QwtArraySeriesData< T >::size() const
int QwtArraySeriesData< T >::size() const
{
return m_samples.size();
}
template< typename T >
T QwtArraySeriesData< T >::sample( size_t i ) const
T QwtArraySeriesData< T >::sample( int i ) const
{
return m_samples[ static_cast< int >( i ) ];
}

8
libs/qwt/src/qwt_series_store.h
View File

@ -42,13 +42,13 @@ class QwtAbstractSeriesStore
virtual QRectF dataRect() const = 0;
//! \return Number of samples
virtual size_t dataSize() const = 0;
virtual int dataSize() const = 0;
#else
// Needed for generating the python bindings, but not for using them !
virtual void dataChanged() {}
virtual void setRectOfInterest( const QRectF& ) {}
virtual QRectF dataRect() const { return QRectF( 0.0, 0.0, -1.0, -1.0 ); }
virtual size_t dataSize() const { return 0; }
virtual int dataSize() const { return 0; }
#endif
};
@ -100,7 +100,7 @@ class QwtSeriesStore : public virtual QwtAbstractSeriesStore
\return Number of samples of the series
\sa setData(), QwtSeriesData<T>::size()
*/
virtual size_t dataSize() const QWT_OVERRIDE;
virtual int dataSize() const QWT_OVERRIDE;
/*!
\return Bounding rectangle of the series
@ -172,7 +172,7 @@ void QwtSeriesStore< T >::setData( QwtSeriesData< T >* series )
}
template< typename T >
size_t QwtSeriesStore< T >::dataSize() const
int QwtSeriesStore< T >::dataSize() const
{
if ( m_series == NULL )
return 0;